Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

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.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

9 files changed, 60 insertions, 79 deletions

diff --git a/source/x/x11/patch/README b/source/x/x11/patch/README
new file mode 100644
index 000000000..c5af64b32
--- /dev/null
+++ b/source/x/x11/patch/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch
new file mode 100644
index 000000000..6097b12a3
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \
+     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
new file mode 100644
index 000000000..a69b07040
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
@@ -0,0 +1,26 @@
+# Bug 26090 - xcompmgr and ICCCM manager spec
+https://bugs.freedesktop.org/show_bug.cgi?id=26090
+https://bugs.freedesktop.org/attachment.cgi?id=32702
+
+diff -u xcompmgr-1.1.5/xcompmgr.c xcompmgr.new/xcompmgr.c
+--- xcompmgr-1.1.5/xcompmgr.c	2009-10-20 00:44:23.000000000 +0200
++++ xcompmgr.new/xcompmgr.c	2010-01-17 22:44:31.261276441 +0100
+@@ -1924,6 +1924,18 @@
+ 
+     XSetSelectionOwner (dpy, a, w, 0);
+ 
++    XClientMessageEvent ev;
++    ev.type = ClientMessage;
++    ev.window = RootWindow (dpy, scr);
++    ev.message_type = a;
++    ev.format = 32;
++    ev.data.l[0] = CurrentTime;
++    ev.data.l[1] = a;
++    ev.data.l[2] = w;
++    ev.data.l[3] = 0;
++    ev.data.l[4] = 0;
++    XSendEvent(dpy, RootWindow (dpy, scr), False, StructureNotifyMask, (XEvent*)&ev);
++
+     return True;
+ }
+ 
diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch
deleted file mode 100644
index 5aa46dee5..000000000
--- a/source/x/x11/patch/xcursorgen.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
deleted file mode 100644
index ad7ae105c..000000000
--- a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./configure.orig	2009-10-16 19:42:25.000000000 -0500
-+++ ./configure	2010-02-21 13:57:53.000000000 -0600
-@@ -5043,12 +5043,12 @@
-     pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
--  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null`
-+  pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -5059,12 +5059,12 @@
-     pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
--  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null`
-+  pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -5082,14 +5082,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1`
-+	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng14" 2>&1`
-         else
--	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1`
-+	        XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng14" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XCURSORGEN_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng14) were not met:
- 
- $XCURSORGEN_PKG_ERRORS
- 
-@@ -5100,7 +5100,7 @@
- and XCURSORGEN_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met:
-+$as_echo "$as_me: error: Package requirements (x11 xcursor libpng14) were not met:
- 
- $XCURSORGEN_PKG_ERRORS
- 
diff --git a/source/x/x11/patch/xf86-input-synaptics.patch b/source/x/x11/patch/xf86-input-synaptics.patch
deleted file mode 100644
index f41034c37..000000000
--- a/source/x/x11/patch/xf86-input-synaptics.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable tap-to-click out of the box, closing one of the
-# most reported bugs of the last 2 years or so.
-# Thanks to Piter Punk for figuring out the proper fix!
-zcat $CWD/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
deleted file mode 100644
index 2fdf4e0d1..000000000
--- a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fdi/11-x11-synaptics.fdi.orig	2009-10-11 18:11:21.000000000 -0500
-+++ ./fdi/11-x11-synaptics.fdi	2010-04-24 12:59:37.000000000 -0500
-@@ -3,6 +3,8 @@
-   <device>
-     <match key="info.capabilities" contains="input.touchpad">
-         <merge key="input.x11_driver" type="string">synaptics</merge>
-+        <!-- Enable tap click by default: -->
-+        <merge key="input.x11_options.TapButton1" type="string">1</merge>
-         <!-- Arbitrary options can be passed to the driver using
-              the input.x11_options property since xorg-server-1.5. -->
-         <!-- EXAMPLES:
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 16cf61e36..e3218a038 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,2 +1,3 @@
-zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
new file mode 100644
index 000000000..74f799a11
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
@@ -0,0 +1,11 @@
+--- ./hw/xfree86/common/xf86pciBus.c.orig	2010-07-01 12:17:35.000000000 -0500
++++ ./hw/xfree86/common/xf86pciBus.c	2010-11-18 16:56:57.633003654 -0600
+@@ -1118,7 +1118,7 @@
+ 	    break;
+ 	case 0x102b:		    driverList[0] = "mga";	break;
+ 	case 0x10c8:		    driverList[0] = "neomagic"; break;
+-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
++	case 0x10de: case 0x12d2:   driverList[0] = "nouveau" ; driverList[1] = "nv";	break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+         case 0x1b36:		    driverList[0] = "qxl"; break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;