summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD13
-rw-r--r--PKGBUILD.diff6
3 files changed, 17 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d42dbc2620..11b39b7766b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-winscard
pkgdesc = A compatibility layer for running Windows programs (with IDRASSI's winscard patch)
- pkgver = 6.15
+ pkgver = 6.22
pkgrel = 1
url = http://www.winehq.com
install = wine.install
@@ -165,17 +165,17 @@ pkgbase = wine-winscard
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=6.15
+ provides = wine=6.22
conflicts = wine
options = staticlibs
- source = https://dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz
- source = https://dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz.sign
+ source = https://dl.winehq.org/wine/source/6.x/wine-6.22.tar.xz
+ source = https://dl.winehq.org/wine/source/6.x/wine-6.22.tar.xz.sign
source = 30-win32-aliases.conf
source = wine-binfmt.conf
- source = scard4wine-yan12125::git+https://git.code.sf.net/u/yan12125/scard4wine.git#commit=480dbba00d6dd555d9a36a83d024031ae8c198cc
+ source = scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382
validpgpkeys = 5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
- sha512sums = bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
+ sha512sums = 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
sha512sums = SKIP
sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
sha512sums = bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285
diff --git a/PKGBUILD b/PKGBUILD
index 0fad9753edd..6d80fc355a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=wine
-pkgver=6.15
+pkgver=6.22
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
@@ -12,7 +12,7 @@ _pkgbasever=${pkgver/rc/-rc}
source=(https://dl.winehq.org/wine/source/6.x/$pkgname-$_pkgbasever.tar.xz{,.sign}
30-win32-aliases.conf
wine-binfmt.conf)
-sha512sums=('bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf'
+sha512sums=('5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5'
'SKIP'
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
@@ -104,14 +104,14 @@ prepare() {
# Allow ccache to work
mv wine-$_pkgbasever $pkgname
- scard4wine_dir=scard4wine-yan12125/src
+ scard4wine_dir=scard4wine/src
cp -v $scard4wine_dir/winscard.c $pkgname/dlls/winscard/winscard.c
cp -v $scard4wine_dir/winscard.spec $pkgname/dlls/winscard/winscard.spec
cp -v $scard4wine_dir/winscard.h $pkgname/include/winscard.h
cp -v $scard4wine_dir/winsmcrd.h $pkgname/include/winsmcrd.h
cp -v $scard4wine_dir/wine-compat56.h $pkgname/include/wine-compat.h
- sed -i '/-mno-cygwin/d' $pkgname/dlls/winscard/Makefile.in
+ echo EXTRADLLFLAGS = -mcygwin >> $pkgname/dlls/winscard/Makefile.in
# Doesn't compile without remove these flags as of 4.10
export CFLAGS="${CFLAGS/-fno-plt/}"
@@ -119,6 +119,9 @@ prepare() {
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+ # Fix openldap 2.5+ detection
+ sed 's/-lldap_r/-lldap/' -i $pkgname/configure
+
# Get rid of old build dirs
rm -rf $pkgname-{32,64}-build
mkdir $pkgname-32-build
@@ -185,7 +188,7 @@ package() {
# vim:set ts=8 sts=2 sw=2 et:
-source+=("scard4wine-yan12125::git+https://git.code.sf.net/u/yan12125/scard4wine.git#commit=480dbba00d6dd555d9a36a83d024031ae8c198cc")
+source+=("scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382")
sha512sums+=('SKIP')
makedepends+=(git)
provides=("$pkgname=$pkgver")
diff --git a/PKGBUILD.diff b/PKGBUILD.diff
index b3656d8d535..be3ba26b9b4 100644
--- a/PKGBUILD.diff
+++ b/PKGBUILD.diff
@@ -7,14 +7,14 @@
- mv $pkgname-$_pkgbasever $pkgname
+ mv wine-$_pkgbasever $pkgname
+
-+ scard4wine_dir=scard4wine-yan12125/src
++ scard4wine_dir=scard4wine/src
+ cp -v $scard4wine_dir/winscard.c $pkgname/dlls/winscard/winscard.c
+ cp -v $scard4wine_dir/winscard.spec $pkgname/dlls/winscard/winscard.spec
+ cp -v $scard4wine_dir/winscard.h $pkgname/include/winscard.h
+ cp -v $scard4wine_dir/winsmcrd.h $pkgname/include/winsmcrd.h
+ cp -v $scard4wine_dir/wine-compat56.h $pkgname/include/wine-compat.h
+
-+ sed -i '/-mno-cygwin/d' $pkgname/dlls/winscard/Makefile.in
++ echo EXTRADLLFLAGS = -mcygwin >> $pkgname/dlls/winscard/Makefile.in
# Doesn't compile without remove these flags as of 4.10
export CFLAGS="${CFLAGS/-fno-plt/}"
@@ -23,7 +23,7 @@
# vim:set ts=8 sts=2 sw=2 et:
+
-+source+=("scard4wine-yan12125::git+https://git.code.sf.net/u/yan12125/scard4wine.git#commit=480dbba00d6dd555d9a36a83d024031ae8c198cc")
++source+=("scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382")
+sha512sums+=('SKIP')
+makedepends+=(git)
+provides=("$pkgname=$pkgver")