summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD34
-rw-r--r--PKGBUILD.diff32
3 files changed, 24 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11b39b7766b0..b2239ccfaaf5 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.22
+ pkgver = 7.0.1
pkgrel = 1
url = http://www.winehq.com
install = wine.install
@@ -12,6 +12,7 @@ pkgbase = wine-winscard
makedepends = fontforge
makedepends = flex
makedepends = mingw-w64-gcc
+ makedepends = git
makedepends = giflib
makedepends = lib32-giflib
makedepends = libpng
@@ -93,7 +94,6 @@ pkgbase = wine-winscard
makedepends = faudio
makedepends = lib32-faudio
makedepends = desktop-file-utils
- makedepends = git
depends = fontconfig
depends = lib32-fontconfig
depends = lcms2
@@ -165,17 +165,18 @@ pkgbase = wine-winscard
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=6.22
+ provides = wine=7.0.1
conflicts = wine
options = staticlibs
- 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
+ options = !lto
+ source = https://dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz
+ source = https://dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz.sign
source = 30-win32-aliases.conf
source = wine-binfmt.conf
- source = scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382
+ source = scard4wine-yan12125::git+https://git.code.sf.net/u/yan12125/scard4wine.git#commit=7621961210a55b4333f3039bae2355430f9bd8cd
validpgpkeys = 5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
- sha512sums = 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
+ sha512sums = 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
sha512sums = SKIP
sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
sha512sums = bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285
diff --git a/PKGBUILD b/PKGBUILD
index 6d80fc355a47..f07b5deab2a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,30 @@
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-pkgname=wine
-pkgver=6.22
+_pkgname=wine
+pkgname=$_pkgname-winscard
+_scard4wine_commit=7621961210a55b4333f3039bae2355430f9bd8cd
+pkgver=7.0.1
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
-source=(https://dl.winehq.org/wine/source/6.x/$pkgname-$_pkgbasever.tar.xz{,.sign}
+source=(https://dl.winehq.org/wine/source/7.0/$_pkgname-$_pkgbasever.tar.xz{,.sign}
30-win32-aliases.conf
- wine-binfmt.conf)
-sha512sums=('5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5'
+ wine-binfmt.conf
+ "scard4wine-yan12125::git+https://git.code.sf.net/u/yan12125/scard4wine.git#commit=$_scard4wine_commit")
+sha512sums=('5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944'
'SKIP'
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
- 'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
+ 'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285'
+ 'SKIP')
validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
-pkgdesc="A compatibility layer for running Windows programs"
+pkgdesc="A compatibility layer for running Windows programs (with IDRASSI's winscard patch)"
url="http://www.winehq.com"
arch=(x86_64)
-options=(staticlibs)
+options=(staticlibs !lto)
license=(LGPL)
depends=(
fontconfig lib32-fontconfig
@@ -41,7 +45,7 @@ depends=(
faudio lib32-faudio
desktop-file-utils
)
-makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
+makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc git
giflib lib32-giflib
libpng lib32-libpng
gnutls lib32-gnutls
@@ -99,12 +103,14 @@ optdepends=(
)
makedepends=(${makedepends[@]} ${depends[@]})
install=wine.install
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
prepare() {
# Allow ccache to work
mv wine-$_pkgbasever $pkgname
- scard4wine_dir=scard4wine/src
+ scard4wine_dir=scard4wine-yan12125/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
@@ -187,11 +193,3 @@ package() {
}
# vim:set ts=8 sts=2 sw=2 et:
-
-source+=("scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382")
-sha512sums+=('SKIP')
-makedepends+=(git)
-provides=("$pkgname=$pkgver")
-conflicts=("$pkgname")
-pkgname+='-winscard'
-pkgdesc+=" (with IDRASSI's winscard patch)"
diff --git a/PKGBUILD.diff b/PKGBUILD.diff
deleted file mode 100644
index be3ba26b9b43..000000000000
--- a/PKGBUILD.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- PKGBUILD 2021-05-31 11:52:38.124496766 +0800
-+++ PKGBUILD 2021-05-27 10:27:26.099954762 +0800
-@@ -103,7 +103,16 @@
-
- prepare() {
- # Allow ccache to work
-- mv $pkgname-$_pkgbasever $pkgname
-+ mv wine-$_pkgbasever $pkgname
-+
-+ 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
-+
-+ echo EXTRADLLFLAGS = -mcygwin >> $pkgname/dlls/winscard/Makefile.in
-
- # Doesn't compile without remove these flags as of 4.10
- export CFLAGS="${CFLAGS/-fno-plt/}"
-@@ -176,3 +185,11 @@
- }
-
- # vim:set ts=8 sts=2 sw=2 et:
-+
-+source+=("scard4wine::git+https://git.code.sf.net/p/scard4wine/code.git#commit=484230432f6f29538916872dac495d8a8de45382")
-+sha512sums+=('SKIP')
-+makedepends+=(git)
-+provides=("$pkgname=$pkgver")
-+conflicts=("$pkgname")
-+pkgname+='-winscard'
-+pkgdesc+=" (with IDRASSI's winscard patch)"