diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /games-puzzle/gnome-sudoku | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'games-puzzle/gnome-sudoku')
| -rw-r--r-- | games-puzzle/gnome-sudoku/Manifest | 3 | ||||
| -rw-r--r-- | games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch | 40 | ||||
| -rw-r--r-- | games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild | 6 |
3 files changed, 47 insertions, 2 deletions
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest index 20bb821e32f5..433b0a14956d 100644 --- a/games-puzzle/gnome-sudoku/Manifest +++ b/games-puzzle/gnome-sudoku/Manifest @@ -1,3 +1,4 @@ +AUX 40.2-fix-build-with-meson-0.61.1.patch 1315 BLAKE2B 2541cf70b42a9a5672f229c42ac4e26cf7108041245fa5a30046894132aa9ed9da4801666ecbe3c86d4d10cbfb1ae8f1bc6e9535863d20eefb92bab6bad470dd SHA512 d1aa9053327aeac398e75d0e02772d7d5c51349d62bc52361e00c35f111d81a986907ee95464e42150571fa9786edd51098ba08439e7cfa5746188d8eb000419 DIST gnome-sudoku-40.2.tar.xz 358260 BLAKE2B cf48bedee61ee808820a6e7ac3a368f215d6f0370edc83f06d62a3a28c79fb6c024411f9acace3db547a246f721e47c8c8c4ef63c7b07517c587f2b3b1de114b SHA512 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa -EBUILD gnome-sudoku-40.2.ebuild 981 BLAKE2B 3b5af34d8c1a11c0f4cebb0815790e1e32a5fa15f9aa4e9f09589694de7670b6b9e256178ddf7373fca8d4938e4ec8920a8426bbb1334751cdb52838014c5b68 SHA512 04d04d2ebec1b156eef29b1a4ab9e0f1f4e926232487f6f5b01463290cdc8a3b94a8b2e200fe0512d75b78dfbcac7f662387696a32a59f19cb646a9216dffe57 +EBUILD gnome-sudoku-40.2.ebuild 1049 BLAKE2B 575d36a3849d08d35b2786a1b48d97676a784e026be752b7fab2848c0a4a39b05dbd99d629dace339a4e959423cb371b96e972873dab8631d0097c40a1a88b3c SHA512 77c844e790984311f475d26178e25fccb12affbc12795992721265be3d14cd1ac009d1299297ddbce867aa9d029a193d3bc4a883e1053b413211540046ddc6a6 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..02d125685ac1 --- /dev/null +++ b/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a +https://bugs.gentoo.org/831556 + +From: Jan Beich <jbeich@FreeBSD.org> +Date: Mon, 24 Jan 2022 11:44:06 +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:5:0: ERROR: Function does not take positional arguments. +data/meson.build:24:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f18f247..9c95e02 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') + + resources = gnome.compile_resources('gnome-sudoku', resource_files) + +-desktop_file = i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), + install: true, +@@ -21,7 +21,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + install: true, +-- +GitLab + diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild index 4f5555a63086..99ff396e96c1 100644 --- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild +++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.2.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 @@ -33,6 +33,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + src_prepare() { xdg_src_prepare vala_src_prepare |