Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] aisleriot: update to 3.22.11.
@ 2020-08-13 19:24 ericonr
  2020-08-13 19:27 ` ericonr
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 19:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/24263

aisleriot: update to 3.22.11.
- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile

@pullmoll 

I could add `yelp` as a `depends` for browsing the include help docs. What do you think?

A patch file from https://github.com/void-linux/void-packages/pull/24263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-24263.patch --]
[-- Type: text/x-diff, Size: 2403 bytes --]

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
@ 2020-08-13 19:27 ` ericonr
  2020-08-13 19:28 ` ericonr
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 19:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24263#issuecomment-673667515

Comment:
I removed the subpackage too, to simplify the build. But I can restore it.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
  2020-08-13 19:27 ` ericonr
@ 2020-08-13 19:28 ` ericonr
  2020-08-13 19:31 ` [PR PATCH] [Updated] " ericonr
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 19:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24263#issuecomment-673667515

Comment:
I removed the subpackage too, to simplify the build. But I can restore it.

Actually, to provide an actual upgrade path it needs to be removed, right?

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
  2020-08-13 19:27 ` ericonr
  2020-08-13 19:28 ` ericonr
@ 2020-08-13 19:31 ` ericonr
  2020-08-13 19:31 ` ericonr
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 19:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/24263

aisleriot: update to 3.22.11.
- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile

@pullmoll 

I could add `yelp` as a `depends` for browsing the include help docs. What do you think?

A patch file from https://github.com/void-linux/void-packages/pull/24263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-24263.patch --]
[-- Type: text/x-diff, Size: 2317 bytes --]

From 14d65e4cb97ff6c3aee5e233b609a0237975c7ca 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 | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..7c7581669eb 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,24 +1,22 @@
 # 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"
+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="aisleriot-data 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"
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b
 
 aisleriot-data_package() {
 	short_desc+=" - data"

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
                   ` (2 preceding siblings ...)
  2020-08-13 19:31 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-13 19:31 ` ericonr
  2020-08-13 20:23 ` pullmoll
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 19:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24263#issuecomment-673667515

Comment:
I removed the subpackage too, to simplify the build. But I can restore it.

Actually, to provide an actual upgrade path it needs to be removed, right?

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
                   ` (3 preceding siblings ...)
  2020-08-13 19:31 ` ericonr
@ 2020-08-13 20:23 ` pullmoll
  2020-08-13 21:58 ` [PR PATCH] [Updated] " ericonr
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: pullmoll @ 2020-08-13 20:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/24263#issuecomment-673692126

Comment:
I think your idea is fine. Please add it and merge.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
                   ` (4 preceding siblings ...)
  2020-08-13 20:23 ` pullmoll
@ 2020-08-13 21:58 ` ericonr
  2020-08-13 22:17 ` ericonr
  2020-08-14  3:14 ` [PR PATCH] [Merged]: " ahesford
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 21:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/24263

aisleriot: update to 3.22.11.
- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile

@pullmoll 

I could add `yelp` as a `depends` for browsing the include help docs. What do you think?

A patch file from https://github.com/void-linux/void-packages/pull/24263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-24263.patch --]
[-- Type: text/x-diff, Size: 2391 bytes --]

From 0fee3da66f74f3e1e259bc67d366a1a74d79af51 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
- Add yelp depend for help content
---
 srcpkgs/aisleriot/template | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..1b5b594ddd9 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,24 +1,22 @@
 # 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="aisleriot-data guile yelp"
 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"
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b
 
 aisleriot-data_package() {
 	short_desc+=" - data"

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
                   ` (5 preceding siblings ...)
  2020-08-13 21:58 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-13 22:17 ` ericonr
  2020-08-14  3:14 ` [PR PATCH] [Merged]: " ahesford
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-08-13 22:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24263#issuecomment-673737817

Comment:
Can you merge, please? I'm not a commiter :P

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: aisleriot: update to 3.22.11.
  2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
                   ` (6 preceding siblings ...)
  2020-08-13 22:17 ` ericonr
@ 2020-08-14  3:14 ` ahesford
  7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-08-14  3:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

There's a merged pull request on the void-packages repository

aisleriot: update to 3.22.11.
https://github.com/void-linux/void-packages/pull/24263

Description:
- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile

@pullmoll 

I could add `yelp` as a `depends` for browsing the include help docs. What do you think?

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-08-14  3:14 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 19:24 [PR PATCH] aisleriot: update to 3.22.11 ericonr
2020-08-13 19:27 ` ericonr
2020-08-13 19:28 ` ericonr
2020-08-13 19:31 ` [PR PATCH] [Updated] " ericonr
2020-08-13 19:31 ` ericonr
2020-08-13 20:23 ` pullmoll
2020-08-13 21:58 ` [PR PATCH] [Updated] " ericonr
2020-08-13 22:17 ` ericonr
2020-08-14  3:14 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).