* [gentoo-commits] repo/gentoo:master commit in: games-board/gnome-mahjongg/, games-board/gnome-mahjongg/files/
@ 2022-01-25 1:09 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-01-25 1:09 UTC (permalink / raw
To: gentoo-commits
commit: a674576191fa3649c7d008202f3c6af71768af70
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 00:58:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:58:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6745761
games-board/gnome-mahjongg: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831466
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gnome-mahjongg-3.38.3-meson-0.61.patch | 32 ++++++++++++++++++++++
.../gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild | 6 +++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
new file mode 100644
index 000000000000..9b9f26d09f95
--- /dev/null
+++ b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
@@ -0,0 +1,32 @@
+https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26
+https://bugs.gentoo.org/831466
+
+From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+
+ desktop_file = i18n.merge_file (
+- 'desktop-file',
+ input: 'org.gnome.Mahjongg.desktop.in',
+ output: 'org.gnome.Mahjongg.desktop',
+ install: true,
+@@ -42,7 +41,7 @@ if desktop_file_validate.found()
+ )
+ endif
+
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+ input: 'org.gnome.Mahjongg.appdata.xml.in',
+ output: 'org.gnome.Mahjongg.appdata.xml',
+ install: true,
+GitLab
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
index b6a00c10a6e5..d7c2f9a1096b 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,6 +30,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.38.3-meson-0.61.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/gnome-mahjongg/, games-board/gnome-mahjongg/files/
@ 2023-12-26 21:10 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2023-12-26 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 66ab3b8d3ed4d8c243591d28a21159f4cc19c18d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 21:01:36 2023 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 21:07:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ab3b8d
games-board/gnome-mahjongg: drop 3.38.3
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
games-board/gnome-mahjongg/Manifest | 1 -
.../files/gnome-mahjongg-3.38.3-meson-0.61.patch | 32 ------------
.../gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild | 57 ----------------------
3 files changed, 90 deletions(-)
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index cd109529437d..2aacb773e995 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,2 +1 @@
-DIST gnome-mahjongg-3.38.3.tar.xz 3061860 BLAKE2B c4ba84d2b5ebece56fc2de605c9572f10103323f0af9174538cb9124b617a3268c1c0fa27a5634c54b64188b7f1589ae6f14b02370de5edb44742c1b30553456 SHA512 883ed8e2cc6e5efa87adce2dab0843f8b76e4772174cdbe8a535dede714f486d8493058d822a7b8cccff50995d11f3b6cff25d5f77406e931aee5fd479f23bb5
DIST gnome-mahjongg-3.40.0.tar.xz 3156788 BLAKE2B 3a8dd05001d75a7fa7663556dcad135b89786333c4c89ee131e7d63dafaee2a738f0c573199a69e6bc015036270a94c8be6cd6d48630faddba297710f48931d0 SHA512 9102d48d7a1cd2808a4de86cb3cb73c30bbe769bdc58f2a69914700218972a8c96cf18b5165cc20eb9a33866a70c5b2daee43cbecf758526d89a0b8720ef5c9a
diff --git a/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch b/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
deleted file mode 100644
index 9b9f26d09f95..000000000000
--- a/games-board/gnome-mahjongg/files/gnome-mahjongg-3.38.3-meson-0.61.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/merge_requests/26
-https://bugs.gentoo.org/831466
-
-From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:22:48 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:24:0: ERROR: Function does not take positional arguments.
-data/meson.build:45:0: ERROR: Function does not take positional arguments.
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
- install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
-
- desktop_file = i18n.merge_file (
-- 'desktop-file',
- input: 'org.gnome.Mahjongg.desktop.in',
- output: 'org.gnome.Mahjongg.desktop',
- install: true,
-@@ -42,7 +41,7 @@ if desktop_file_validate.found()
- )
- endif
-
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
- input: 'org.gnome.Mahjongg.appdata.xml.in',
- output: 'org.gnome.Mahjongg.appdata.xml',
- install: true,
-GitLab
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
deleted file mode 100644
index 8e51464166c5..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=x11-libs/gtk+-3.13.2:3
- >=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
- gnome-base/librsvg:2[vala]
-"
-BDEPEND="
- $(vala_depend)
- dev-libs/appstream-glib
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.38.3-meson-0.61.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dcompile-schemas=disabled
- -Dupdate-icon-cache=disabled
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-26 21:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 1:09 [gentoo-commits] repo/gentoo:master commit in: games-board/gnome-mahjongg/, games-board/gnome-mahjongg/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-26 21:10 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox