commit e29f119c04ae40646a6673684a82104f19d1b7f5 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Feb 22 12:25:43 2015 +1100 wine: 1.7.36 -> 1.7.37 diff --git a/wine/.footprint b/wine/.footprint index c0b00a1..32d99c5 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -469,6 +469,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/msacm.h -rw-r--r-- root/root usr/include/wine/windows/msacmdlg.h -rw-r--r-- root/root usr/include/wine/windows/msacmdrv.h +-rw-r--r-- root/root usr/include/wine/windows/msasn1.h -rw-r--r-- root/root usr/include/wine/windows/mscat.h -rw-r--r-- root/root usr/include/wine/windows/mscoree.h -rw-r--r-- root/root usr/include/wine/windows/mscoree.idl @@ -921,6 +922,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/compstui.dll.so -rwxr-xr-x root/root usr/lib/wine/comsvcs.dll.so -rwxr-xr-x root/root usr/lib/wine/conhost.exe.so +-rwxr-xr-x root/root usr/lib/wine/connect.dll.so -rwxr-xr-x root/root usr/lib/wine/control.exe.so -rwxr-xr-x root/root usr/lib/wine/credui.dll.so -rwxr-xr-x root/root usr/lib/wine/crtdll.dll.so @@ -1138,6 +1140,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/compstui.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/comsvcs.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/conhost.exe +-rw-r--r-- root/root usr/lib/wine/fakedlls/connect.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/control.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/credui.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/crtdll.dll @@ -1309,6 +1312,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/mciqtz32.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/mciseq.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/mciwave.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/mf.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/mfplat.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/mfreadwrite.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/mgmtapi.dll @@ -1579,8 +1583,12 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/wuapi.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/wuaueng.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/wusa.exe +-rw-r--r-- root/root usr/lib/wine/fakedlls/x3daudio1_1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/x3daudio1_7.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_1.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_3.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_4.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_5.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/xaudio2_7.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/xcopy.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/xinput1_1.dll @@ -1827,6 +1835,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/mciqtz32.dll.so -rwxr-xr-x root/root usr/lib/wine/mciseq.dll.so -rwxr-xr-x root/root usr/lib/wine/mciwave.dll.so +-rwxr-xr-x root/root usr/lib/wine/mf.dll.so -rwxr-xr-x root/root usr/lib/wine/mfplat.dll.so -rwxr-xr-x root/root usr/lib/wine/mfreadwrite.dll.so -rwxr-xr-x root/root usr/lib/wine/mgmtapi.dll.so @@ -2097,8 +2106,12 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/wuapi.dll.so -rwxr-xr-x root/root usr/lib/wine/wuaueng.dll.so -rwxr-xr-x root/root usr/lib/wine/wusa.exe.so +-rwxr-xr-x root/root usr/lib/wine/x3daudio1_1.dll.so -rwxr-xr-x root/root usr/lib/wine/x3daudio1_7.dll.so -rwxr-xr-x root/root usr/lib/wine/xapofx1_1.dll.so +-rwxr-xr-x root/root usr/lib/wine/xapofx1_3.dll.so +-rwxr-xr-x root/root usr/lib/wine/xapofx1_4.dll.so +-rwxr-xr-x root/root usr/lib/wine/xapofx1_5.dll.so -rwxr-xr-x root/root usr/lib/wine/xaudio2_7.dll.so -rwxr-xr-x root/root usr/lib/wine/xcopy.exe.so -rwxr-xr-x root/root usr/lib/wine/xinput1_1.dll.so @@ -2222,6 +2235,7 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/compstui.dll.so -rwxr-xr-x root/root usr/lib32/wine/comsvcs.dll.so -rwxr-xr-x root/root usr/lib32/wine/conhost.exe.so +-rwxr-xr-x root/root usr/lib32/wine/connect.dll.so -rwxr-xr-x root/root usr/lib32/wine/control.exe.so -rwxr-xr-x root/root usr/lib32/wine/credui.dll.so -rwxr-xr-x root/root usr/lib32/wine/crtdll.dll.so @@ -2448,6 +2462,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/compstui.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/comsvcs.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/conhost.exe +-rw-r--r-- root/root usr/lib32/wine/fakedlls/connect.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/control.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/credui.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/crtdll.dll @@ -2630,6 +2645,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/mciqtz32.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/mciseq.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/mciwave.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/mf.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/mfplat.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/mfreadwrite.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/mgmtapi.dll @@ -2948,8 +2964,12 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/wuapi.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/wuaueng.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/wusa.exe +-rw-r--r-- root/root usr/lib32/wine/fakedlls/x3daudio1_1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/x3daudio1_7.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_1.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_3.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_4.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_5.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/xaudio2_7.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/xcopy.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/xinput1_1.dll @@ -3204,6 +3224,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/mciqtz32.dll.so -rwxr-xr-x root/root usr/lib32/wine/mciseq.dll.so -rwxr-xr-x root/root usr/lib32/wine/mciwave.dll.so +-rwxr-xr-x root/root usr/lib32/wine/mf.dll.so -rwxr-xr-x root/root usr/lib32/wine/mfplat.dll.so -rwxr-xr-x root/root usr/lib32/wine/mfreadwrite.dll.so -rwxr-xr-x root/root usr/lib32/wine/mgmtapi.dll.so @@ -3522,8 +3543,12 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/wuapi.dll.so -rwxr-xr-x root/root usr/lib32/wine/wuaueng.dll.so -rwxr-xr-x root/root usr/lib32/wine/wusa.exe.so +-rwxr-xr-x root/root usr/lib32/wine/x3daudio1_1.dll.so -rwxr-xr-x root/root usr/lib32/wine/x3daudio1_7.dll.so -rwxr-xr-x root/root usr/lib32/wine/xapofx1_1.dll.so +-rwxr-xr-x root/root usr/lib32/wine/xapofx1_3.dll.so +-rwxr-xr-x root/root usr/lib32/wine/xapofx1_4.dll.so +-rwxr-xr-x root/root usr/lib32/wine/xapofx1_5.dll.so -rwxr-xr-x root/root usr/lib32/wine/xaudio2_7.dll.so -rwxr-xr-x root/root usr/lib32/wine/xcopy.exe.so -rwxr-xr-x root/root usr/lib32/wine/xinput1_1.dll.so diff --git a/wine/.md5sum b/wine/.md5sum index cde1521..da164bd 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,4 @@ -3660517d7c87846f76f8bf40b92a6121 wine-1.7.36.tar.bz2 +99741c9efece0bf062b39992b63cf5ca wine-1.7.37.tar.bz2 2d12a9475e2986177dc38572592bd94d wine-mono-4.5.4.msi 54bd9d6b4fdcd556d89b4ef83c31ac8c wine_gecko-2.34-x86.msi 2b658806733be574309c418f6c0d4cba wine_gecko-2.34-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index 9b7c46d..2e58887 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # 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.36 +version=1.7.37 release=1 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 http://downloads.sourceforge.net/wine/wine_gecko-2.34-x86.msi diff --git a/wine/libwine-install.patch b/wine/libwine-install.patch deleted file mode 100644 index 990e7e7..0000000 --- a/wine/libwine-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -@@ -, +, @@ - configure: Add explicit install targets in libs/wine for make_makefiles. ---- a/configure -+++ a/configure -@@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation - wine_fn_config_makefile fonts enable_fonts install-lib - wine_fn_config_makefile include enable_include install-dev - wine_fn_config_makefile libs/port enable_libs_port --wine_fn_config_makefile libs/wine enable_libs_wine -+wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib - wine_fn_config_makefile libs/wpp enable_libs_wpp - wine_fn_config_makefile loader enable_loader install-lib,manpage - wine_fn_config_program aspnet_regiis enable_aspnet_regiis install ---- a/configure.ac -+++ a/configure.ac -@@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation]) - WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) - WINE_CONFIG_MAKEFILE([include],,[install-dev]) - WINE_CONFIG_MAKEFILE([libs/port]) --WINE_CONFIG_MAKEFILE([libs/wine]) -+WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) - WINE_CONFIG_MAKEFILE([libs/wpp]) - WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) - WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) ---- a/libs/wine/Makefile.in -+++ a/libs/wine/Makefile.in -@@ -111,4 +111,8 @@ version.c: dummy - $(RELPATH): - @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) - -+# Make sure that make_makefiles sees the install rules -+install install-lib:: -+install install-dev:: -+ - @LIBWINE_RULES@