From 3b49a7c5c4d76cf9f0af04a379f762533b4fa6a7 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Thu, 15 Nov 2018 23:24:30 +0300
Subject: swiften: changes requested by exherbo devs

---
 packages/net-im/swiften/files/ranlib.patch     |  5 +++++
 packages/net-im/swiften/files/sconstruct.patch |  4 ++++
 packages/net-im/swiften/swiften.exlib          | 18 +++++++++---------
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/net-im/swiften/files/ranlib.patch b/packages/net-im/swiften/files/ranlib.patch
index c5978e8..359989f 100644
--- a/packages/net-im/swiften/files/ranlib.patch
+++ b/packages/net-im/swiften/files/ranlib.patch
@@ -1,3 +1,8 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: required to support dynamic ranlib name
+Upstream: not submited, fill free to do it
+
+
 diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
 index 3b21dde88..a226432e4 100644
 --- a/BuildTools/SCons/SConscript.boot
diff --git a/packages/net-im/swiften/files/sconstruct.patch b/packages/net-im/swiften/files/sconstruct.patch
index 963ffd1..ece5267 100644
--- a/packages/net-im/swiften/files/sconstruct.patch
+++ b/packages/net-im/swiften/files/sconstruct.patch
@@ -1,3 +1,7 @@
+Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+Reason: boost detection bug workaround
+Upstream: not submited, feel free to do it
+
 diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
 index 6d63d5bcf..a2ad4fd7a 100644
 --- a/BuildTools/SCons/SConstruct
diff --git a/packages/net-im/swiften/swiften.exlib b/packages/net-im/swiften/swiften.exlib
index 71560ce..35920f7 100644
--- a/packages/net-im/swiften/swiften.exlib
+++ b/packages/net-im/swiften/swiften.exlib
@@ -26,9 +26,9 @@ MYOPTIONS="
 DEPENDENCIES="
     build+run:
         dev-libs/boost[>=1.65]
-        net-dns/libidn[>=1.10]
-        dev-libs/libxml2
         dev-libs/expat
+        dev-libs/libxml2:=
+        net-dns/libidn[>=1.10]
         net-libs/miniupnpc
         sys-libs/zlib
         avahi? ( net-dns/avahi )
@@ -65,16 +65,16 @@ BASE_OPTIONS=(
     Swiften
 )
 
-SCONS_SRC_CONFIGURE_PARAMS=( ${BASE_OPTIONS[@]} )
+SCONS_SRC_CONFIGURE_PARAMS=( "${BASE_OPTIONS[@]}" )
 
-SCONS_SRC_COMPILE_PARAMS=( ${BASE_OPTIONS[@]} )
+SCONS_SRC_COMPILE_PARAMS=( "${BASE_OPTIONS[@]}" )
 
-SCONS_SRC_INSTALL_PARAMS=( ${BASE_OPTIONS[@]} )
+SCONS_SRC_INSTALL_PARAMS=( "${BASE_OPTIONS[@]}" )
 
 swiften_src_install() {
     escons --config=cache \
-        ${SCONS_SRC_INSTALL_PARAMS[@]} \
-        SWIFTEN_INSTALLDIR=${IMAGE}/usr/$(exhost --target) \
-        SWIFTEN_LIBDIR=${IMAGE}/usr/$(exhost --target)/lib \
-        ${IMAGE}/usr/$(exhost --target)
+        "${SCONS_SRC_INSTALL_PARAMS[@]}" \
+        SWIFTEN_INSTALLDIR="${IMAGE}"/usr/$(exhost --target) \
+        SWIFTEN_LIBDIR="${IMAGE}"/usr/$(exhost --target)/lib \
+        "${IMAGE}"/usr/$(exhost --target)
 }
-- 
cgit v1.2.3