summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2012-09-12 11:32:10 +0200
committerMatteo Bernardini <ponce@slackbuilds.org>2012-09-12 11:32:45 +0200
commitcc10e940240aab356c68c2c8ee82599f84b8d1b6 (patch)
tree2ed45cbadaeb293cc4b03f807904082b1388e446 /libraries
parent74c343d243da4fd6b9b974be91c09c6b38c4a576 (diff)
downloadslackbuilds-cc10e940240aab356c68c2c8ee82599f84b8d1b6.tar.gz
libraries/libjingle: Added a patch and a -fpermissive for gcc-4.7.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libjingle/libjingle-0.3.12-gcc47.patch11
-rw-r--r--libraries/libjingle/libjingle.SlackBuild5
2 files changed, 14 insertions, 2 deletions
diff --git a/libraries/libjingle/libjingle-0.3.12-gcc47.patch b/libraries/libjingle/libjingle-0.3.12-gcc47.patch
new file mode 100644
index 0000000000..a08f77a258
--- /dev/null
+++ b/libraries/libjingle/libjingle-0.3.12-gcc47.patch
@@ -0,0 +1,11 @@
+diff -Naur libjingle-0.3.12.orig/talk/base/sigslot.h libjingle-0.3.12/talk/base/sigslot.h
+--- libjingle-0.3.12.orig/talk/base/sigslot.h 2008-09-16 15:55:22.000000000 +0200
++++ libjingle-0.3.12/talk/base/sigslot.h 2012-09-12 11:26:35.849989149 +0200
+@@ -80,6 +80,7 @@
+
+ #include <set>
+ #include <list>
++#include <unistd.h>
+
+ // On our copy of sigslot.h, we force single threading
+ #define SIGSLOT_PURE_ISO
diff --git a/libraries/libjingle/libjingle.SlackBuild b/libraries/libjingle/libjingle.SlackBuild
index 377e73715a..67511b5f23 100644
--- a/libraries/libjingle/libjingle.SlackBuild
+++ b/libraries/libjingle/libjingle.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=libjingle
VERSION=${VERSION:-0.3.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -73,9 +73,10 @@ find . \
-exec chmod 644 {} \;
patch -p1 < $CWD/libjingle-0.3.12-gcc44.patch
+patch -p1 < $CWD/libjingle-0.3.12-gcc47.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \