Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0c5396ce20f8df40ecb05da2c2c7b5707b9c12a8)
  • Date: Sun, 11 Jul 2010 19:00:53 -0500

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

x11-libs/wine/CONFIGURE | 2 +-
x11-libs/wine/HISTORY | 6 ++++++
x11-libs/wine/PRE_BUILD | 4 +++-
x11-libs/wine/sc2-bug23556.diff | 28 ++++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit 0c5396ce20f8df40ecb05da2c2c7b5707b9c12a8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Fix http://bugs.winehq.org/show_bug.cgi?id=23556
Change SC2 Login patch query to all SC2 patches
Apply sc2-bug23556.diff if requested

diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
index 281dd93..3952bc4 100755
--- a/x11-libs/wine/CONFIGURE
+++ b/x11-libs/wine/CONFIGURE
@@ -7,4 +7,4 @@ if [[ "${ARCH}" = 'x86_64' ]]; then
config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64
--enable-maintainer-mode' ''
fi &&

-config_query WINE_SC2_LOGIN "Apply StarCraft II login bug patch?" n
+config_query WINE_SC2_LOGIN "Apply StarCraft II patches?" n
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 8256825..100a80a 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2010-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Change SC2 Login patch query to all SC2 patches
+ * PRE_BUILD: Apply sc2-bug23556.diff if requested
+ * sc2-bug23556.diff: Patch to fix
+ http://bugs.winehq.org/show_bug.cgi?id=23556
+
2010-07-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2-rc7

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 010d598..a99021f 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -20,5 +20,7 @@ fi &&
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
+ patch -p1 < $SPELL_DIRECTORY/sc2-login.diff &&
+ message "${MESSAGE_COLOR}Applying StarCraft II Patch 16
fix...${DEFAULT_COLOR}" &&
+ patch -p1 < $SPELL_DIRECTORY/sc2-bug23556.diff
fi
diff --git a/x11-libs/wine/sc2-bug23556.diff b/x11-libs/wine/sc2-bug23556.diff
new file mode 100644
index 0000000..a13bc4a
--- /dev/null
+++ b/x11-libs/wine/sc2-bug23556.diff
@@ -0,0 +1,28 @@
+#
+# 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
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0c5396ce20f8df40ecb05da2c2c7b5707b9c12a8), Eric Sandall, 07/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page