summaryrefslogtreecommitdiffstats
path: root/accessibility/mag/mag.SlackBuild
diff options
context:
space:
mode:
author B. Watson2021-12-08 05:58:54 +0100
committer Willy Sudiarto Raharjo2021-12-10 02:37:38 +0100
commit4f82040ebcd59c3982af10e47cd26c1655f6ee8f (patch)
treee087bd75e5903668cc6468d5f2b7b49ddf2fce91 /accessibility/mag/mag.SlackBuild
parent0e2fe6403bda67d00f693ee6374663634f811398 (diff)
downloadslackbuilds-4f82040ebcd59c3982af10e47cd26c1655f6ee8f.tar.gz
accessibility/mag: Fix all-black window bug.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'accessibility/mag/mag.SlackBuild')
-rw-r--r--accessibility/mag/mag.SlackBuild21
1 files changed, 20 insertions, 1 deletions
diff --git a/accessibility/mag/mag.SlackBuild b/accessibility/mag/mag.SlackBuild
index 470ddbc49a..c370bf6c47 100644
--- a/accessibility/mag/mag.SlackBuild
+++ b/accessibility/mag/mag.SlackBuild
@@ -8,11 +8,15 @@
# VERSION comes from the last modified date on the homepage.
+# 20211207 bkw: BUILD=2
+# - fix blank window on -current (it shouldn't have worked on 14.2 either).
+# - add BUGS to man page (no way to exit mag).
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mag
VERSION=${VERSION:-20100913}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -54,7 +58,22 @@ set -e
# In case you're wondering, -Wl,-s builds a stripped binary.
rm -rf $PKG
mkdir -p $PKG/usr/bin $OUTPUT
+
+cd $PKG
+
+# 20211207 bkw: we *do* have to patch it now, and we don't want
+# to write to $CWD, so:
+cat $CWD/$PRGNAM.c > $PRGNAM.c
+
+# 20211207 bkw: silly mistake in the code: it was calling
+# XDestroyImage(ximage) before the for loop that *uses* ximage.
+# On 14.2's X, this was equivalent to a use-after-free, and worked
+# accidentally most (or even all) of the time, but on -current's X,
+# it results in a blank (all-black) window.
+patch -p0 < $CWD/xdestroyimage.diff
+
gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM $PRGNAM.c -lX11
+rm $PRGNAM.c
# Man page written by SlackBuild author. Please don't include mag.rst
# in the package, it's the source for the man page only.