summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2022-06-07 16:29:51 +0200
committerhaawda2022-06-07 16:29:51 +0200
commit563feaf86940b85aea764f950381c3c6686813e2 (patch)
tree5b11dbba0055d8d92399b683ab72b389f363f8ed
parent261e6d6f12cded7a152be6e14a98a064c385c9a0 (diff)
downloadaur-563feaf86940b85aea764f950381c3c6686813e2.tar.gz
remove patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--meson_fix.patch13
3 files changed, 4 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 10df9c6576bd..a9d6673879ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = aisleriot-git
pkgdesc = A collection of patience games written in guile scheme
- pkgver = 3.22.21.r8.gde390345
+ pkgver = 3.22.23.r1.g1ad43def
pkgrel = 1
url = https://wiki.gnome.org/Apps/Aisleriot
arch = x86_64
@@ -21,8 +21,6 @@ pkgbase = aisleriot-git
options = !strip
options = !emptydirs
source = git+https://gitlab.gnome.org/GNOME/aisleriot.git
- source = meson_fix.patch
sha256sums = SKIP
- sha256sums = 14e1fde5c00eb285917c22099ae3552b2ae145acd3fdb7049ff78bce53d0c8d4
pkgname = aisleriot-git
diff --git a/PKGBUILD b/PKGBUILD
index 661cea225933..3a3ea92c77eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=aisleriot-git
-pkgver=3.22.21.r8.gde390345
+pkgver=3.22.23.r1.g1ad43def
pkgrel=1
pkgdesc="A collection of patience games written in guile scheme"
url="https://wiki.gnome.org/Apps/Aisleriot"
@@ -16,20 +16,14 @@ optdepends=('pysolfc: for PySol card sets'
'pysolfc-cardsets: for PySol card sets'
'libkdegames: for KDE cardsets ')
options=('!makeflags' '!strip' '!emptydirs')
-source=("git+https://gitlab.gnome.org/GNOME/aisleriot.git" meson_fix.patch)
-sha256sums=('SKIP'
- '14e1fde5c00eb285917c22099ae3552b2ae145acd3fdb7049ff78bce53d0c8d4')
+source=("git+https://gitlab.gnome.org/GNOME/aisleriot.git")
+sha256sums=('SKIP')
pkgver() {
cd ${pkgname%-git}
git describe --tags | sed 's/-/.r/' | tr - .
}
-prepare() {
- cd ${pkgname%-git}
- git apply "$srcdir"/meson_fix.patch
-}
-
build() {
cd ${pkgname%-git}
[[ -d builddir ]] || mkdir builddir
diff --git a/meson_fix.patch b/meson_fix.patch
deleted file mode 100644
index e4228ab7e7ea..000000000000
--- a/meson_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 614b2124..066d5b96 100644
---- a/meson.build
-+++ b/meson.build
-@@ -326,7 +326,7 @@ if get_option('guile') == 'auto'
- assert(false, 'Guile not found')
- endif
- else
-- guile_version = get_option('guile').to_string()
-+ guile_version = get_option('guile')
- endif
-
- guile_req = 'guile-' + guile_version