Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

6 files changed, 66 insertions, 62 deletions

diff --git a/source/xap/windowmaker/WindowMaker.noopensusemenu.diff b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff
new file mode 100644
index 00000000..e68fa85a
--- /dev/null
+++ b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff
@@ -0,0 +1,14 @@
+--- ./util/wmgenmenu.h.orig	2012-05-24 16:28:16.000000000 -0500
++++ ./util/wmgenmenu.h	2012-07-29 15:34:37.242208543 -0500
+@@ -458,7 +458,10 @@
+ char *OpenSUSE[MAX_NR_APPS][2] = {
+ 	{ N_("YaST 2"), "yast2" },
+ 	{ N_("YaST"), "yast !" },
+-	{ N_("System Settings"), "systemsettings" },
++        /* The KDE systemsettings is mistaken for an OpenSUSE tool, and adds */
++        /* and OpenSUSE menu that starts it.  I can't think of any reason    */
++        /* this would be useful under WindowMaker, so I'm commenting it out. */
++	/* { N_("System Settings"), "systemsettings" }, */
+ 	{ N_("UMTSMon"), "umtsmon" },
+ 	{ NULL, NULL }
+ };
diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild
index 74462e28..da5ac679 100755
--- a/source/xap/windowmaker/windowmaker.SlackBuild
+++ b/source/xap/windowmaker/windowmaker.SlackBuild
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=20060427cvs
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-0.95.3}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -59,15 +59,9 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf WindowMaker-$VERSION
-tar xvf $CWD/WindowMaker-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/WindowMaker-$VERSION.tar.xz || exit 1
 cd WindowMaker-$VERSION || exit 1
 
-zcat $CWD/windowmaker.no-mmx.diff.gz | patch -p1 --verbose -F 3 || exit 1
-
-zcat $CWD/windowmaker.png.1.4.0.diff.gz | patch -p1 --verbose || exit 1
-
-sh autogen.sh
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +70,10 @@ find . \
   -exec chmod 644 {} \;
 
 # This should be non-interactive where possible.
-zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit
+zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1
+
+# Get rid of OpenSUSE menu:
+zcat $CWD/WindowMaker.noopensusemenu.diff.gz | patch -p1 --verbose || exit 1
 
 LINGUAS="$(cd po ; /bin/ls *.po | sed 's/.po//g')" \
 GNUSTEP_LOCAL_ROOT=/usr/lib${LIBDIRSUFFIX}/GNUstep \
@@ -87,10 +84,11 @@ NLSDIR=/usr/share/locale \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc/X11 \
-  --enable-gnome \
-  --enable-kde \
+  --docdir=/usr/doc/WindowMaker-$VERSION \
   --enable-usermenu \
-  --with-appspath=/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications \
+  --enable-xrandr \
+  --enable-xinerama \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 # NLS bugs like -i
@@ -100,10 +98,18 @@ make $NUMJOBS || make -i || exit 1
 sed -i -e "s#/usr/local/GNUstep/Applications/WPrefs.app/#/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/#" \
   $(grep -lr '/usr/local/GNUstep/Applications/WPrefs.app/' *)
 
+# Fix hard coded paths in util/wmgenmenu.c for
+#  "Configure Window Maker" root menu entry
+#  Appearance/{Themes, Styles, Icons} entries.
+
+sed -i -e "s#WMCreatePLString(\"WPrefs\")#WMCreatePLString(\"/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/WPrefs\")#" \
+       -e "s#/usr/local/share#/usr/share/#" util/wmgenmenu.c
+
+
 make -i install DESTDIR=$PKG 
 mkdir -p $PKG/usr/doc/WindowMaker-$VERSION
 cp -a \
-  AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk INSTALL INSTALL.cs INSTALL.es INSTALL.fr INSTALL.pt INSTALL.sk MIRRORS NEWS README README.definable-cursor README.pt TODO \
+  AUTHORS BUGFORM BUGS COPYING* FAQ* INSTALL* MIRRORS NEWS README* TODO \ 
    $PKG/usr/doc/WindowMaker-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -116,7 +122,7 @@ fi
 
 cd $TMP
 rm -rf WindowMaker-extra-0.1
-tar xvf $CWD/WindowMaker-extra-0.1.tar.gz || exit 1
+tar xvf $CWD/WindowMaker-extra-0.1.tar.xz || exit 1
 cd WindowMaker-extra-0.1 || exit 1
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -135,7 +141,20 @@ mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.wmaker.gz > $PKG/etc/X11/xinit/xinitrc.wmaker
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.wmaker
 
-gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/sk/man1/*
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/windowmaker/windowmaker.no-mmx.diff b/source/xap/windowmaker/windowmaker.no-mmx.diff
deleted file mode 100644
index 277cc79e..00000000
--- a/source/xap/windowmaker/windowmaker.no-mmx.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./configure.ac.01	2008-06-02 08:42:30.000000000 +0200
-+++ ./configure.ac	2008-06-02 08:46:49.000000000 +0200
-@@ -190,7 +190,15 @@
- # until we fix it, leave it disabled
- asm_support=no
- mmx_support=no
--if test "$ac_cv_prog_gcc" = yes; then
-+
-+check_for_mmx_support=yes
-+AC_ARG_ENABLE(mmx,
-+  [  --disable-mmx          disable compilation of MMX inline assembly ],
-+  [if test x$enableval != xyes; then
-+    check_for_mmx_support=no
-+  fi])
-+
-+if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then
- case $host_cpu in
- *i?86*)
-     # gcc-3.3 or newer complains about some of our stuff without this
diff --git a/source/xap/windowmaker/windowmaker.png.1.4.0.diff b/source/xap/windowmaker/windowmaker.png.1.4.0.diff
deleted file mode 100644
index a6359c4b..00000000
--- a/source/xap/windowmaker/windowmaker.png.1.4.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./wrlib/load.c.orig	2008-04-30 15:45:26.000000000 -0500
-+++ ./wrlib/load.c	2010-02-11 15:39:38.000000000 -0600
-@@ -348,7 +348,7 @@
- 
- #ifdef USE_PNG
-     /* check for PNG */
--    if (png_check_sig(buffer, 8))
-+    if (!png_sig_cmp(buffer, 0, 8))
-         return IM_PNG;
- #endif
- 
diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff
index c80edd34..3fdfe643 100644
--- a/source/xap/windowmaker/wmaker.inst.diff
+++ b/source/xap/windowmaker/wmaker.inst.diff
@@ -1,10 +1,12 @@
---- ./util/wmaker.inst.in.orig	2002-05-30 13:13:46.000000000 -0700
-+++ ./util/wmaker.inst.in	2002-05-30 13:16:37.000000000 -0700
-@@ -37,19 +37,7 @@
- make_script() {
- 	ISCRIPT=$1
+diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in
+--- WindowMaker-0.95.2.orig/util/wmaker.inst.in	2012-02-14 13:36:01.000000000 -0600
++++ WindowMaker-0.95.2/util/wmaker.inst.in	2012-02-14 18:25:28.213206250 -0600
+@@ -33,20 +33,7 @@
  
--	cat << EOF >> $ISCRIPT
+ make_script() {
+ 	ISCRIPT="$1"
+-
+-	cat << EOF >> "$ISCRIPT"
 -# Window Maker default X session startup script 
 -
 -PATH="\$PATH:$BINDIR"
@@ -12,16 +14,16 @@
 -# If you login from xdm, uncomment this to make error messages appear
 -# in the console window.
 -#
--# tail -f $HOME/.xsession-errors > /dev/console &
+-# tail -f "$HOME"/.xsession-errors > /dev/console &
 -
 -exec wmaker
 -
 -EOF
-+        cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
- 	chmod +rx $ISCRIPT
++	cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
+ 	chmod +rx "$ISCRIPT"
  }
  
-@@ -329,20 +317,7 @@
+@@ -298,19 +285,7 @@
  
  trap "show_end_message;exit" 2
  
@@ -38,8 +40,7 @@
 -	echo "Using .xinitrc as a default value"
 -	file=.xinitrc
 -fi
--
 +file=.xinitrc
- if [ -f $USERDIR/$file ]; then
- 	mv $USERDIR/$file $USERDIR/$file.old.$DATE
- fi
+ 
+ if [ -f "$USERDIR/$file" ]; then
+ 	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
diff --git a/source/xap/windowmaker/xinitrc.wmaker b/source/xap/windowmaker/xinitrc.wmaker
index 2c43c1eb..386588a4 100644
--- a/source/xap/windowmaker/xinitrc.wmaker
+++ b/source/xap/windowmaker/xinitrc.wmaker
@@ -36,7 +36,7 @@ fi
 
 # Start the window manager:
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-  exec ck-launch-session /usr/bin/wmaker $NOCPP
+  exec ck-launch-session dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP
 else
-  exec /usr/bin/wmaker $NOCPP
+  exec dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP
 fi