Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!

2 files changed, 23 insertions, 36 deletions

diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index 64462a78..fd944d22 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for hplip
 
-# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
-# Copyright 2006-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,22 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=hplip
-VERSION=${VERSION:-3.9.4b}
-ARCH=${ARCH:-x86_64}
+PKGNAM=hplip
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -39,19 +48,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -60,9 +72,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix a segfault bug
-zcat $CWD/hplip.prevent_segfault.diff.gz | patch -p1 || exit 1
-
 # Fix udev rules for current versions of udev
 sed -i 's/SYSFS/ATTR/g' data/rules/*.rules
 # Fix ownership in udev rules file
@@ -81,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-docdir=/usr/doc/hplip-$VERSION \
   --with-hpppddir=/usr/share/cups/model/HP \
   --with-drvdir=/usr/share/cups/drv/hp \
+  --enable-hpijs-install \
   --enable-shadow-build \
   --enable-scan-build \
   --enable-gui-build \
@@ -108,5 +118,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/ap/hplip/hplip.prevent_segfault.diff b/source/ap/hplip/hplip.prevent_segfault.diff
deleted file mode 100644
index 1021a2e6..00000000
--- a/source/ap/hplip/hplip.prevent_segfault.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Thanks to Tim Waugh <twaugh redhat com> for the patch
-Prevent crash when DEVICE_URI/PRINTER environment variables are not
-  set (https://bugzilla.redhat.com/show_bug.cgi?id=479808 comment 6)
-
-diff -Nur hplip-3.9.4b.old/prnt/hpijs/hpijs.cpp hplip-3.9.4b.new/prnt/hpijs/hpijs.cpp
---- hplip-3.9.4b.old/prnt/hpijs/hpijs.cpp	2009-04-29 15:36:54.000000000 -0500
-+++ hplip-3.9.4b.new/prnt/hpijs/hpijs.cpp	2009-06-09 00:41:44.684172840 -0500
-@@ -218,8 +218,14 @@
- 		// call dbus here
- 		const char    *user_name = " ";
- 		const char    *title     = " ";
-+		char *device_uri = getenv ("DEVICE_URI");
-+		char *printer = getenv("PRINTER");
- 		int     job_id = 0;
--                SendDbusMessage (getenv ("DEVICE_URI"), getenv("PRINTER"),
-+		if (!device_uri)
-+		    device_uri = "";
-+		if (!printer)
-+		    printer = "";
-+                SendDbusMessage (device_uri, printer,
- 	     	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
- 				 user_name, job_id, title);
-                 BUG("unable to set device=%s, err=%d\n", svalue, r);