aboutsummaryrefslogtreecommitdiff
path: root/desktop/wmudmount
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2018-02-19 16:12:36 -0500
committerDavid Spencer <idlemoor@slackbuilds.org>2018-06-14 01:14:25 +0100
commitf7e779001c685e33415bc81b068211ed14b2a9a4 (patch)
treeba96a0fee0effcc9cd54d34fd08da55dc1c794e3 /desktop/wmudmount
parentefa619c20cb3bb4bcf1e04d95f24a1bebecb4f1b (diff)
desktop/wmudmount: Fix build on -current.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'desktop/wmudmount')
-rw-r--r--desktop/wmudmount/perlfix.diff12
-rw-r--r--desktop/wmudmount/wmudmount.SlackBuild6
2 files changed, 18 insertions, 0 deletions
diff --git a/desktop/wmudmount/perlfix.diff b/desktop/wmudmount/perlfix.diff
new file mode 100644
index 0000000000000..1cb4f4e8d5e78
--- /dev/null
+++ b/desktop/wmudmount/perlfix.diff
@@ -0,0 +1,12 @@
+diff -Naur wmudmount-2.2/make-chars.pl wmudmount-2.2.patched/make-chars.pl
+--- wmudmount-2.2/make-chars.pl 2014-02-03 00:41:59.000000000 -0500
++++ wmudmount-2.2.patched/make-chars.pl 2018-02-19 16:09:56.660499062 -0500
+@@ -52,7 +52,7 @@
+
+ while(<IN>){
+ $head.=$_;
+- if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = {/){
++ if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = \{/){
+ $name=$1;
+ last;
+ }
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild
index cb5322bbd7329..bd98f085534d2 100644
--- a/desktop/wmudmount/wmudmount.SlackBuild
+++ b/desktop/wmudmount/wmudmount.SlackBuild
@@ -28,6 +28,8 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20180219 bkw: fix build on -current (no harm done on 14.2)
+
# 20160818 bkw:
# - take over maintenance
# - i486 => i586
@@ -85,6 +87,10 @@ 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 {} \;
+# 20180219 bkw: perl 5.26 in -current requires curly braces to be escaped
+# inside a regex, when they're being use to match a literal curly brace.
+patch -p1 < $CWD/perlfix.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \