From deaf02228bd43019564c1b35c534c2c43058e1c9 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 11 May 2012 10:40:56 -0500
Subject: 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>
---
 desktop/icewm/icewm.SlackBuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'desktop/icewm/icewm.SlackBuild')

diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 7000c9f1ba805..cee6037256345 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" \
-- 
cgit v1.2.3