diff options
Diffstat (limited to 'wine')
| -rw-r--r-- | wine/.footprint | 6 | ||||
| -rw-r--r-- | wine/.md5sum | 5 | ||||
| -rw-r--r-- | wine/Pkgfile | 15 | ||||
| -rw-r--r-- | wine/build.patch | 87 |
4 files changed, 106 insertions, 7 deletions
diff --git a/wine/.footprint b/wine/.footprint index 6b1a158e6..bf8810056 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -1626,6 +1626,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/shell32.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/shfolder.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/shlwapi.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/shutdown.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/slbcsp.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/slc.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/snmpapi.dll @@ -2162,6 +2163,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/shell32.dll.so -rwxr-xr-x root/root usr/lib/wine/shfolder.dll.so -rwxr-xr-x root/root usr/lib/wine/shlwapi.dll.so +-rwxr-xr-x root/root usr/lib/wine/shutdown.exe.so -rwxr-xr-x root/root usr/lib/wine/slbcsp.dll.so -rwxr-xr-x root/root usr/lib/wine/slc.dll.so -rwxr-xr-x root/root usr/lib/wine/snmpapi.dll.so @@ -3090,6 +3092,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/shell32.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/shfolder.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/shlwapi.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/shutdown.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/slbcsp.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/slc.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/snmpapi.dll @@ -3682,6 +3685,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/shell32.dll.so -rwxr-xr-x root/root usr/lib32/wine/shfolder.dll.so -rwxr-xr-x root/root usr/lib32/wine/shlwapi.dll.so +-rwxr-xr-x root/root usr/lib32/wine/shutdown.exe.so -rwxr-xr-x root/root usr/lib32/wine/slbcsp.dll.so -rwxr-xr-x root/root usr/lib32/wine/slc.dll.so -rwxr-xr-x root/root usr/lib32/wine/snmpapi.dll.so @@ -3917,5 +3921,5 @@ drwxr-xr-x root/root usr/share/wine/gecko/ -rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.44-x86_64.msi -rw-r--r-- root/root usr/share/wine/l_intl.nls drwxr-xr-x root/root usr/share/wine/mono/ --rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.5.6.msi +-rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.6.0.msi -rw-r--r-- root/root usr/share/wine/wine.inf diff --git a/wine/.md5sum b/wine/.md5sum index 658ab8344..11d54f957 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,5 @@ -28e703edf86a9fb9f6b11bf61b9e0d1d wine-1.9.4.tar.bz2 -6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi +22014325fbd6c6f39988fdbd2874adc0 build.patch +c5f2f2e7dc2f0fe84d75833bc90ebd4f wine-1.9.5.tar.bz2 +5ce501be8d4f9751a351b47536731a7b wine-mono-4.6.0.msi f6ff2bb5dddc144726bd9a955fb16649 wine_gecko-2.44-x86.msi 59e7a37dcdc87f5e4f030bfafbb1c0d6 wine_gecko-2.44-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index c85b03e6f..2dc34deee 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,19 +5,26 @@ # Depends on:fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32 gcc48 name=wine -version=1.9.4 +version=1.9.5 release=1 -source=(https://dl.winehq.org/wine/source/1.9/$name-$version.tar.bz2 +source=(http://dl.winehq.org/wine/source/1.9/$name-$version.tar.bz2 http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86.msi http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86_64.msi - http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi) + http://dl.winehq.org/wine/wine-mono/4.6.0/wine-mono-4.6.0.msi + build.patch) build() { install -d wine32 wine64 export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + + # https://bugs.archlinux.org/task/48054 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140 export CC='gcc-4.8' CXX='g++-4.8' + # https://bugs.winehq.org/show_bug.cgi?id=402534 + patch -d $name-$version -p1 -i $SRC/build.patch + cd wine64 ../$name-$version/configure \ @@ -54,7 +61,7 @@ build() { $SRC/wine_gecko-2.44-x86.msi \ $SRC/wine_gecko-2.44-x86_64.msi - install $SRC/wine-mono-4.5.6.msi $PKG/usr/share/wine/mono/ + install $SRC/wine-mono-4.6.0.msi $PKG/usr/share/wine/mono/ rm -r $PKG/usr/share/man/??.UTF-8 } diff --git a/wine/build.patch b/wine/build.patch new file mode 100644 index 000000000..6e6a04a41 --- /dev/null +++ b/wine/build.patch @@ -0,0 +1,87 @@ +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] 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 + |