diff options
| 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 |
| commit | deaf02228bd43019564c1b35c534c2c43058e1c9 (patch) | |
| tree | 8fe22d9313cb0642dc5b77f3cd5825a8f519294f /desktop/icewm/patches | |
| parent | 612fd0840acaf2daf9a943fbb6a9f56ba1b9513a (diff) | |
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/patches')
| -rw-r--r-- | desktop/icewm/patches/explicitly-link-fontconfig.diff | 12 | ||||
| -rw-r--r-- | desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff | 24 | ||||
| -rw-r--r-- | desktop/icewm/patches/use_ICEWM_deprecated.patch | 21 |
3 files changed, 57 insertions, 0 deletions
diff --git a/desktop/icewm/patches/explicitly-link-fontconfig.diff b/desktop/icewm/patches/explicitly-link-fontconfig.diff new file mode 100644 index 0000000000000..36dab59d32372 --- /dev/null +++ b/desktop/icewm/patches/explicitly-link-fontconfig.diff @@ -0,0 +1,12 @@ +diff -Nur icewm-1.3.7.orig/src/Makefile.in icewm-1.3.7/src/Makefile.in +--- icewm-1.3.7.orig/src/Makefile.in 2010-10-31 09:09:36.000000000 -0500 ++++ icewm-1.3.7/src/Makefile.in 2012-05-11 10:29:55.356344991 -0500 +@@ -37,7 +37,7 @@ + CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` + LFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` ++LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 fontconfig --libs` + + CORE_LIBS = @CORE_LIBS@ # `fc-config --libs` + IMAGE_LIBS = @IMAGE_LIBS@ diff --git a/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff b/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff new file mode 100644 index 0000000000000..b3818625fe457 --- /dev/null +++ b/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff @@ -0,0 +1,24 @@ +diff -Nur icewm-1.3.7.orig/src/Makefile icewm-1.3.7/src/Makefile +--- icewm-1.3.7.orig/src/Makefile 2010-10-31 09:09:49.000000000 -0500 ++++ icewm-1.3.7/src/Makefile 2011-09-04 21:59:06.658236001 -0500 +@@ -32,7 +32,7 @@ + -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ + -DICESMEXE='"icewm-session$(EXEEXT)"' \ + -DICEHELPEXE='"icehelp$(EXEEXT)"' \ +- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' ++ -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/html/icewm.html"' + + CXXFLAGS = -fpermissive -Wall -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ + -I/usr/include/freetype2 -pthread -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include # `fc-config --cflags` +diff -Nur icewm-1.3.7.orig/src/Makefile.in icewm-1.3.7/src/Makefile.in +--- icewm-1.3.7.orig/src/Makefile.in 2010-10-31 09:09:36.000000000 -0500 ++++ icewm-1.3.7/src/Makefile.in 2011-09-04 21:59:06.659235991 -0500 +@@ -32,7 +32,7 @@ + -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ + -DICESMEXE='"icewm-session$(EXEEXT)"' \ + -DICEHELPEXE='"icehelp$(EXEEXT)"' \ +- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' ++ -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/html/icewm.html"' + + CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` diff --git a/desktop/icewm/patches/use_ICEWM_deprecated.patch b/desktop/icewm/patches/use_ICEWM_deprecated.patch new file mode 100644 index 0000000000000..3533d31e34ac4 --- /dev/null +++ b/desktop/icewm/patches/use_ICEWM_deprecated.patch @@ -0,0 +1,21 @@ +Description: Don't use "deprecated" as identifier, will FTBFS if another + library defines functions as deprecated. +Author: Andreas Moog <amoog@ubuntu.com> +Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 +Forwarded: Yes + +--- icewm-1.3.7.orig/src/base.h ++++ icewm-1.3.7/src/base.h +@@ -2,9 +2,9 @@ + #define __BASE_H + + #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +-#define deprecated __attribute__((deprecated)) ++#define ICEWM_deprecated __attribute__((deprecated)) + #else +-#define deprecated ++#define ICEWM_deprecated + #endif + + /*** Atomar Data Types ********************************************************/ |