From 966171cea5b0d48412c1d50e9ecdaa166e9ac57b Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Fri, 23 Sep 2011 08:47:17 -0300 Subject: desktop/icewm: Updated for version 1.3.7. Signed-off-by: Niels Horn --- desktop/icewm/icewm-1.3.6-fix_html_docdir.diff | 24 ------------------------ desktop/icewm/icewm-1.3.7-fix_html_docdir.diff | 24 ++++++++++++++++++++++++ desktop/icewm/icewm.SlackBuild | 8 ++++---- desktop/icewm/icewm.info | 8 ++++---- desktop/icewm/slack-desc | 4 ++-- 5 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 desktop/icewm/icewm-1.3.6-fix_html_docdir.diff create mode 100644 desktop/icewm/icewm-1.3.7-fix_html_docdir.diff (limited to 'desktop') diff --git a/desktop/icewm/icewm-1.3.6-fix_html_docdir.diff b/desktop/icewm/icewm-1.3.6-fix_html_docdir.diff deleted file mode 100644 index ade6b44b80..0000000000 --- a/desktop/icewm/icewm-1.3.6-fix_html_docdir.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur icewm-1.3.6.orig//src/Makefile icewm-1.3.6/src/Makefile ---- icewm-1.3.6.orig//src/Makefile 2010-01-12 12:17:25.000000000 -0600 -+++ icewm-1.3.6/src/Makefile 2010-10-13 22:51:33.206057852 -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 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include # `fc-config --cflags` -diff -Nur icewm-1.3.6.orig//src/Makefile.in icewm-1.3.6/src/Makefile.in ---- icewm-1.3.6.orig//src/Makefile.in 2010-01-12 12:17:14.000000000 -0600 -+++ icewm-1.3.6/src/Makefile.in 2010-10-13 22:52:04.214057829 -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/icewm-1.3.7-fix_html_docdir.diff b/desktop/icewm/icewm-1.3.7-fix_html_docdir.diff new file mode 100644 index 0000000000..b3818625fe --- /dev/null +++ b/desktop/icewm/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/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild index 2bba47abd6..7000c9f1ba 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=icewm -VERSION=${VERSION:-1.3.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,7 +70,7 @@ find . \ -exec chmod 644 {} \; # Since we put the html files in $docdir/html/, let's fix the integrated help: -patch -p1 < $CWD/icewm-1.3.6-fix_html_docdir.diff +patch -p1 < $CWD/icewm-1.3.7-fix_html_docdir.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -86,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-corefonts \ --build=$ARCH-slackware-linux -make +make VERBOSE=1 make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info index 035cbb6c3f..d01a8d66b8 100644 --- a/desktop/icewm/icewm.info +++ b/desktop/icewm/icewm.info @@ -1,10 +1,10 @@ PRGNAM="icewm" -VERSION="1.3.6" +VERSION="1.3.7" HOMEPAGE="http://icewm.org" -DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.6.tar.gz" -MD5SUM="65a7ddb0fb3f60abea4af52184382570" +DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.7.tar.gz" +MD5SUM="224695231aedb2b91db3254a13e1c8dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="michiel" +APPROVED="Niels Horn" diff --git a/desktop/icewm/slack-desc b/desktop/icewm/slack-desc index 8066e3473c..49362dd35f 100644 --- a/desktop/icewm/slack-desc +++ b/desktop/icewm/slack-desc @@ -7,10 +7,10 @@ |-----handy-ruler------------------------------------------------------| icewm: icewm (IceWM Window Manager) -icewm: +icewm: icewm: IceWM is a window manager for the X Window System. The goal of icewm: IceWM is speed, simplicity, and not getting in the user's way. -icewm: +icewm: icewm: Homepage: http://www.icewm.org/ icewm: icewm: -- cgit v1.2.3