summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2017-05-05 23:32:02 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-17 23:40:57 -0500
commitde4c46419a0c7b60c947e8b39c5d8f74b32c2dff (patch)
tree373ad9119c9ea16946feb942f178e58e5b41dd95
parent935a9e4b7105e50dde0722da78412f31ac74986b (diff)
downloadslackbuilds-de4c46419a0c7b60c947e8b39c5d8f74b32c2dff.tar.gz
libraries/libqxt: Patch for gcc >= 6.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/libqxt/libqxt-gcc6.patch11
-rw-r--r--libraries/libqxt/libqxt.SlackBuild3
2 files changed, 14 insertions, 0 deletions
diff --git a/libraries/libqxt/libqxt-gcc6.patch b/libraries/libqxt/libqxt-gcc6.patch
new file mode 100644
index 0000000000..519646d6eb
--- /dev/null
+++ b/libraries/libqxt/libqxt-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/src/core/qxtslotjob.cpp 2011-11-24 16:10:32.000000000 -0600
++++ b/src/core/qxtslotjob.cpp 2016-03-07 16:20:32.758268253 -0600
+@@ -174,7 +174,7 @@ This uses QxtSignalWaiter so it will _no
+
+ QVariant QxtFuture::delayedResult(int msec)
+ {
+- if (!waiter->wait(msec, false))
++ if (!waiter->wait(msec, NULL))
+ return QVariant();
+ return job->result();
+ }
diff --git a/libraries/libqxt/libqxt.SlackBuild b/libraries/libqxt/libqxt.SlackBuild
index 870d2ead16..fe260941aa 100644
--- a/libraries/libqxt/libqxt.SlackBuild
+++ b/libraries/libqxt/libqxt.SlackBuild
@@ -74,6 +74,9 @@ find -L . \
# Fix linking during the xrandr test
sed -i "s|lXrandr$|lXrandr -lX11|" config.tests/xrandr/xrandr.pro
+# Thanks to Archlinux for this
+patch -p1 < $CWD/libqxt-gcc6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure -prefix /usr -libdir /usr/lib$LIBDIRSUFFIX