diff options
| author | M.Dinslage <daedra1980@gmail.com> | 2017-02-28 19:03:41 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-03-02 12:52:58 +0700 |
| commit | ffb5d1e1c99b76a5c366f1f978c0041df741dbee (patch) | |
| tree | a1a3d2ac700057ac1a993be182a5dc4c7af199a2 | |
| parent | 7213c3020d635275696f9e7cce671b53cd4d4d41 (diff) | |
| download | slackbuilds-ffb5d1e1c99b76a5c366f1f978c0041df741dbee.tar.gz | |
desktop/adwaita-qt: Updated for version 0.98.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/adwaita-qt/adwaita-qt.SlackBuild | 15 | ||||
| -rw-r--r-- | desktop/adwaita-qt/adwaita-qt.info | 6 | ||||
| -rw-r--r-- | desktop/adwaita-qt/isnan_compile_fix.patch | 21 |
3 files changed, 13 insertions, 29 deletions
diff --git a/desktop/adwaita-qt/adwaita-qt.SlackBuild b/desktop/adwaita-qt/adwaita-qt.SlackBuild index eb5ee600c4..f60058295e 100644 --- a/desktop/adwaita-qt/adwaita-qt.SlackBuild +++ b/desktop/adwaita-qt/adwaita-qt.SlackBuild @@ -1,3 +1,4 @@ + #!/bin/sh # Slackware build script for adwaita-qt @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=adwaita-qt -VERSION=${VERSION:-0.97} +VERSION=${VERSION:-0.98} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +70,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -#Use std::isnan instead of isnan compile fix -#https://github.com/MartinBriza/adwaita-qt/issues/53 -patch -p1 < $CWD/isnan_compile_fix.patch + +# Fix install directory +if [ "$ARCH" = "x86_64" ]; then + sed -i 's,${QT_PLUGINS_DIR}/styles,/usr/lib64/kde4/plugins/styles,g' style/CMakeLists.txt +else + sed -i 's,${QT_PLUGINS_DIR}/styles,/usr/lib/kde4/plugins/styles,g' style/CMakeLists.txt +fi + mkdir build cd build @@ -80,7 +86,6 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_QT4=ON \ - -DQT_ROOT=/usr/lib${LIBDIRSUFFIX}/kde4 \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/desktop/adwaita-qt/adwaita-qt.info b/desktop/adwaita-qt/adwaita-qt.info index 0af6cc3052..efba4535dc 100644 --- a/desktop/adwaita-qt/adwaita-qt.info +++ b/desktop/adwaita-qt/adwaita-qt.info @@ -1,8 +1,8 @@ PRGNAM="adwaita-qt" -VERSION="0.97" +VERSION="0.98" HOMEPAGE="https://github.com/MartinBriza/adwaita-qt" -DOWNLOAD="https://github.com/MartinBriza/adwaita-qt/archive/0.97/adwaita-qt-0.97.tar.gz" -MD5SUM="c5a38c1f6d66910c453b3eacc05cc3f3" +DOWNLOAD="https://github.com/MartinBriza/adwaita-qt/archive/0.98/adwaita-qt-0.98.tar.gz" +MD5SUM="bc0e3bf36f9266b1e76594bea339a647" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/adwaita-qt/isnan_compile_fix.patch b/desktop/adwaita-qt/isnan_compile_fix.patch deleted file mode 100644 index 1e862372c6..0000000000 --- a/desktop/adwaita-qt/isnan_compile_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up adwaita-qt-0.97/style/adwaitahelper.h.orig adwaita-qt-0.97/style/adwaitahelper.h ---- adwaita-qt-0.97/style/adwaitahelper.h.orig 2017-02-04 20:20:45.831715084 -0600 -+++ adwaita-qt-0.97/style/adwaitahelper.h 2017-02-04 20:21:30.195712810 -0600 -@@ -33,7 +33,7 @@ - #include <xcb/xcb.h> - #endif - --#include <math.h> -+#include <cmath> - - namespace Adwaita - { -@@ -69,7 +69,7 @@ namespace Adwaita - - if (bias <= 0.0) return c1; - if (bias >= 1.0) return c2; -- if (isnan(bias)) return c1; -+ if (std::isnan(bias)) return c1; - - qreal r = mixQreal(c1.redF(), c2.redF(), bias); - qreal g = mixQreal(c1.greenF(), c2.greenF(), bias); |