commit 22d89d74ac4c4008e8e1f34fafb9fb75a2d03780 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Nov 29 12:57:16 2015 +1100 wine: 1.7.55 -> 1.8-rc2 diff --git a/wine/.footprint b/wine/.footprint index 79822a6..8628760 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -210,6 +210,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ -rw-r--r-- root/root usr/include/wine/windows/d3dtypes.h -rw-r--r-- root/root usr/include/wine/windows/d3dvec.inl -rw-r--r-- root/root usr/include/wine/windows/d3dx10.h +-rw-r--r-- root/root usr/include/wine/windows/d3dx10async.h -rw-r--r-- root/root usr/include/wine/windows/d3dx10core.h -rw-r--r-- root/root usr/include/wine/windows/d3dx10core.idl -rw-r--r-- root/root usr/include/wine/windows/d3dx9.h diff --git a/wine/.md5sum b/wine/.md5sum index 48923cf..1ad92cf 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,5 +1,4 @@ -0fa4d4580a9e3738a39f0bdc94f33564 wine-1.7.55-configure_fix.patch -161b37f57ed21508d9171df664ff5e13 wine-1.7.55.tar.bz2 +1707ec947597d32619fd73f65940990c wine-1.8-rc2.tar.bz2 6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi 66fa7ceca8c0aa84c6a2db8672a743b6 wine_gecko-2.40-x86.msi 5e5d242e52e885190a0fe02a2e38a987 wine_gecko-2.40-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index b759fbc..d24741c 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,19 +5,16 @@ # 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 name=wine -version=1.7.55 +version=1.8-rc2 release=1 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 http://downloads.sourceforge.net/wine/wine_gecko-2.40-x86.msi http://downloads.sourceforge.net/wine/wine_gecko-2.40-x86_64.msi - http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi - wine-1.7.55-configure_fix.patch) + http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi) build() { install -d wine32 wine64 - patch -d $name-$version -p1 -i $SRC/wine-1.7.55-configure_fix.patch - cd wine64 ../$name-$version/configure \ diff --git a/wine/wine-1.7.55-configure_fix.patch b/wine/wine-1.7.55-configure_fix.patch deleted file mode 100644 index 02dedb6..0000000 --- a/wine/wine-1.7.55-configure_fix.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://github.com/wine-mirror/wine/commit/480e95ae97f298d2e894a3a943617f887... -makefiles: Generate makefiles and po rules only for disabled dlls. -Signed-off-by: Alexandre Julliard <julliard@winehq.org> -diff -pruN wine-1.7.55.orig/aclocal.m4 wine-1.7.55/aclocal.m4 ---- wine-1.7.55.orig/aclocal.m4 2015-11-17 23:54:27.000000000 +0000 -+++ wine-1.7.55/aclocal.m4 2015-11-17 23:54:51.000000000 +0000 -@@ -330,9 +330,11 @@ wine_fn_disabled_rules () - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - -- wine_fn_depend_rules -- wine_fn_clean_rules $ac_clean -- wine_fn_pot_rules -+ wine_fn_append_rule \ -+"__clean__: $ac_dir/clean -+.PHONY: $ac_dir/clean -+$ac_dir/clean: dummy -+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" - } - - wine_fn_config_makefile () -@@ -397,7 +399,7 @@ wine_fn_config_dll () - - AS_VAR_IF([$ac_enable],[no], - dnl enable_win16 is special in that it disables import libs too -- [if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 -+ [if test "$ac_enable" != enable_win16 - then - wine_fn_depend_rules - wine_fn_clean_rules $ac_clean -diff -pruN wine-1.7.55.orig/configure wine-1.7.55/configure ---- wine-1.7.55.orig/configure 2015-11-17 23:54:27.000000000 +0000 -+++ wine-1.7.55/configure 2015-11-17 23:55:40.000000000 +0000 -@@ -7520,9 +7520,11 @@ wine_fn_disabled_rules () - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - -- wine_fn_depend_rules -- wine_fn_clean_rules $ac_clean -- wine_fn_pot_rules -+ wine_fn_append_rule \ -+"__clean__: $ac_dir/clean -+.PHONY: $ac_dir/clean -+$ac_dir/clean: dummy -+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" - } - - wine_fn_config_makefile () -@@ -7596,7 +7598,7 @@ fi - test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" - - if eval test \"x\$"$ac_enable"\" = x"no"; then : -- if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 -+ if test "$ac_enable" != enable_win16 - then - wine_fn_depend_rules - wine_fn_clean_rules $ac_clean -@@ -8241,7 +8243,6 @@ fi - - linux-android*) - DLLFLAGS="$DLLFLAGS -fPIC" -- dlldir="\${libdir}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 - $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : -@@ -8350,36 +8351,31 @@ $as_echo "$ac_cv_cflags__Wl___enable_new - if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then : - LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags" - fi -- -- case $host_cpu in -- *i[3456789]86* | x86_64) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 --$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } --if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-pie... " >&6; } -+if ${ac_cv_cflags__Wl__pie+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" -+CFLAGS="$CFLAGS -Wl,-pie" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes -+ ac_cv_cflags__Wl__pie=yes - else -- ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no -+ ac_cv_cflags__Wl__pie=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_wine_try_cflags_saved - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 --$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } --if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : -- LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 -+$as_echo "$ac_cv_cflags__Wl__pie" >&6; } -+if test "x$ac_cv_cflags__Wl__pie" = xyes; then : -+ LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie" - fi -- ;; -- esac - - LIBWINE_SHAREDLIB="libwine.so" - -@@ -14943,6 +14939,7 @@ case $build_os in - esac - - case $host_os in -+ linux-android*) ;; - linux*) - case $host_cpu in - *i[3456789]86*|x86_64*)