diff options
| author |   Matteo Bernardini | 2019-08-31 16:24:12 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2019-08-31 16:24:12 +0200 |
| commit | 82a6c2e466d4bdb1017e46447e56b0bce264f84b (patch) | |
| tree | c13bd3ae8c2eae3546619b0d2912dbee78400d79 /libraries/libqxt | |
| parent | 155fd2582041b19a6ca7ca2efa805052553bf90a (diff) | |
| download | slackbuilds-current-20190831.1.tar.gz | |
20190831.1 global branch merge.current-20190831.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/libqxt')
| -rw-r--r-- | libraries/libqxt/libqxt-gcc6.patch | 11 | ||||
| -rw-r--r-- | libraries/libqxt/libqxt.SlackBuild | 3 |
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 |