[SM-Commit] GIT changes to master grimoire by Eric Sandall (0e97e5b8fba4b6f30b902361841956ddec0044ff)

Eric Sandall scm at sourcemage.org
Wed Sep 21 18:33:22 EDT 2011


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 x11-libs/wine/HISTORY           |    4 ++++
 x11-libs/wine/PRE_BUILD         |    6 +-----
 x11-libs/wine/sc2-bug23556.diff |   28 ----------------------------
 3 files changed, 5 insertions(+), 33 deletions(-)

New commits:
commit 0e97e5b8fba4b6f30b902361841956ddec0044ff
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: sc2-bug23556.diff was applied in 1.3.28 release

diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index b8ecf51..91d2c57 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,7 @@
+2011-09-21 Eric Sandall <sandalle at sourcemage.org>
+	* sc2-bug23556.diff: Removed, applied in 1.3.28
+	* PRE_BUILD: Do not apply sc2-bug23556.diff
+
 2011-09-14 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PRE_BUILD, PREPARE: Use prepare_select_branch
 
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index f2e8001..fe47929 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -3,9 +3,5 @@ default_pre_build  &&
 if [[ "$WINE_SC2_LOGIN" == "y" ]]; then
   message "${MESSAGE_COLOR}Applying StarCraft II login bug patch...${DEFAULT_COLOR}" &&
   cd $SOURCE_DIRECTORY &&
-  patch -p1 < $SPELL_DIRECTORY/sc2-login.diff &&
-  if [[ "$WINE_BRANCH" == "devel" ]]; then
-    message "${MESSAGE_COLOR}Applying StarCraft II Patch 16 fix...${DEFAULT_COLOR}" &&
-    patch -p1 < $SPELL_DIRECTORY/sc2-bug23556.diff
-  fi
+  patch -p1 < $SPELL_DIRECTORY/sc2-login.diff
 fi
diff --git a/x11-libs/wine/sc2-bug23556.diff b/x11-libs/wine/sc2-bug23556.diff
deleted file mode 100644
index a13bc4a..0000000
--- a/x11-libs/wine/sc2-bug23556.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Fixes http://bugs.winehq.org/show_bug.cgi?id=23556
-#
-From e6eb3d0f06e76812ef8d75ce8e6988a192bf9687 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20K=C3=B6berle?= <florian at fkoeberle.de>
-Date: Sat, 10 Jul 2010 11:58:09 +0200
-Subject: [PATCH] wined3d: Let GetRasterStatus return D3DERR_INVALIDCALL.
-
----
- dlls/wined3d/swapchain_base.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
-index 1817de2..3f2a4e5 100644
---- a/dlls/wined3d/swapchain_base.c
-+++ b/dlls/wined3d/swapchain_base.c
-@@ -131,7 +131,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *ifac
-         FIXME("iface %p, raster_status %p stub!\n", iface, pRasterStatus);
-         warned = TRUE;
-     }
--    return WINED3D_OK;
-+    return WINED3DERR_INVALIDCALL;
- }
- 
- HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) {
--- 
-1.7.0.4
-


More information about the SM-Commit mailing list