From 3088c148728d8ae1f3981eef02a6a896a24a6219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 13 Aug 2020 16:23:28 -0300
Subject: [PATCH] aisleriot: update to 3.22.11.

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..67b90fe84b3 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b