aboutsummaryrefslogtreecommitdiffstats
path: root/main/wine
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-15 16:55:34 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-05-15 16:55:34 +0000
commit7ddb77c325ac9dcd6310d4032a078b815798a2c4 (patch)
treeb3da76e807f255b4eb68bd9798639fc45c2be5a2 /main/wine
parentb9b72feef1ea51b85fe20119ea9ca6bb2ed7413b (diff)
downloadaports-7ddb77c325ac9dcd6310d4032a078b815798a2c4.tar.bz2
aports-7ddb77c325ac9dcd6310d4032a078b815798a2c4.tar.xz
main/wine: upgrade to 1.5.30
Diffstat (limited to 'main/wine')
-rw-r--r--main/wine/APKBUILD14
-rw-r--r--main/wine/wine-1.5.30-missing-libwine.patch45
2 files changed, 54 insertions, 5 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 7ff7bb9621..a719f09e49 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wine
-pkgver=1.5.29
+pkgver=1.5.30
_ver=${pkgver/_/-}
pkgrel=0
pkgdesc="A compatibility layer for running Windows programs"
@@ -17,6 +17,7 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
tiff-dev v4l-utils-dev udisks2-dev
autoconf automake"
source="http://downloads.sourceforge.net/project/wine/Source/wine-$_ver.tar.bz2
+ wine-1.5.30-missing-libwine.patch
"
_builddir="$srcdir"/$pkgname-$_ver
@@ -43,12 +44,15 @@ build() {
package() {
cd "$_builddir"
- make prefix="$pkgdir"/usr install || return 1
+ make -j1 prefix="$pkgdir"/usr install || return 1
mkdir -p "$pkgdir"/etc/wine
paxctl -c -psmre "$pkgdir"/usr/bin/wine-preloader \
"$pkgdir"/usr/bin/wine
}
-md5sums="4a7dc9dad3c3c7710c202458374ed21c wine-1.5.29.tar.bz2"
-sha256sums="387c0ed440e1df2e94aa3630320949976a81725e48912f4d9856009d6b7888b1 wine-1.5.29.tar.bz2"
-sha512sums="778a36e224a60a1e8be834944582c922f463e98e5d69c86416e94490a0492ea5f70b9c083fe9426f00268b0b292819bef77dbc9ccfe8df1b2f0190b8bb412ffa wine-1.5.29.tar.bz2"
+md5sums="be776eb7b50c15bac5543775c8416217 wine-1.5.30.tar.bz2
+5437ea66de4bbccf53a40c1e0821cd81 wine-1.5.30-missing-libwine.patch"
+sha256sums="0f6f92a5730037b85b75089af6817ae2ceffb335caa5077e2ab1b41944c452c3 wine-1.5.30.tar.bz2
+2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f wine-1.5.30-missing-libwine.patch"
+sha512sums="437c0c0eb508c7ef6d468d434d751b91ca1007231fcc1732aff00be6f0bcf0d96e207d5251f336345c2fea2f20035ce4cdbd51ed258baebb5c13734858868c97 wine-1.5.30.tar.bz2
+e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 wine-1.5.30-missing-libwine.patch"
diff --git a/main/wine/wine-1.5.30-missing-libwine.patch b/main/wine/wine-1.5.30-missing-libwine.patch
new file mode 100644
index 0000000000..75fc83e6a5
--- /dev/null
+++ b/main/wine/wine-1.5.30-missing-libwine.patch
@@ -0,0 +1,45 @@
+commit ce4b6451aabbe83809c7483c748cfa009cc090d6
+Author: Alexandre Julliard <julliard@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@