summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author B. Watson2021-08-02 17:27:47 +0200
committer Willy Sudiarto Raharjo2021-10-12 19:51:26 +0200
commit0db0f2677a4aebfba4d1cc4364b5042786876150 (patch)
treeadb996b9e3e2e6a5890764de9077834bc1c44ecb /academic
parentd8a241a8d8d314e5363f8b060eaa0d3ad2ae9756 (diff)
downloadslackbuilds-0db0f2677a4aebfba4d1cc4364b5042786876150.tar.gz
academic/equalx: Fix build for qt5.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/equalx/equalx.SlackBuild14
-rw-r--r--academic/equalx/qt5fix.diff.gzbin0 -> 235 bytes
2 files changed, 9 insertions, 5 deletions
diff --git a/academic/equalx/equalx.SlackBuild b/academic/equalx/equalx.SlackBuild
index 712c8dc7cf..e827277920 100644
--- a/academic/equalx/equalx.SlackBuild
+++ b/academic/equalx/equalx.SlackBuild
@@ -25,6 +25,8 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20210802 bkw: BUILD=3, update for qt5 on -current.
+
# 20200101 bkw:
# - take over maintenance
# - BUILD=2
@@ -38,7 +40,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=equalx
VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +52,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -88,13 +87,18 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+# Note: patches are gzipped because they have a mix of \n and \r\n
+# line endings. git can have issues with that.
+
# Make sure the application can find the external binaries it runs,
# without defaulting to silly things like .exe files. The patch actually
# makes it look for pdflatex in both places it might be found (/usr/bin
# for texlive, /usr/share/texmf/bin for tetex).
zcat $CWD/externpaths.diff.gz | patch -p1
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" qmake
+zcat $CWD/qt5fix.diff.gz | patch -p1
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" qmake-qt5
sed -i "s,-O2,$SLKCFLAGS," Makefile
make
diff --git a/academic/equalx/qt5fix.diff.gz b/academic/equalx/qt5fix.diff.gz
new file mode 100644
index 0000000000..cae6023bfd
--- /dev/null
+++ b/academic/equalx/qt5fix.diff.gz
Binary files differ