I hereby claim:
- I am oyvindio on github.
- I am oyvindio (https://keybase.io/oyvindio) on keybase.
- I have a public key ASBAKKEG1ZuhCY6YVg2cJ3gabmNYqyL9E-_xhrk4BQKstQo
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
scala> Option(null) | |
res0: Option[Null] = None | |
scala> List(null).lastOption | |
res1: Option[Null] = Some(null) |
diff --git a/core/src/test/scala/org/scalatra/ContentTypeTest.scala b/core/src/test/scala/org/scalatra/ContentTypeTest.scala | |
index 02ba9ff..2db116d 100644 | |
--- a/core/src/test/scala/org/scalatra/ContentTypeTest.scala | |
+++ b/core/src/test/scala/org/scalatra/ContentTypeTest.scala | |
@@ -24,6 +24,11 @@ class ContentTypeTestServlet(system: ActorSystem) extends ScalatraServlet { | |
"test" | |
} | |
+ get("/byte-array") { | |
+ contentType = "application/octet-stream" |
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake | |
index c077ba0..6622ea3 100644 | |
--- a/cmake/FindIconv.cmake | |
+++ b/cmake/FindIconv.cmake | |
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY | |
IF(ICONV_INCLUDE_PATH) | |
IF(ICONV_LIBRARY) | |
STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}") | |
- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
- IF(NOT ICONV_FOUND) |
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb | |
index a2924b6..82b7f0f 100644 | |
--- a/Library/Formula/weechat.rb | |
+++ b/Library/Formula/weechat.rb | |
@@ -57,6 +57,14 @@ class Weechat < Formula | |
system 'make install' | |
end | |
+ def patches | |
+ # This patch disables some of the checks cmake does on iconv to |
--- a/cmake/FindIconv.cmake 2012-01-08 11:15:28.000000000 +0100 | |
+++ b/cmake/FindIconv.cmake 2012-11-06 20:42:29.000000000 +0100 | |
@@ -49,9 +49,9 @@ | |
IF(ICONV_INCLUDE_PATH) | |
IF(ICONV_LIBRARY) | |
STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}") | |
- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
+ CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
IF(NOT ICONV_FOUND) | |
- CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) |
$ git push | |
To oyvindio.com:git/scalahugs.git | |
! [rejected] master -> master (non-fast-forward) | |
error: failed to push some refs to 'oyvindio.com:git/scalahugs.git' | |
hint: Updates were rejected because the tip of your current branch is behind | |
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') | |
hint: before pushing again. | |
hint: See the 'Note about fast-forwards' in 'git push --help' for details. | |
bash: warning: setlocale: LC_ALL: cannot change locale (en_GB.UTF-8) | |
Counting objects: 17, done. |
(if (fboundp 'menu-bar-mode) (menu-bar-mode -1)) | |
(if (fboundp 'tool-bar-mode) (tool-bar-mode -1)) | |
(if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1)) |
# ~/.bash_profile | |
if [[ "$(uname)" =~ "Darwin" ]] | |
then | |
# os x sets locale vars to non-standard values. this sometimes causes | |
# encoding issues on remote machines | |
export LANG=en_GB.UTF-8 | |
export LC_ALL=en_GB.UTF-8 | |
export LC_CTYPE=en_GB.UTF-8 | |
fi |
[INFO] Scanning for projects... | |
[INFO] | |
[INFO] ------------------------------------------------------------------------ | |
[INFO] Building grouphug 1.0-SNAPSHOT | |
[INFO] ------------------------------------------------------------------------ | |
[WARNING] The POM for kvikshaug:pircbot-patched:jar:1.5.0 is missing, no dependency information available | |
[WARNING] The POM for kvikshaug:scatsd-client_2.8.1:jar:1.0 is missing, no dependency information available | |
[INFO] ------------------------------------------------------------------------ | |
[INFO] BUILD FAILURE | |
[INFO] ------------------------------------------------------------------------ |