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 /dev-util/d-feet | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'dev-util/d-feet')
| -rw-r--r-- | dev-util/d-feet/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/d-feet/d-feet-0.3.16.ebuild | 6 | ||||
| -rw-r--r-- | dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch | 31 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest index 347e23d120b6..3a2282e8c4f5 100644 --- a/dev-util/d-feet/Manifest +++ b/dev-util/d-feet/Manifest @@ -1,3 +1,4 @@ +AUX d-feet-0.3.16-fix-meson-0.61.patch 911 BLAKE2B 21198e257461b1df602b1d7cdeddc3158d39967d8d3bd412ea36ac6cb1fd904d6419e5c40664958639e2be8b2cf08bef53fdd8fd458f6e4548d7b08f519874f1 SHA512 bcb3ddf35293c2f000bd857a20de403cb1903b787de078c1276bbdf8dc8b4285f8419a8ad6e031296e1428e098325d8471fcf8c19480818502d280dc9a591d16 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d -EBUILD d-feet-0.3.16.ebuild 1024 BLAKE2B 9551ddfec9528d64b83614e4c58dc30322b688ba4cd56af154c2d859e5982846255978d7d832b5569216d1c5798492287e98d7dee993912eb6173f32347d85db SHA512 de91c821a0838c576d80f9476fb58e678f32c8202b442c648f50386a07283083d9fa10a7a5971091e3b54b6587a9131225e8d747e3970fd32f64206190b77ebc +EBUILD d-feet-0.3.16.ebuild 1086 BLAKE2B fef497f70c7a1395e9709ef912fa45513c9e40d13f65dc92607981a297d9cdd4db683e88c18387b05a90e8158247cac43322bbf1841395c1fb5f24d4866189a0 SHA512 74b98981961654e1efb9344d6ab0d0b5d4f739a1cc9f81d21cf9c78e88c66702ead13af665eadbbe9e267a562288dfe606c225b70b45850591faff6852876c0b MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild index 7a9d65104598..346847660580 100644 --- a/dev-util/d-feet/d-feet-0.3.16.ebuild +++ b/dev-util/d-feet/d-feet-0.3.16.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 @@ -37,6 +37,10 @@ BDEPEND=" test? ( dev-python/pycodestyle ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.3.16-fix-meson-0.61.patch +) + src_configure() { local emesonargs=( $(meson_use test tests) diff --git a/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch new file mode 100644 index 000000000000..064f94105882 --- /dev/null +++ b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch @@ -0,0 +1,31 @@ +https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32 +https://bugs.gentoo.org/831524 + +From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Mon, 24 Jan 2022 12:11:57 +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:15:0: ERROR: Function does not take positional arguments. +data/meson.build:27:0: ERROR: Function does not take positional arguments. +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata = df_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, +GitLab |