summaryrefslogtreecommitdiff
path: root/games-puzzle/gnome-tetravex
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
commitfcc5224904648a8e6eb528d7603154160a20022f (patch)
tree3bfce096b38a9cea8eed13fc70c1526c456e9abd /games-puzzle/gnome-tetravex
parent2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
gentoo resync : 02.02.2022
Diffstat (limited to 'games-puzzle/gnome-tetravex')
-rw-r--r--games-puzzle/gnome-tetravex/Manifest3
-rw-r--r--games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch33
-rw-r--r--games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild4
3 files changed, 39 insertions, 1 deletions
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 8f8ef5b8238d..bd18a21853d8 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,3 +1,4 @@
+AUX gnome-tetravex-3.38.2-meson-0.61.patch 1247 BLAKE2B d2275d6d5851216e99bd6d0ccb7265305a51c205ad1d280a210da4f0fac477ae85f1a708e56748eb3553ae6452655ef8af13c8a0c240dc675aaa8f35a318af2c SHA512 419b20a2f323fc95e443cccaa2513f4a6ea138a0c4bed4cb4b86ac1c683afef680c8fc15dacea252d033af1c26ba81d4ca014bcde739bebf15809c8b4ec187de
DIST gnome-tetravex-3.38.2.tar.xz 1004632 BLAKE2B 5e16420e9e05668e3c697a275e748e75d65531fbe7bca61baffa5846b76781403a3014e1f85a6f9ec69965c256cbacbe3a756e36c9725eeccfd6abd0c568dabc SHA512 ad67dfcbec5cf33f5361c6f5746d78158726a4bf5c85f29ea084a324e2ec493ca41bb61e47228ad4deb30985fd750e8703e11fd02051af5ac7c9c256513644b8
-EBUILD gnome-tetravex-3.38.2.ebuild 979 BLAKE2B b80323b69322ca9599a09dc4a8d00a4d39d90dad8fc802979e3f15de76b19b0882cbf67729c0e8ce236d46df3f5e75df4070a75528832603319cece303cc07df SHA512 2c47ad911182f261e1d933438c11f164a49c1f49383096dc13ac0489cc9223ab08deb9930c7ea86239d9f5ba1515427ebf4bae4485c5830cec4e09da8b9fb7e0
+EBUILD gnome-tetravex-3.38.2.ebuild 1037 BLAKE2B 043bab25e225c5c56271c29b64a8efb7d44aab1b23f51cc79c970b234546359eb02c7d88fd29b061b2ae841c51f094292862ec8362439e07c23aa681f080933b SHA512 8567864e44c7c042e58b7db9954d9dec55a43aa4bd072b50cbef6b0f0e20d2004f31c67144bcf8cc3be828aa1133214adb33a59fd1b6c9bb2f2326c19aec3f25
MISC metadata.xml 419 BLAKE2B 690f82e9b4d41bdc02df30f899278d6dc51d3bac6b30b6b6fe97e32649a6c9adfd7ce8d2436263f9653e3160bcfaa163be9e29505eff65411667b646dad0898a SHA512 a2c42c86a901ccee97020d141c321ee2f2da44b82d4f3f97cbef85b0f086121d8f30400cb6b2a7ec51e81896009693daef52369884fa3b6e84f052262d499144
diff --git a/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..97f27d95a06a
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/files/gnome-tetravex-3.38.2-meson-0.61.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20.patch
+https://bugs.gentoo.org/831493
+
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+
+ # Desktop file
+ if get_option('build_gui')
+- desktop_file = i18n.merge_file ('desktop-file',
++ desktop_file = i18n.merge_file (
+ input: project_id + '.desktop.in',
+ output: project_id + '.desktop',
+ install: true,
+@@ -56,7 +56,7 @@ endif
+
+ # AppData file
+ if get_option('build_gui')
+- appdata_file = i18n.merge_file ('appdata-file',
++ appdata_file = i18n.merge_file (
+ input: project_id + '.appdata.xml.in',
+ output: project_id + '.appdata.xml',
+ install: true,
+GitLab
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 1c9ab8809a6e..254fde622d9d 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare