From 8b6025729e7e7abe1752d2c4be5a574337ec794a Mon Sep 17 00:00:00 2001 From: TBK Date: Sun, 10 Feb 2019 21:45:37 +0100 Subject: community/wine: upgrade to 4.0.1 --- community/wine/APKBUILD | 46 ++++++++++++------------------ community/wine/no-pie.patch | 18 ++++++------ community/wine/nopie.patch | 10 ------- community/wine/wine-dlclose-bug41703.patch | 14 ++++----- 4 files changed, 33 insertions(+), 55 deletions(-) delete mode 100644 community/wine/nopie.patch diff --git a/community/wine/APKBUILD b/community/wine/APKBUILD index c58034bf0e..e665901ad0 100644 --- a/community/wine/APKBUILD +++ b/community/wine/APKBUILD @@ -5,24 +5,23 @@ # Contributor: Martell Malone # Maintainer: Natanael Copa pkgname=wine -pkgver=3.0.4 +pkgver=4.0.1 _pkgver=${pkgver/_/-} -pkgrel=1 +pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="https://www.winehq.org" arch="x86 x86_64" license="LGPL-2.0-or-later" -# As of 2.0.3 most of the tests fails -options="!check" -subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" +options="!check" # As of 2.0.3 most of the tests fails +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" depends_dev="$pkgname perl" -makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev - libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex-dev bison - libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev openssl-dev - libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev - cups-dev alsa-lib-dev lcms-dev libxml2-dev paxmark dbus-dev libxi-dev - gnutls-dev tiff-dev v4l-utils-dev udisks2-dev autoconf automake +makedepends="alsa-lib-dev autoconf automake bison cups-dev dbus-dev flex-dev + fontconfig-dev freetype-dev gnutls-dev lcms-dev libjpeg-turbo-dev libpng-dev + libxcomposite-dev libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev + libxml2-dev libxrandr-dev libxrender-dev libxslt-dev libxxf86dga-dev mesa-dev + ncurses-dev openldap-dev openssl-dev tiff-dev udisks2-dev v4l-utils-dev zlib-dev " +checkdepends="xvfb-run" source="https://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$_pkgver.tar.xz no-pie.patch wine-dlclose-bug41703.patch @@ -31,15 +30,11 @@ source="https://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$_pkgver builddir="$srcdir/$pkgname-$_pkgver" prepare() { - cd "$builddir" - default_prepare aclocal && autoheader && autoreconf } build() { - cd "$builddir" - case "$CARCH" in x86_64) _win64=--enable-win64;; esac @@ -57,13 +52,10 @@ build() { } check() { - cd "$builddir" - make test + xvfb-run make test } package() { - local file - cd "$builddir" make -j1 DESTDIR="$pkgdir" install case "$CARCH" in @@ -71,12 +63,10 @@ package() { *) _wine="wine";; esac - paxmark -psmre "$pkgdir"/usr/bin/$_wine-preloader \ - "$pkgdir"/usr/bin/$_wine - install -Dm755 tools/wineapploader \ "$pkgdir"/usr/bin/wineapploader + local file for file in msiexec notepad regedit regsvr32 wineboot \ winecfg wineconsole winefile winemine winepath do @@ -86,10 +76,11 @@ package() { } dev() { - local file default_dev install -d "$subpkgdir"/usr/bin + + local file for file in widl wmc wrc winebuild winedump function_grep.pl \ winedbg winemaker winegcc winecpp wineg++ do @@ -106,10 +97,11 @@ doc() { } libs() { - local file ext default_libs install -d "$subpkgdir"/usr/lib/wine/fakedlls + + local file ext for ext in dll16 drv16 exe16 acm dll drv ds ocx sys tlb vxd; do for file in $(find "$pkgdir/usr/lib/wine/fakedlls" -name "*.$ext"); do mv "$pkgdir"/usr/lib/wine/fakedlls/${file##*/} \ @@ -120,7 +112,7 @@ libs() { done } -sha512sums="e1ce33bbc165a9c640a38965a229b757b67746f2150d545eb0e29ba6d21cdf150bd8eb9a450d8dd71733fbea3b2ac24839dd8e381b7da9cd15ddf98c59304198 wine-3.0.4.tar.xz -d853875f7d659617bdfba364704abd75b760d12977f1f13acc73acb3c8fefec0549677fb79a4f8955e073d64078b3071d63d97262522e22b7832a66d3d820a9c no-pie.patch -0701cfa947c40adfadf5e8e6cee677d6588404fce7081e66c284e75ed50a0bc2144a89d8d2ad12ac7450910e4c8f77fa26298ab0f8743148308bc508f18acf6b wine-dlclose-bug41703.patch +sha512sums="dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc wine-4.0.1.tar.xz +e4dc94f9438c50b6bbd210edf2b9145c61fdf53da239de3fffcdb42d290c4333fc28ca06c7c7ae7c09ca643ed86c86d4de3c40b9f15809ce5e1c0d608321e87c no-pie.patch +6c8cde76d32cd7ba1c22bc4f2ce41dc354218f58a35aaa6717b594124994a97df84fc69fd6c02fea118ec03ed6e93bf13f05d14a0d8bf3291955664ba27cb51f wine-dlclose-bug41703.patch 522a94a31fc459e80ea7dd05f7aee64f6ae666ec05236d06614acde118d5c60002e0f253ae75edb5f02164f22937ca89578504b690d1a5611bd60f703c8f0c00 winhlp32-flex.patch" diff --git a/community/wine/no-pie.patch b/community/wine/no-pie.patch index 5fb5d87b68..05c5914cea 100644 --- a/community/wine/no-pie.patch +++ b/community/wine/no-pie.patch @@ -1,14 +1,12 @@ -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 8190037..437d4d9 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in -@@ -26,7 +26,7 @@ wine64_DEPS = $(WINELOADER_DEPENDS) - wine64_LDFLAGS = $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) +@@ -25,7 +25,7 @@ + wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) - wine_preloader_OBJS = preloader.o --wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie + wine_preloader_OBJS = preloader.o preloader_mac.o +-wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) ++wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) -no-pie - wine64_preloader_OBJS = preloader.o --wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie + wine64_preloader_OBJS = preloader.o preloader_mac.o +-wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) ++wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) -no-pie diff --git a/community/wine/nopie.patch b/community/wine/nopie.patch deleted file mode 100644 index 54eb141bef..0000000000 --- a/community/wine/nopie.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 8190037..b4f2902 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -29,4 +29,4 @@ wine_preloader_OBJS = preloader.o - wine_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 - - wine64_preloader_OBJS = preloader.o --wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -+wine64_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 -no-pie diff --git a/community/wine/wine-dlclose-bug41703.patch b/community/wine/wine-dlclose-bug41703.patch index 7b92d79bdd..90118b4c4b 100644 --- a/community/wine/wine-dlclose-bug41703.patch +++ b/community/wine/wine-dlclose-bug41703.patch @@ -3,7 +3,7 @@ by xw897002528 on 2017-07-29 04:23:37 CDT as attachment 58819 --- a/configure.ac +++ b/configure.ac -@@ -1123,6 +1123,12 @@ then +@@ -1206,6 +1206,12 @@ dnl *** End of X11/Xlib.h check @@ -16,9 +16,10 @@ by xw897002528 on 2017-07-29 04:23:37 CDT as attachment 58819 dnl Check for the presence of OpenGL opengl_msg="" if test "x$with_opengl" != "xno" + --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -2289,6 +2289,13 @@ +@@ -2213,6 +2213,13 @@ if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle) { info.wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); @@ -32,7 +33,7 @@ by xw897002528 on 2017-07-29 04:23:37 CDT as attachment 58819 TRACE( "Found %s at %p for builtin %s\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_w(path) ); break; -@@ -3199,6 +3199,9 @@ +@@ -3009,9 +3016,18 @@ * LdrShutdownProcess (NTDLL.@) * */ @@ -42,8 +43,6 @@ by xw897002528 on 2017-07-29 04:23:37 CDT as attachment 58819 void WINAPI LdrShutdownProcess(void) { TRACE("()\n"); -@@ -3194,6 +3203,12 @@ - TRACE("()\n"); +#ifdef NO_UNLOAD_AFTER_DLCLOSE + RtlEnterCriticalSection( &loader_section ); + process_detach(); @@ -53,9 +52,8 @@ by xw897002528 on 2017-07-29 04:23:37 CDT as attachment 58819 process_detaching = TRUE; process_detach(); } - - -@@ -3384,7 +3398,11 @@ +@@ -3202,8 +3218,12 @@ + /* Call process detach notifications */ if ( free_lib_count <= 1 ) { +#ifdef NO_UNLOAD_AFTER_DLCLOSE -- cgit v1.2.3