summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/wine/IE_fix_maybe.patch49
-rw-r--r--system/wine/README19
-rw-r--r--system/wine/wine.SlackBuild14
-rw-r--r--system/wine/wine.info6
4 files changed, 14 insertions, 74 deletions
diff --git a/system/wine/IE_fix_maybe.patch b/system/wine/IE_fix_maybe.patch
deleted file mode 100644
index 07bc4d6d51..0000000000
--- a/system/wine/IE_fix_maybe.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-NOTE: This patch is *intended* to be REVERSED when applied to the wine
-source, as we need to *remove* this from the code, or else IE might
-have problems. --rworkman (SBo)
-####### End my comments ########
-
-Module: wine
-Branch: master
-Commit: 628a515b83c317388ddb4fa9a7b29a42135acee0
-URL: http://source.winehq.org/git/wine.git/?a=commit;h=628a515b83c317388ddb4fa9a7b29a42135acee0
-
-Author: Rob Shearman <rob at codeweavers.com>
-Date: Fri Jan 4 17:43:56 2008 +0000
-
-kernel32: Implement RegisterWaitForSingleObjectEx.
-
----
-
- dlls/kernel32/sync.c | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
-index 168a00f..b8b8f0c 100644
---- a/dlls/kernel32/sync.c
-+++ b/dlls/kernel32/sync.c
-@@ -270,9 +270,19 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject,
- WAITORTIMERCALLBACK Callback, PVOID Context,
- ULONG dwMilliseconds, ULONG dwFlags )
- {
-- FIXME("%p %p %p %d %d\n",
-+ NTSTATUS status;
-+ HANDLE hNewWaitObject;
-+
-+ TRACE("%p %p %p %d %d\n",
- hObject,Callback,Context,dwMilliseconds,dwFlags);
-- return 0;
-+
-+ status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags );
-+ if (status != STATUS_SUCCESS)
-+ {
-+ SetLastError( RtlNtStatusToDosError(status) );
-+ return NULL;
-+ }
-+ return hNewWaitObject;
- }
-
- /***********************************************************************
-
-
-
diff --git a/system/wine/README b/system/wine/README
index 37b89cd51d..578c86d92e 100644
--- a/system/wine/README
+++ b/system/wine/README
@@ -1,16 +1,15 @@
-Wine is an Open Source implementation of the Windows API on top of X and Unix.
+Wine is an Open Source implementation of the Windows API on top of X
+and Unix.
-If your video card does not support hardware-accelerated OpenGL, then run the
-script like this: OPENGL=NO ./wine.SlackBuild
+NOTE: This builds the stable version of wine. If you need
+cutting-edge then you may want to check out wine-staging.
-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
+If your video card does not support hardware-accelerated OpenGL, then
+run the script like this: OPENGL=NO ./wine.SlackBuild
-These options can be used together.
-
-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.
+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.
Optional dependencies:
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 093c1a6ceb..9304f5889b 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wine
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -40,13 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# Some user reports indicate that wine and IE don't always get along
-# and that this might fix it. The wine team doesn't agree that it's
-# the right thing to do, but it's your call.
-IEFIX=${IEFIX:-NO}
-
# If your video card does not support hardware accelerated OpenGL,
-# the run the script like: OPENGL=NO ./wine.SlackBuild
+# then run the script like: OPENGL=NO ./wine.SlackBuild
OPENGL=${OPENGL:-YES}
if [ "$ARCH" = "i586" ]; then
@@ -78,11 +73,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# If IEFIX != NO above, then reverse the patch
-if [ "$IEFIX" != "NO" ]; then
- patch -p1 -R --verbose < $CWD/IE_fix_maybe.patch
-fi
-
# If OPENGL=YES above, then enable opengl; otherwise, disable it.
if [ "$OPENGL" = "YES" ]; then
do_opengl="with"
diff --git a/system/wine/wine.info b/system/wine/wine.info
index 64b11c7ddd..5ad55628a9 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,8 @@
PRGNAM="wine"
-VERSION="2.0.1"
+VERSION="2.0.3"
HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="http://prdownloads.sourceforge.net/wine/wine-2.0.1.tar.xz"
-MD5SUM="4cad3aafa509f937aaaf269312e531fe"
+DOWNLOAD="http://prdownloads.sourceforge.net/wine/wine-2.0.3.tar.xz"
+MD5SUM="f85b3919cf45aa640f7784d3093a8995"
DOWNLOAD_x86_64="UNSUPPORTED"
MD5SUM_x86_64=""
REQUIRES=""