From f3515dc85817e30f561165f8c36bba5a087b8cf5 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Thu, 12 Jul 2018 15:23:48 +0200
Subject: [PATCH] wine: update to 3.12

---
 wine/PKGBUILD       |  4 +--
 wine/bug40253.patch | 87 ---------------------------------------------
 2 files changed, 2 insertions(+), 89 deletions(-)
 delete mode 100644 wine/bug40253.patch

diff --git a/wine/PKGBUILD b/wine/PKGBUILD
index bb045fa..b5a8c93 100644
--- a/wine/PKGBUILD
+++ b/wine/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=wine
-pkgver=3.11
+pkgver=3.12
 pkgrel=1
 _pkgver=${pkgver/rc/-rc}
 source=(https://dl.winehq.org/wine/source/3.x/$pkgname-$_pkgver.tar.xz
         30-win32-aliases.conf)
 
-md5sums=('34ffa2f1177207bdd92bafbc480db105'
+md5sums=('d18211f3c331d5c70a8c16cc03911ec6'
          '1ff4e467f59409272088d92173a0f801')
 pkgdesc="A compatibility layer for running Windows programs"
 url="https://www.winehq.org/"
diff --git a/wine/bug40253.patch b/wine/bug40253.patch
deleted file mode 100644
index 04c7fde..0000000
--- a/wine/bug40253.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c6d6dcee47eb97fd75e389434d4136de2f31414c Mon Sep 17 00:00:00 2001
-From: Alexandre Julliard <julliard@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@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
-