From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- gnome-extra/gnome-characters/Manifest | 5 ++- .../files/fix-build-with-meson-0.61.patch | 20 +++++++++++ .../gnome-characters/gnome-characters-40.0.ebuild | 42 ---------------------- .../gnome-characters/gnome-characters-41.0.ebuild | 8 +++-- 4 files changed, 28 insertions(+), 47 deletions(-) create mode 100644 gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch delete mode 100644 gnome-extra/gnome-characters/gnome-characters-40.0.ebuild (limited to 'gnome-extra/gnome-characters') diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest index a87b873d6cc2..75ddeab6141b 100644 --- a/gnome-extra/gnome-characters/Manifest +++ b/gnome-extra/gnome-characters/Manifest @@ -1,5 +1,4 @@ -DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e +AUX fix-build-with-meson-0.61.patch 575 BLAKE2B 29986accfef997c31c3810781a1f896de0548b742897964ce2149a8dc4d52cb2bed0cad67271d059dfb8c9ae760861fa6dd16f654ea28c488e3c3b9d8bfe8e79 SHA512 8c083dad0840cb0f304022e9bdfe1622a224070d10c9295efb35900f99f13d434c1a26fe90d587426a6285cd5adc745cbcd4054f1f8885fd64d7a20f2291962f DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04 -EBUILD gnome-characters-40.0.ebuild 880 BLAKE2B f488ceabc0ea5e449a3d470830e6deadb81af80be4d9dba8bc96c16abcbe1dbf83b819056a4b2683693329db9fa6ecfb2c538ca66685c063934b396d59ebe20b SHA512 1198a6c6e8d2c126aff906e15b05281778a7d0e48c596113de1e8c09e96a04e6d0005fd3c67c715379819d44b98000ffeacce450e67b33fcb9213d332856d045 -EBUILD gnome-characters-41.0.ebuild 889 BLAKE2B c131b225508c2b27a4e35bdb3c4112f5d299c4b773a16f3042b1682c9cdf40b19a3712fe92fc3cd427659996bd61d361eed10f0129800855092c5d363f429477 SHA512 3d1b00d1854ff14c0c1a8ff9c5cc8ca047f88da60b1e96f05dbb2e309f08c027907cd02b288af440483b9be7d42274d280a0de12efe53f071f8e0d2616de5385 +EBUILD gnome-characters-41.0.ebuild 946 BLAKE2B 9b14d0665331d3018fcec439346d3379f0a792e8000897e2fce554c96617365727397802f6c5182f52908a5b1f8bc26f16234ef64fcaed9f925b8313fe39444b SHA512 92a6dd7d59d18ee1489afc56ad28c839d6fed49e8d3403d82adbd235b44565ae90af01d5f128d1b6b4dc823eb25615bc7a451430dd4ce5e7961e49f7424c1b18 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch new file mode 100644 index 000000000000..4033314ea517 --- /dev/null +++ b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch @@ -0,0 +1,20 @@ +Part of https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70482a1cc30864dc51cde60df0332d +https://bugs.gentoo.org/831471 +--- a/data/meson.build ++++ b/data/meson.build +@@ -47,7 +47,6 @@ + desktop_conf.set('bindir', characters_bindir) + + i18n.merge_file( +- 'desktop-file', + type: 'desktop', + input: configure_file ( + input: characters_name + '.desktop.in', +@@ -61,7 +60,6 @@ + ) + + appdata_file = i18n.merge_file( +- 'appdata-file', + input: characters_name + '.appdata.xml.in', + output: characters_application_id + '.appdata.xml', + po_dir: po_dir, diff --git a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild deleted file mode 100644 index 5f24e60e6cc9..000000000000 --- a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Unicode character map viewer and library" -HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap" - -LICENSE="GPL-2+ BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" - -RDEPEND=" - >=dev-libs/gjs-1.50 - >=dev-libs/glib-2.32:2 - >=dev-libs/gobject-introspection-1.35.9:= - >=dev-libs/libunistring-0.9.5:= - >=x11-libs/gtk+-3.20:3[introspection] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.36[introspection] - gnome-base/gnome-desktop:3[introspection] - >=gui-libs/libhandy-1.1:1= -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxml2:2 - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild index 3154b414c2fc..38255a48b231 100644 --- a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild +++ b/gnome-extra/gnome-characters/gnome-characters-41.0.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 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap" LICENSE="GPL-2+ BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" RDEPEND=" >=dev-libs/gjs-1.50 @@ -31,6 +31,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/fix-build-with-meson-0.61.patch +) + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update -- cgit v1.2.3