summaryrefslogtreecommitdiffstats
path: root/desktop/icewm/icewm.SlackBuild
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2012-05-11 10:40:56 -0500
committer Erik Hanson <erik@slackbuilds.org>2012-05-14 13:13:58 -0500
commitdeaf02228bd43019564c1b35c534c2c43058e1c9 (patch)
tree8fe22d9313cb0642dc5b77f3cd5825a8f519294f /desktop/icewm/icewm.SlackBuild
parent612fd0840acaf2daf9a943fbb6a9f56ba1b9513a (diff)
downloadslackbuilds-deaf02228bd43019564c1b35c534c2c43058e1c9.tar.gz
slackbuilds-deaf02228bd43019564c1b35c534c2c43058e1c9.tar.xz
desktop/icewm: Included a couple of build fix patches
These are only needed for -current, but they don't hurt anything for 13.37 and they reduce the workload later when getting all of the repo ready for slackware-next. Thanks to Morten Langlo for the fontconfig patch. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/icewm/icewm.SlackBuild')
-rw-r--r--desktop/icewm/icewm.SlackBuild9
1 files changed, 8 insertions, 1 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 7000c9f1ba..cee6037256 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -69,8 +69,15 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Explicitly link fontconfig - this isn't needed on 13.37, but it also doesn't
+# hurt anything, so we'll included it since it's needed for -current
+patch -p1 < $CWD/patches/explicitly-link-fontconfig.diff
+
+# Here's another -current only patch that's harmless on 13.37:
+patch -p1 < $CWD/patches/use_ICEWM_deprecated.patch
+
# Since we put the html files in $docdir/html/, let's fix the integrated help:
-patch -p1 < $CWD/icewm-1.3.7-fix_html_docdir.diff
+patch -p1 < $CWD/patches/icewm-1.3.7-fix_html_docdir.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \