[arch-commits] Commit in wine/trunk (PKGBUILD bug40253.patch)

[Felix Yan]

    Date: Tuesday, March 8, 2016 @ 07:16:43
  Author: fyan
Revision: 165562

upgpkg: wine 1.9.5-1

Added:
  wine/trunk/bug40253.patch
Modified:
  wine/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++-
 bug40253.patch |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-08 03:09:36 UTC (rev 165561)
+++ PKGBUILD	2016-03-08 06:16:43 UTC (rev 165562)
@@ -11,10 +11,12 @@
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(https://dl.winehq.org/wine/source/1.9/$pkgname-$_pkgbasever.tar.bz2{,.sign}
-        30-win32-aliases.conf)
+        30-win32-aliases.conf
+        bug40253.patch)
 sha1sums=('a37f61c22b48b195361a234c9e91e49070b50a99'
           'SKIP'
-          '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+          '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+          'af4d84a92e33f0a1d6c1bfd32a5c9d8cfb74eb6d')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
@@ -111,6 +113,10 @@
   # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
+
+  cd $pkgname
+  # https://bugs.winehq.org/show_bug.cgi?id=40253
+  patch -p1 -i ../bug40253.patch
 }
 
 build() {

Added: bug40253.patch
===================================================================
--- bug40253.patch	                        (rev 0)
+++ bug40253.patch	2016-03-08 06:16:43 UTC (rev 165562)
@@ -0,0 +1,87 @@
+From c6d6dcee47eb97fd75e389434d4136de2f31414c Mon Sep 17 00:00:00 2001
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Mon, 7 Mar 2016 16:26:42 +0900
+Subject: [PATCH 1/1] configure: Don't create makefiles in directories that are
+ symlinks in a Wow64 build.
+
+Signed-off-by: Alexandre Julliard <julliard at winehq.org>
+---
+ aclocal.m4   | 4 ++++
+ configure    | 9 ++++++---
+ configure.ac | 6 +++---
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 00eeb98..41eb7f6 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -299,6 +299,10 @@ wine_fn_config_makefile ()
+     ac_enable=$[2]
+     ac_flags=$[3]
+ 
++    case $ac_dir in
++    dnl These are created as symlinks for wow64 builds
++    fonts|server) test -z "$with_wine64" || return ;;
++    esac
+     AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return])
+     wine_fn_all_rules
+     wine_fn_install_rules
+diff --git a/configure b/configure
+index 14b4082..bee8e6b 100755
+--- a/configure
++++ b/configure
+@@ -7511,6 +7511,9 @@ wine_fn_config_makefile ()
+     ac_enable=$2
+     ac_flags=$3
+ 
++    case $ac_dir in
++        fonts|server) test -z "$with_wine64" || return ;;
++    esac
+     if eval test \"x\$"$ac_enable"\" = x"no"; then :
+   wine_fn_disabled_rules; return
+ fi
+@@ -18263,15 +18266,15 @@ fi
+ 
+ if test -n "$with_wine64"
+ then
+-    wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+-fonts server tools:
++    wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
++fonts server:
+ 	\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
+ $with_wine64/loader/wine:
+ 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
+ $with_wine64/loader/wine-preloader:
+ 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
+ clean::
+-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
++	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
+ else
+     WINELOADER_INSTALL="wine.inf"
+ 
+diff --git a/configure.ac b/configure.ac
+index b57ff6a..09e0f53 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3596,15 +3596,15 @@ fi
+ if test -n "$with_wine64"
+ then
+     WINE_APPEND_RULE(
+-[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+-fonts server tools:
++[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
++fonts server:
+ 	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
+ $with_wine64/loader/wine:
+ 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
+ $with_wine64/loader/wine-preloader:
+ 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
+ clean::
+-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
++	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
+ else
+     AC_SUBST(WINELOADER_INSTALL,"wine.inf")
+     WINE_APPEND_RULE(
+-- 
+1.9.1
+