summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/texmaker/README8
-rw-r--r--office/texmaker/texmaker.SlackBuild20
-rw-r--r--office/texmaker/texmaker.info8
3 files changed, 11 insertions, 25 deletions
diff --git a/office/texmaker/README b/office/texmaker/README
index dedafaaa3c..7171b160a6 100644
--- a/office/texmaker/README
+++ b/office/texmaker/README
@@ -1,11 +1,3 @@
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 (requires qt5-webkit) by passing the
-argument QT5GUI=yes.
-
- QT5GUI=yes ./texmaker.SlackBuild
-
-Optional dependency: ibus-qt (For Qt4)
diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild
index e47e2c55e0..cec5480b75 100644
--- a/office/texmaker/texmaker.SlackBuild
+++ b/office/texmaker/texmaker.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for texmaker
-# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=texmaker
-VERSION=${VERSION:-4.5}
+VERSION=${VERSION:-5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,14 +69,8 @@ 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 {} \;
-# 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
+qmake-qt5 LIBS+="-L/usr/lib${LIBDIRSUFFIX}" QMAKE_CFLAGS+="$SLKCFLAGS" \
+ QMAKE_CXXFLAGS+="$SLKCFLAGS" -o Makefile $PRGNAM.pro
make
make install INSTALL_ROOT=$PKG
diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info
index e60a786825..90c86fe24a 100644
--- a/office/texmaker/texmaker.info
+++ b/office/texmaker/texmaker.info
@@ -1,10 +1,10 @@
PRGNAM="texmaker"
-VERSION="4.5"
+VERSION="5.0"
HOMEPAGE="http://www.xm1math.net/texmaker/index.html"
-DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2"
-MD5SUM="156ffad5b7193e0cfecd2d3689f3a7a4"
+DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-5.0.tar.bz2"
+MD5SUM="c5bd3c377f5b6844222cab1c2e543c04"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"