From 048fe841f1127e51408c7b6bd9007c3110714a59 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Thu, 13 May 2010 00:42:25 +0200
Subject: system/wine: Updated for version 1.1.24

---
 system/wine/README          |  7 +++++--
 system/wine/slack-desc      | 14 +++++++-------
 system/wine/wine.SlackBuild |  5 +++--
 system/wine/wine.info       |  8 +++++---
 4 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'system')

diff --git a/system/wine/README b/system/wine/README
index 7bb3118f50..deeaeb08f6 100644
--- a/system/wine/README
+++ b/system/wine/README
@@ -6,5 +6,8 @@ script like this:  OPENGL=NO ./wine.SlackBuild
 If you wish to apply an unoffical patch that might fix up some problems
 running IE in wine, then do this: IEFIX=YES ./wine.SlackBuild
 
-While it's not strictly required, the fontforge package is strongly 
-recommended to be installed when building wine.
+This requires fontforge and webcore-fonts.
+
+NOTE: This will not build on a stock 64bit Slackware system, and we do not
+      support doing so with 32bit-compatibility packages.  That doesn't mean
+      that it won't work - we just don't support it at all.
diff --git a/system/wine/slack-desc b/system/wine/slack-desc
index f2171fa428..7159011e2d 100644
--- a/system/wine/slack-desc
+++ b/system/wine/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 wine: wine (Wine Is Not an Emulator)
-wine: 
+wine:
 wine: Wine is an Open Source implementation of the Windows API
 wine: on top of X and Unix.
-wine: 
+wine:
 wine: Homepage: http://www.winehq.com/
-wine: 
-wine: 
-wine: 
-wine: 
-wine: 
+wine:
+wine:
+wine:
+wine:
+wine:
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 3f11c641e7..74ad11987a 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine
-VERSION=1.1.17
+VERSION=1.1.24
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -76,6 +76,7 @@ if [ "$OPENGL" = "YES" ]; then
     do_opengl="without"
 fi
 
+# All of the libraries produced are 32bit libs anyway
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -112,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wine/wine.info b/system/wine/wine.info
index 7cf352fc96..09e8630218 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,10 @@
 PRGNAM="wine"
-VERSION="1.1.17"
+VERSION="1.1.24"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.1.17.tar.bz2"
-MD5SUM="ad73833f304e6c6e4d827989ff75db3d"
+DOWNLOAD="http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.1.24.tar.bz2"
+MD5SUM="b695d6c0e9484c34d5a86fd05378b39d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="dsomero"
-- 
cgit v1.2.3