diff --git a/office/texmaker/README b/office/texmaker/README index 7171b160a6..e484a2c743 100644 --- a/office/texmaker/README +++ b/office/texmaker/README @@ -1,3 +1,8 @@ Texmaker is a free LaTeX editor that integrates many tools needed to develop documents with LaTeX in just one application. + +Note: Texmaker can be optionally compiled with +poppler-qt5 by passing the argument QT5GUI=yes. + + QT5GUI=yes ./texmaker.SlackBuild diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild index b455b9584b..46f4c0fb9b 100644 --- a/office/texmaker/texmaker.SlackBuild +++ b/office/texmaker/texmaker.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=texmaker -VERSION=${VERSION:-4.1} +VERSION=${VERSION:-4.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,8 +69,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -qmake LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS" -o Makefile $PRGNAM.pro +# Check for Qt5 or else drop back to Qt4. +if [ "${QT5GUI:-no}" == "yes" ]; then + qmake-qt5 LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" -o Makefile $PRGNAM.pro +else + qmake LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" -o Makefile $PRGNAM.pro +fi make make install INSTALL_ROOT=$PKG diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info index 8f04823482..e7e8bed333 100644 --- a/office/texmaker/texmaker.info +++ b/office/texmaker/texmaker.info @@ -1,10 +1,10 @@ PRGNAM="texmaker" -VERSION="4.1" +VERSION="4.1.1" HOMEPAGE="http://www.xm1math.net/texmaker/index.html" -DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-4.1.tar.bz2" -MD5SUM="97ef7f97e73d69283391e467e5758275" +DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-4.1.1.tar.bz2" +MD5SUM="0b26fe9e29b37eeaf98e568a096d2dad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="%README%" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com"