From 5ff5682eb98c3377d2027f55cf8792c97bc5bb76 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 24 Nov 2013 01:47:10 -0600 Subject: desktop/icewm: Updated for version 1.3.8. Signed-off-by: Robby Workman --- desktop/icewm/icewm.SlackBuild | 14 +++++-------- desktop/icewm/icewm.info | 6 +++--- .../icewm/patches/icewm-1.3.7-fix_html_docdir.diff | 24 ---------------------- .../icewm/patches/icewm-1.3.x-fix_html_docdir.diff | 24 ++++++++++++++++++++++ desktop/icewm/patches/use_ICEWM_deprecated.patch | 21 ------------------- 5 files changed, 32 insertions(+), 57 deletions(-) delete mode 100644 desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff create mode 100644 desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff delete mode 100644 desktop/icewm/patches/use_ICEWM_deprecated.patch (limited to 'desktop') diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild index b853140ec8..de7e089512 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for icewm -# Copyright 2006-2011 Robby Workman Northport, Alabama, USA +# Copyright 2006-2013 Robby Workman Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=icewm -VERSION=${VERSION:-1.3.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,15 +69,11 @@ find -L . \ \( -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 +# Explicitly link fontconfig 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/patches/icewm-1.3.7-fix_html_docdir.diff +patch -p1 < $CWD/patches/icewm-1.3.x-fix_html_docdir.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info index 07975726a1..f22af2e8b1 100644 --- a/desktop/icewm/icewm.info +++ b/desktop/icewm/icewm.info @@ -1,8 +1,8 @@ PRGNAM="icewm" -VERSION="1.3.7" +VERSION="1.3.8" HOMEPAGE="http://icewm.org" -DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.7.tar.gz" -MD5SUM="224695231aedb2b91db3254a13e1c8dd" +DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.8.tar.gz" +MD5SUM="6d61aced3bd20b9e7caeb7e8380368c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 deleted file mode 100644 index b3818625fe..0000000000 --- a/desktop/icewm/patches/icewm-1.3.7-fix_html_docdir.diff +++ /dev/null @@ -1,24 +0,0 @@ -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/icewm-1.3.x-fix_html_docdir.diff b/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff new file mode 100644 index 0000000000..b3818625fe --- /dev/null +++ b/desktop/icewm/patches/icewm-1.3.x-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 deleted file mode 100644 index 3533d31e34..0000000000 --- a/desktop/icewm/patches/use_ICEWM_deprecated.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Don't use "deprecated" as identifier, will FTBFS if another - library defines functions as deprecated. -Author: Andreas Moog -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 ********************************************************/ -- cgit v1.2.3