[arch-commits] Commit in wine/trunk (PKGBUILD wine-1.5.30-missing-libwine.patch)

[Bartłomiej Piotrowski]

    Date: Saturday, May 11, 2013 @ 12:44:08
  Author: bpiotrowski
Revision: 90308

upgpkg: wine 1.5.30-2

- apply patch to install libwine.so.1 (FS#35189)

Added:
  wine/trunk/wine-1.5.30-missing-libwine.patch
Modified:
  wine/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |    7 ++++-
 wine-1.5.30-missing-libwine.patch |   45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-11 07:25:15 UTC (rev 90307)
+++ PKGBUILD	2013-05-11 10:44:08 UTC (rev 90308)
@@ -6,14 +6,16 @@
 
 pkgname=wine
 pkgver=1.5.30
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}
+        wine-1.5.30-missing-libwine.patch
         30-win32-aliases.conf)
 md5sums=('be776eb7b50c15bac5543775c8416217'
          'SKIP'
+         '5437ea66de4bbccf53a40c1e0821cd81'
          '1ff4e467f59409272088d92173a0f801')
 
 pkgdesc="A compatibility layer for running Windows programs"
@@ -106,6 +108,9 @@
   sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
   sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
 
+  # fix FS#35189
+  ( cd $pkgname && patch -Np1 -i "$srcdir"/wine-1.5.30-missing-libwine.patch )
+
   # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build

Added: wine-1.5.30-missing-libwine.patch
===================================================================
--- wine-1.5.30-missing-libwine.patch	                        (rev 0)
+++ wine-1.5.30-missing-libwine.patch	2013-05-11 10:44:08 UTC (rev 90308)
@@ -0,0 +1,45 @@
+commit ce4b6451aabbe83809c7483c748cfa009cc090d6
+Author: Alexandre Julliard <julliard at winehq.org>
+Date:   Fri May 10 22:01:44 2013 +0200
+
+    configure: Add explicit install targets in libs/wine for make_makefiles.
+
+diff --git a/configure b/configure
+index d4c1f8e..ef38bfd 100755
+--- a/configure
++++ b/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
+diff --git a/configure.ac b/configure.ac
+index 6dd2348..b44673e 100644
+--- a/configure.ac
++++ b/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])
+diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
+index b8dc385..7de7799 100644
+--- a/libs/wine/Makefile.in
++++ b/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@