summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-08-16 15:52:22 +0000
committerDaniel Bermond2020-08-16 15:52:22 +0000
commitf7cb999b7616c3ddc6680d129ea009543aeec1e0 (patch)
tree5d728c392f9bf658d7ce95ca551a3264c9ab3aac
parentb83552057ffedf286fddac9527f4a96c47eaeb85 (diff)
downloadaur-wine-git.tar.gz
Use mingw for building native PE libraries
https://bugs.archlinux.org/task/67317
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD14
2 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 866dc2ab2d0..86b556fb4b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 4.20.r74.ga9c4b309f6
+ pkgver = 5.15.r0.g019fcaa3641
pkgrel = 1
url = https://www.winehq.org/
install = wine-git.install
@@ -14,6 +14,7 @@ pkgbase = wine-git
makedepends = perl
makedepends = fontforge
makedepends = flex
+ makedepends = mingw-w64-gcc
makedepends = gcc>=4.5.0-2
makedepends = giflib
makedepends = lib32-giflib
@@ -142,9 +143,9 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=4.20.r74.ga9c4b309f6
- provides = bin32-wine=4.20.r74.ga9c4b309f6
- provides = wine-wow64=4.20.r74.ga9c4b309f6
+ provides = wine=5.15.r0.g019fcaa3641
+ provides = bin32-wine=5.15.r0.g019fcaa3641
+ provides = wine-wow64=5.15.r0.g019fcaa3641
conflicts = wine
conflicts = bin32-wine
conflicts = wine-wow64
diff --git a/PKGBUILD b/PKGBUILD
index 40af6531344..911c203d705 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
# Contributor: Sidney Crestani <sidneycrestani@archlinux.net>
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=4.20.r74.ga9c4b309f6
+pkgver=5.15.r0.g019fcaa3641
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
@@ -26,7 +26,7 @@ _depends=(
'faudio' 'lib32-faudio'
'desktop-file-utils'
)
-makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex'
+makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex' 'mingw-w64-gcc'
'gcc>=4.5.0-2'
'giflib' 'lib32-giflib'
'libpng' 'lib32-libpng'
@@ -111,20 +111,16 @@ else
fi
prepare() {
- # delete old build dirs (from previous builds) and make new ones
rm -rf "$pkgname"-{32,64}-build
mkdir -p "$pkgname"-32-build
[ "$CARCH" = 'x86_64' ] && mkdir "$pkgname"-64-build
- cd wine
-
# fix path of opencl headers
- sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
+ sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i wine/configure*
}
pkgver() {
- cd wine
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/'
+ git -C wine describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/'
}
build() {