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

Eric Sandall scm at sourcemage.org
Sat Jul 31 00:29:27 EDT 2010


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

 x11-libs/wine/DETAILS   |    2 +-
 x11-libs/wine/HISTORY   |    5 +++++
 x11-libs/wine/PRE_BUILD |    6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

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

    wine: Updated devel to 1.3.0
    	Only apply sc2-bug23556.diff for non-devel, patch applied upstream

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index ce6726f..caab161 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_DEVEL == y ]]; then
-         VERSION=1.2
+         VERSION=1.3.0
   else
          VERSION=1.2
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index d4fc589..1f58d48 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,8 @@
+2010-07-30 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated devel to 1.3.0
+	* PRE_BUILD: Only apply sc2-bug23556.diff for non-devel,
+	  patch applied upstream
+
 2010-07-16 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated devel and stable to 1.2
 	* PRE_BUILD: Remove old 1.0 patches
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index aa7ced1..596f69e 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -4,6 +4,8 @@ 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 &&
-  message "${MESSAGE_COLOR}Applying StarCraft II Patch 16 fix...${DEFAULT_COLOR}" &&
-  patch -p1 < $SPELL_DIRECTORY/sc2-bug23556.diff
+  if [[ "$WINE_DEVEL" == "n" ]]; then
+    message "${MESSAGE_COLOR}Applying StarCraft II Patch 16 fix...${DEFAULT_COLOR}" &&
+    patch -p1 < $SPELL_DIRECTORY/sc2-bug23556.diff
+  fi
 fi



More information about the SM-Commit mailing list