From 5c8721e0fa7cb79f4195aae4a3db9789c74d29fd Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 8 Oct 2016 17:28:18 +0000 Subject: community/wine: upgrade to 1.8.5 and rebuild with libressl --- community/wine/APKBUILD | 23 +++++++++++++---------- community/wine/nopie.patch | 10 ++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 community/wine/nopie.patch (limited to 'community/wine') diff --git a/community/wine/APKBUILD b/community/wine/APKBUILD index ad33548a38..f9bcc0ba80 100644 --- a/community/wine/APKBUILD +++ b/community/wine/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Łukasz Jendrysik # Maintainer: Natanael Copa pkgname=wine -pkgver=1.8.3 +pkgver=1.8.5 _pkgver=${pkgver/_/-} pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" @@ -14,12 +14,13 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" depends_dev="$pkgname perl" makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison - libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev openssl-dev + libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev libressl-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" source="http://downloads.sourceforge.net/project/wine/Source/wine-$_pkgver.tar.bz2 - musl-fix.patch" + musl-fix.patch + nopie.patch" _builddir="$srcdir"/$pkgname-$_pkgver prepare() { @@ -38,7 +39,6 @@ build() { case "$CARCH" in x86_64) _win64=--enable-win64;; esac - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -94,9 +94,12 @@ libs() { done } -md5sums="0d9725fa55494e1623c7559af388a048 wine-1.8.3.tar.bz2 -80c4e60c14a055b070e87338f22c6a0f musl-fix.patch" -sha256sums="d7cecdf7aab93bfe950e6f83ec526681b8770788c7b2a802bfe50ff97fc17a6c wine-1.8.3.tar.bz2 -28059ac713a3636657267b9238ac9ca28416d7a3d6dbac142ed68dcbf460d88b musl-fix.patch" -sha512sums="16e0e0161ded64d6abd4503e4a458e62cc630fd1ce7f8eee885404c42be784159213144aa049ff6628924828e13438453071d29b6975747ea4101c9da7e89f28 wine-1.8.3.tar.bz2 -6cbbaa561db4ea2048e1c5db3b66dddea554d8e2aa120e8615403a4891f1bd08fcd8c273ccb3fc6a824dac2fb53165237a1f4111d86cfee1de4a18fa7262ea39 musl-fix.patch" +md5sums="2d2b38d9be3dc054c0cee9f0e868eaea wine-1.8.5.tar.bz2 +80c4e60c14a055b070e87338f22c6a0f musl-fix.patch +282865724e8d91958fa4e909a92c1035 nopie.patch" +sha256sums="dee2a4959e5f90a89aaf04566c23f2926e9590f8968ea662afd81947fdb6f6d6 wine-1.8.5.tar.bz2 +28059ac713a3636657267b9238ac9ca28416d7a3d6dbac142ed68dcbf460d88b musl-fix.patch +3449932791966342470286127a5b51f2035efc66a33bcfd6afdf0c5c1db17b67 nopie.patch" +sha512sums="0434424869722cb4a4b9a0cbf22688e0139805fc9486f2fbfe5f1b3698e6fa5b5292d2031a20f09ae2069a5b19604eed8fdaa5ae66a8cebdeecd65afac83b332 wine-1.8.5.tar.bz2 +6cbbaa561db4ea2048e1c5db3b66dddea554d8e2aa120e8615403a4891f1bd08fcd8c273ccb3fc6a824dac2fb53165237a1f4111d86cfee1de4a18fa7262ea39 musl-fix.patch +f4c3ffc86ceb14c865282574f837c2114cdfa38df64327f17c2d5913cb85726d883e4a136ce38297612cda6dd47f9bdf80aff770368b8b846a642337f52a68bf nopie.patch" diff --git a/community/wine/nopie.patch b/community/wine/nopie.patch new file mode 100644 index 0000000000..54eb141bef --- /dev/null +++ b/community/wine/nopie.patch @@ -0,0 +1,10 @@ +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 -- cgit v1.2.3