From 12a983652f454ad0420cff993802df3aa3f68ea0 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 20 Oct 2010 00:11:31 +0100 Subject: desktop/icewm: Updated for version 1.3.6. Signed-off-by: Michiel van Wessem --- desktop/icewm/icewm-1.3.6-fix_html_docdir.diff | 24 ++++++++++++++++++ desktop/icewm/icewm.SlackBuild | 35 +++++++++++++++----------- desktop/icewm/icewm.desktop | 6 +++++ desktop/icewm/icewm.info | 8 +++--- desktop/icewm/xinitrc.icewm | 11 +++++--- 5 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 desktop/icewm/icewm-1.3.6-fix_html_docdir.diff create mode 100644 desktop/icewm/icewm.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 new file mode 100644 index 0000000000..ade6b44b80 --- /dev/null +++ b/desktop/icewm/icewm-1.3.6-fix_html_docdir.diff @@ -0,0 +1,24 @@ +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.SlackBuild b/desktop/icewm/icewm.SlackBuild index 05bd72d253..f82894255a 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -23,23 +23,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=icewm -VERSION=${VERSION:-1.2.37} +VERSION=${VERSION:-1.3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-icewm +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then @@ -71,6 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -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 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,10 +80,10 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-cfgdir=/etc/$PRGNAM \ + --docdir=/usr/doc \ + --with-docdir=/usr/doc \ --enable-corefonts \ - --enable-antialiasing \ --build=$ARCH-slackware-linux make @@ -91,22 +92,26 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html -cp -a AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README \ - README.wm-session TODO VERSION $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html -cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild - # Add man page mkdir -p $PKG/usr/man/man1 gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz # Add xinitrc for xwmconfig(1) mkdir -p $PKG/etc/X11/xinit -sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%g" $CWD/xinitrc.icewm \ - > $PKG/etc/X11/xinit/xinitrc.icewm +cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm +# Add icewm as a session choice for !kdm desktop managers +mkdir -p $PKG/usr/share/xsessions +cat $CWD/icewm.desktop > $PKG/usr/share/xsessions/icewm.desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a \ + AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README* TODO VERSION \ + $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html +cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/desktop/icewm/icewm.desktop b/desktop/icewm/icewm.desktop new file mode 100644 index 0000000000..3e25e4f84b --- /dev/null +++ b/desktop/icewm/icewm.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=XSession +Exec=icewm-session +TryExec=icewm-session +Name=IceWM +Comment=A Windows 95-OS/2-Motif-like window manager diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info index 146e1b4062..035cbb6c3f 100644 --- a/desktop/icewm/icewm.info +++ b/desktop/icewm/icewm.info @@ -1,10 +1,10 @@ PRGNAM="icewm" -VERSION="1.2.37" +VERSION="1.3.6" HOMEPAGE="http://icewm.org" -DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.2.37.tar.gz" -MD5SUM="970a21588d26eb361020fd60a61a482c" +DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.6.tar.gz" +MD5SUM="65a7ddb0fb3f60abea4af52184382570" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="michiel" diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm index 825c128463..a93c203c52 100644 --- a/desktop/icewm/xinitrc.icewm +++ b/desktop/icewm/xinitrc.icewm @@ -2,8 +2,8 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=@LIBDIR@/X11/xinit/.Xresources -sysmodmap=@LIBDIR@/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # Merge in defaults and keymaps [ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources @@ -22,5 +22,10 @@ fi # Start IceWM icewmbg & icewmtray & -exec icewm-session + +if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then + ck-launch-session icewm-session +else + exec icewm-session +fi -- cgit v1.2.3