summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-10-11 21:14:03 +0000
committerDaniel Bermond2020-10-11 21:14:03 +0000
commit9a253a6b022c1104b1cf6fc4c76457de0bdd3aa3 (patch)
tree39448d9a2a3d67062015163759507f2feb74186a
parentf7cb999b7616c3ddc6680d129ea009543aeec1e0 (diff)
downloadaur-9a253a6b022c1104b1cf6fc4c76457de0bdd3aa3.tar.gz
Drop support for i686 architecture. Strip native PE libraries.
References ---------- [1] https://bugs.archlinux.org/task/68007 [2] https://github.com/archlinux/svntogit-community/commit/11923c0134c9d7f4842c36987ae8d032f6886d7b
-rw-r--r--.SRCINFO97
-rw-r--r--PKGBUILD117
2 files changed, 80 insertions, 134 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86b556fb4b8..23536422b72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 5.15.r0.g019fcaa3641
+ pkgver = 5.19.r0.gf7d81508958
pkgrel = 1
url = https://www.winehq.org/
install = wine-git.install
- arch = i686
arch = x86_64
license = LGPL
makedepends = git
@@ -15,7 +14,6 @@ pkgbase = wine-git
makedepends = fontforge
makedepends = flex
makedepends = mingw-w64-gcc
- makedepends = gcc>=4.5.0-2
makedepends = giflib
makedepends = lib32-giflib
makedepends = libpng
@@ -68,35 +66,35 @@ pkgbase = wine-git
makedepends = vulkan-headers
makedepends = opencl-headers
makedepends = samba
- makedepends = fontconfig
- makedepends = lib32-fontconfig
- makedepends = lcms2
- makedepends = lib32-lcms2
- makedepends = libxml2
- makedepends = lib32-libxml2
- makedepends = libxcursor
- makedepends = lib32-libxcursor
- makedepends = libxrandr
- makedepends = lib32-libxrandr
- makedepends = libxdamage
- makedepends = lib32-libxdamage
- makedepends = libxi
- makedepends = lib32-libxi
- makedepends = gettext
- makedepends = lib32-gettext
- makedepends = freetype2
- makedepends = lib32-freetype2
- makedepends = glu
- makedepends = lib32-glu
- makedepends = libsm
- makedepends = lib32-libsm
- makedepends = gcc-libs
- makedepends = lib32-gcc-libs
- makedepends = libpcap
- makedepends = lib32-libpcap
- makedepends = faudio
- makedepends = lib32-faudio
- makedepends = desktop-file-utils
+ depends = fontconfig
+ depends = lib32-fontconfig
+ depends = lcms2
+ depends = lib32-lcms2
+ depends = libxml2
+ depends = lib32-libxml2
+ depends = libxcursor
+ depends = lib32-libxcursor
+ depends = libxrandr
+ depends = lib32-libxrandr
+ depends = libxdamage
+ depends = lib32-libxdamage
+ depends = libxi
+ depends = lib32-libxi
+ depends = gettext
+ depends = lib32-gettext
+ depends = freetype2
+ depends = lib32-freetype2
+ depends = glu
+ depends = lib32-glu
+ depends = libsm
+ depends = lib32-libsm
+ depends = gcc-libs
+ depends = lib32-gcc-libs
+ depends = libpcap
+ depends = lib32-libpcap
+ depends = faudio
+ depends = lib32-faudio
+ depends = desktop-file-utils
optdepends = giflib
optdepends = lib32-giflib
optdepends = libpng
@@ -143,9 +141,9 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=5.15.r0.g019fcaa3641
- provides = bin32-wine=5.15.r0.g019fcaa3641
- provides = wine-wow64=5.15.r0.g019fcaa3641
+ provides = wine=5.19.r0.gf7d81508958
+ provides = bin32-wine=5.19.r0.gf7d81508958
+ provides = wine-wow64=5.19.r0.gf7d81508958
conflicts = wine
conflicts = bin32-wine
conflicts = wine-wow64
@@ -159,33 +157,4 @@ pkgbase = wine-git
sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4
pkgname = wine-git
- depends = fontconfig
- depends = lib32-fontconfig
- depends = lcms2
- depends = lib32-lcms2
- depends = libxml2
- depends = lib32-libxml2
- depends = libxcursor
- depends = lib32-libxcursor
- depends = libxrandr
- depends = lib32-libxrandr
- depends = libxdamage
- depends = lib32-libxdamage
- depends = libxi
- depends = lib32-libxi
- depends = gettext
- depends = lib32-gettext
- depends = freetype2
- depends = lib32-freetype2
- depends = glu
- depends = lib32-glu
- depends = libsm
- depends = lib32-libsm
- depends = gcc-libs
- depends = lib32-gcc-libs
- depends = libpcap
- depends = lib32-libpcap
- depends = faudio
- depends = lib32-faudio
- depends = desktop-file-utils
diff --git a/PKGBUILD b/PKGBUILD
index 911c203d705..9ab183b8092 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=5.15.r0.g019fcaa3641
+pkgver=5.19.r0.gf7d81508958
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
url='https://www.winehq.org/'
license=('LGPL')
-_depends=(
+depends=(
'fontconfig' 'lib32-fontconfig'
'lcms2' 'lib32-lcms2'
'libxml2' 'lib32-libxml2'
@@ -27,7 +27,6 @@ _depends=(
'desktop-file-utils'
)
makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' 'mingw-w64-gcc'
- 'gcc>=4.5.0-2'
'giflib' 'lib32-giflib'
'libpng' 'lib32-libpng'
'gnutls' 'lib32-gnutls'
@@ -88,6 +87,9 @@ optdepends=(
)
options=('staticlibs')
install="${pkgname}.install"
+provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
+conflicts=('wine' 'bin32-wine' 'wine-wow64')
+replaces=('bin32-wine')
source=('git://source.winehq.org/git/wine.git'
'30-win32-aliases.conf'
'wine-binfmt.conf')
@@ -95,25 +97,9 @@ sha256sums=('SKIP'
'9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7'
'6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4')
-if [ "$CARCH" = 'i686' ]
-then
- # strip lib32 etc. on i686
- _depends=(${_depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- optdepends=(${optdepends[@]/*32-*/})
- provides=("wine=${pkgver}")
- conflicts=('wine')
-else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
- conflicts=('wine' 'bin32-wine' 'wine-wow64')
- replaces=('bin32-wine')
-fi
-
prepare() {
- rm -rf "$pkgname"-{32,64}-build
- mkdir -p "$pkgname"-32-build
- [ "$CARCH" = 'x86_64' ] && mkdir "$pkgname"-64-build
+ rm -rf build-{32,64}
+ mkdir -p build-{32,64}
# fix path of opencl headers
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i wine/configure*
@@ -132,65 +118,56 @@ build() {
# build wine 64-bit
# (according to the wine wiki, this 64-bit/32-bit building order is mandatory)
- if [ "$CARCH" = 'x86_64' ]
- then
- printf '%s\n' ' -> Building Wine-64...'
- cd "$pkgname"-64-build
- ../wine/configure \
- --prefix='/usr' \
- --libdir='/usr/lib' \
- --with-x \
- --with-gstreamer \
- --enable-win64
- make
- local _wine32opts=(
- '--libdir=/usr/lib32'
- "--with-wine64=${srcdir}/${pkgname}-64-build"
- )
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
- fi
+ printf '%s\n' ' -> Building wine-64...'
+ cd build-64
+ ../wine/configure \
+ --prefix='/usr' \
+ --libdir='/usr/lib' \
+ --with-x \
+ --with-gstreamer \
+ --enable-win64
+ make
# build wine 32-bit
- printf '%s\n' ' -> Building Wine-32...'
- cd "${srcdir}/${pkgname}"-32-build
+ printf '%s\n' ' -> Building wine-32...'
+ cd "${srcdir}/build-32"
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
../wine/configure \
- --prefix='/usr' \
- --with-x \
- --with-gstreamer \
- ${_wine32opts[@]}
+ --prefix='/usr' \
+ --libdir='/usr/lib32' \
+ --with-x \
+ --with-gstreamer \
+ --with-wine64="${srcdir}/build-64"
make
}
package() {
- depends=(${_depends[@]})
-
# package wine 32-bit
# (according to the wine wiki, this reverse 32-bit/64-bit packaging order is important)
- printf '%s\n' ' -> Packaging Wine-32...'
+ printf '%s\n' ' -> Packaging wine-32...'
+ cd build-32
+ make prefix="${pkgdir}/usr" \
+ libdir="${pkgdir}/usr/lib32" \
+ dlldir="${pkgdir}/usr/lib32/wine" \
+ install
- cd "$pkgname"-32-build
+ # package wine 64-bit
+ printf '%s\n' ' -> Packaging wine-64...'
+ cd "${srcdir}/build-64"
+ make prefix="${pkgdir}/usr" \
+ libdir="${pkgdir}/usr/lib" \
+ dlldir="${pkgdir}/usr/lib/wine" \
+ install
- if [ "$CARCH" = 'i686' ]
- then
- make prefix="$pkgdir/usr" install
- else
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib32" \
- dlldir="$pkgdir/usr/lib32/wine" install
-
- # package wine 64-bit
- printf '%s\n' ' -> Packaging Wine-64...'
- cd "${srcdir}/${pkgname}"-64-build
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib" \
- dlldir="$pkgdir/usr/lib/wine" install
- fi
-
- # font aliasing settings for Win32 applications
- install -d "$pkgdir"/etc/fonts/conf.{avail,d}
- install -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/etc/fonts/conf.avail"
- ln -s ../conf.avail/30-win32-aliases.conf "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf"
+ # font aliasing settings for win32 applications
+ mkdir -p "${pkgdir}/etc/fonts/conf.d"
+ install -D -m644 "${srcdir}/30-win32-aliases.conf" -t "${pkgdir}/etc/fonts/conf.avail"
+ ln -s ../conf.avail/30-win32-aliases.conf "${pkgdir}/etc/fonts/conf.d/30-win32-aliases.conf"
# wine binfmt
- install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/lib/binfmt.d/wine.conf"
+ install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/lib/binfmt.d/wine.conf"
+
+ # strip native PE libraries
+ i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/lib32/wine"/*.dll
+ "${CARCH}-w64-mingw32-strip" --strip-unneeded "${pkgdir}/usr/lib/wine"/*.dll
}