Commits

Anonymous committed 31091e4

Update icewm to 1.3.8

Signed-off-by: Lee Pak Hong <benreilly@vector.Linux.net>

Comments (0)

Files changed (7)

var/vabs/icewm/src/doinst.sh

+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/X11/xinit/xinitrc.icewm.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null
+fi

var/vabs/icewm/src/icewm.SlackBuild

 # AUTHORS = 
 
 NAME="icewm"            #Enter package Name!
-VERSION=${VERSION:-"1.3.7"}      #Enter package Version!
+VERSION=${VERSION:-"1.3.8"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
-LINK=${LINK:-"http://downloads.sourceforge.net/icewm/icewm-1.3.7.tar.gz"}  #Enter URL for package here!
+LINK=${LINK:-"http://downloads.sourceforge.net/$NAME/$NAME-$VERSION.tar.gz"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
+MAKEDEPENDS=${MAKEDEPENDS:-""} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
+# DO NOT EXECUTE if NORUN is set to 1
+if [ "$NORUN" != "1" ]; then
+
 
 #SETUP PACKAGING ENVIRONMENT
 #--------------------------------------------
 
 # Put any Patches into a patches folder in the src dir
 #-----------------------------------------------------
-#for i in $CWD/patches/*;do
-#	patch -p1 <$i
-#done
+for i in $CWD/patches/*;do
+#  patch -p1 <$i
+  mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches/
+  cp $i $PKG/usr/doc/$NAME-$VERSION/patches/
+done
 #-----------------------------------------------------
 
+# 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
 
 #SET PERMISSIONS
 #-----------------------------------------
 #-----------------------------------------------------------------------
 
 echo "Configuring source..."
-sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/' src/Makefile.in
-sed -i 's/define deprecated/define ICEWM_deprecated/' src/base.h
-
 ./configure --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --infodir=/usr/info \
   --docdir=/usr/doc \
   --with-docdir=/usr/doc \
   --enable-corefonts \
-  --enable-antialiasing \
   --program-prefix="" \
   --program-suffix="" \
   --build=$CONFIGURE_TRIPLET \
 
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm
+cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm.new
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm.new
 
 # 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/$NAME-$VERSION
-cp -a ANNOUNCE* AUTHORS* BUGS* COPYING* ChangeLog* CHANGELOG* Credits* DEVELOPERS \
-LICENSE* MANIFEST PROVENANCE README* TODO* Exception_to_GPL_for_Qt.txt CHANGES \
-INSTALL PLATFORMS VERSION \
+mkdir -p $PKG/usr/doc/$NAME-$VERSION/html
+cp -a AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README* TODO VERSION \
 $PKG/usr/doc/$NAME-$VERSION
+cp -a doc/*.html $PKG/usr/doc/$NAME-$VERSION/html
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 #----------------------------------------------------------------------
 fi 
 
 find $PKG/usr/info -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/install
+cp -a $CWD/doinst.sh $PKG/install/
+
 if [ -d $PKG/usr/info ] ; then
 cat >> $PKG/install/doinst.sh << EOF
 CWD=\$(pwd)
 EOF
 fi
 
-# Add schemas install to the doinst.sh if schemas are found.
-[ -d $PKG/etc/gconf/schemas ] && {
-# Make sure we have gconftool installed
-echo "if [ -x usr/bin/gconftool-2 ]; then" >> $PKG/install/doinst.sh
-( cd $PKG/etc/gconf/schemas
-for schema in *.schemas; do
- # Install schemas
- echo "GCONF_CONFIG_SOURCE=\"xml::etc/gconf/gconf.xml.defaults\" \
-   usr/bin/gconftool-2 --makefile-install-rule \
-   etc/gconf/schemas/${schema} >/dev/null 2>&1" \
-   >> $PKG/install/doinst.sh
-done;
-)
-# Finish off gconf block
-echo "fi" >> $PKG/install/doinst.sh
-}
-
 mkdir -p $PKG/install
 cat >> $PKG/install/doinst.sh << EOF
+
 # update rarian database
 if [ -x usr/bin/rarian-sk-update ]; then
   usr/bin/rarian-sk-update 1> /dev/null 2> /dev/null
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP
 echo "Package Complete"
+fi
 #--------------------------------------------------------------
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

var/vabs/icewm/src/icewm.desktop

+[Desktop Entry]
+Type=XSession
+Exec=icewm-session
+TryExec=icewm-session
+Name=IceWM
+Comment=A Windows 95-OS/2-Motif-like window manager

var/vabs/icewm/src/patches/icewm-1.3.7-fix_html_docdir.diff

+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`

var/vabs/icewm/src/patches/use_ICEWM_deprecated.patch

+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 ********************************************************/

var/vabs/icewm/src/xinitrc.icewm

+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# Merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Create default user directory & populate it if it does not already exist
+if [ ! -d $HOME/.icewm ]; then
+  mkdir $HOME/.icewm
+  for FILE in keys menu preferences toolbar winoptions;
+    do cat /usr/share/icewm/$FILE > $HOME/.icewm/$FILE;
+  done
+fi
+
+# Start IceWM
+icewmbg &
+icewmtray &
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session dbus-launch --exit-with-session icewm-session
+else
+  exec icewm-session
+fi
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.