diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2013-05-12 19:33:44 +1000 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2013-05-12 19:34:09 +1000 |
| commit | 181713f63518d91eb171ff2cc4988eb7dd562c58 (patch) | |
| tree | 5743f08cc5ed88e90b1da75ab61730f33adfe339 | |
| parent | 14132cfac9f4729c3d92e6beab79ce4039c0d588 (diff) | |
| download | opt-181713f63518d91eb171ff2cc4988eb7dd562c58.tar.gz opt-181713f63518d91eb171ff2cc4988eb7dd562c58.tar.xz | |
wine: 1.5.29 -> 1.5.30
| -rw-r--r-- | wine/.footprint | 2 | ||||
| -rw-r--r-- | wine/.md5sum | 3 | ||||
| -rw-r--r-- | wine/Pkgfile | 8 | ||||
| -rw-r--r-- | wine/libwine-install.patch | 35 |
4 files changed, 45 insertions, 3 deletions
diff --git a/wine/.footprint b/wine/.footprint index 02f2b4961..49b4768d6 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -628,6 +628,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/tom.h -rw-r--r-- root/root usr/include/wine/windows/tom.idl -rw-r--r-- root/root usr/include/wine/windows/traffic.h +-rw-r--r-- root/root usr/include/wine/windows/transact.h +-rw-r--r-- root/root usr/include/wine/windows/transact.idl -rw-r--r-- root/root usr/include/wine/windows/twain.h -rw-r--r-- root/root usr/include/wine/windows/udpmib.h -rw-r--r-- root/root usr/include/wine/windows/uiautomation.h diff --git a/wine/.md5sum b/wine/.md5sum index 8990bacae..912d9e5d0 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,5 @@ -4a7dc9dad3c3c7710c202458374ed21c wine-1.5.29.tar.bz2 +78cd1a36f11f3371a45a910a999b2e37 libwine-install.patch +be776eb7b50c15bac5543775c8416217 wine-1.5.30.tar.bz2 a79eb547bcb562aea5c7096bc97fff11 wine-mono-0.0.8.msi 54a6418e2469fad5c4374a35ea54cf1a wine_gecko-1.9-x86.msi 9f870bef3aa17b3de06c8d36be5508f2 wine_gecko-1.9-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index 856164fb7..11c4a756c 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,16 +5,20 @@ # 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-32 prelink name=wine -version=1.5.29 +version=1.5.30 release=1 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 http://downloads.sourceforge.net/wine/wine_gecko-1.9-x86.msi http://downloads.sourceforge.net/wine/wine_gecko-1.9-x86_64.msi - http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi) + http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi + libwine-install.patch) build() { install -d wine32 wine64 + # http://bugs.winehq.org/show_bug.cgi?id=33560 + patch -d $name-$version -p 1 -i $SRC/libwine-install.patch + cd wine64 ../$name-$version/configure \ diff --git a/wine/libwine-install.patch b/wine/libwine-install.patch new file mode 100644 index 000000000..990e7e7fe --- /dev/null +++ b/wine/libwine-install.patch @@ -0,0 +1,35 @@ +@@ -, +, @@ + 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@ |