diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2015-09-14 06:55:19 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-09-16 12:23:20 +0700 |
| commit | a9c93999ffe58377ca7bde7442adea9e3c31f5ca (patch) | |
| tree | 692085c2016486f8a3cedc2e7a68a76de23ad504 | |
| parent | a4d89e4fe425b34e12aaa333097a986f549f2f18 (diff) | |
| download | slackbuilds-a9c93999ffe58377ca7bde7442adea9e3c31f5ca.tar.gz | |
office/texmaker: Fix for Qt 5.5.x and newer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | office/texmaker/qt-5.5.x.patch | 11 | ||||
| -rw-r--r-- | office/texmaker/texmaker.SlackBuild | 15 |
2 files changed, 20 insertions, 6 deletions
diff --git a/office/texmaker/qt-5.5.x.patch b/office/texmaker/qt-5.5.x.patch new file mode 100644 index 0000000000..b53fd72ccd --- /dev/null +++ b/office/texmaker/qt-5.5.x.patch @@ -0,0 +1,11 @@ +diff -Naur texmaker-4.4.1.orig/singleapp/qtlocalpeer.cpp texmaker-4.4.1/singleapp/qtlocalpeer.cpp +--- texmaker-4.4.1.orig/singleapp/qtlocalpeer.cpp 2013-01-07 11:55:45.000000000 +0000 ++++ texmaker-4.4.1/singleapp/qtlocalpeer.cpp 2015-09-13 01:53:52.722192775 +0000 +@@ -42,6 +42,7 @@ + #include "qtlocalpeer.h" + #include <QCoreApplication> + #include <QTime> ++#include <QDataStream> + + #if defined(Q_OS_WIN) + #include <QLibrary> diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild index b1a6509b1f..c305ba5d1e 100644 --- a/office/texmaker/texmaker.SlackBuild +++ b/office/texmaker/texmaker.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=texmaker VERSION=${VERSION:-4.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -64,10 +64,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Fix for qt >= 5.5. +patch -p1 < $CWD/qt-5.5.x.patch # Check for Qt5 or else drop back to Qt4. if [ "${QT5GUI:-no}" == "yes" ]; then @@ -81,7 +84,7 @@ fi make make install INSTALL_ROOT=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true install -D -m 0644 utilities/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1 |