swiften: build fix

2 files changed, 42 insertions, 10 deletions

diff --git a/packages/net-im/swiften/files/boost.patch b/packages/net-im/swiften/files/boost.patch
new file mode 100644
index 0000000..3042023
--- /dev/null
+++ b/packages/net-im/swiften/files/boost.patch
@@ -0,0 +1,29 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: compilation fix
+Upstream: not submitted, feel free to do it
+
+
+diff --git a/Swiften/Serializer/StreamResumeSerializer.cpp b/Swiften/Serializer/StreamResumeSerializer.cpp
+index e9e520d..b576c78 100644
+--- a/Swiften/Serializer/StreamResumeSerializer.cpp
++++ b/Swiften/Serializer/StreamResumeSerializer.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include <boost/shared_ptr.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/optional/optional_io.hpp>
+ 
+ #include <Swiften/Elements/StreamResume.h>
+ #include <Swiften/Serializer/XML/XMLElement.h>
+diff --git a/Swiften/Serializer/StreamResumedSerializer.cpp b/Swiften/Serializer/StreamResumedSerializer.cpp
+index 7ae82d1..2f98fc9 100644
+--- a/Swiften/Serializer/StreamResumedSerializer.cpp
++++ b/Swiften/Serializer/StreamResumedSerializer.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include <boost/shared_ptr.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/optional/optional_io.hpp>
+ 
+ #include <Swiften/Elements/StreamResumed.h>
+ #include <Swiften/Serializer/XML/XMLElement.h>
diff --git a/packages/net-im/swiften/swiften.exlib b/packages/net-im/swiften/swiften.exlib
index a171de7..c96228f 100644
--- a/packages/net-im/swiften/swiften.exlib
+++ b/packages/net-im/swiften/swiften.exlib
@@ -20,7 +20,7 @@ MYOPTIONS="
 
 DEPENDENCIES="
     build+run:
-        dev-libs/boost[>=1.42]
+        dev-libs/boost[>=1.65]
         net-dns/libidn[>=1.10]
         dev-libs/libxml2
         dev-libs/expat
@@ -33,7 +33,7 @@ DEPENDENCIES="
 
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}/*.patch"
+    "${FILES}"/boost.patch
 )
 
 swiften_src_prepare() {
@@ -41,20 +41,23 @@ swiften_src_prepare() {
     edo rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib
     edo popd
     edo rm -rf Swiften/Examples
+    default
 }
 
-SCONS_SRC_CONFIGURE_PARAMS=(
-    allow_warnings=1
-    swiften_dll=1
+BASE_OPTIONS=(
     cc=$(exhost --target)-cc
     cxx=$(exhost --target)-c++
+    ar=$(exhost --target)-ar
+    ranlib=$(exhost --target)-ranlib
     Swiften
 )
 
-SCONS_SRC_COMPILE_PARAMS=(
-    cc=$(exhost --target)-cc
-    cxx=$(exhost --target)-c++
-    Swiften
+SCONS_SRC_CONFIGURE_PARAMS=(
+    allow_warnings=1
+    swiften_dll=1
+    ${BASE_OPTIONS[@]}
 )
 
-SCONS_SRC_INSTALL_PARAMS=${SCONS_SRC_COMPILE_PARAMS[@]}
+SCONS_SRC_COMPILE_PARAMS=${BASE_OPTIONS[@]}
+
+SCONS_SRC_INSTALL_PARAMS=${BASE_OPTIONS[@]}