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 /media-gfx/gnome-photos | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'media-gfx/gnome-photos')
-rw-r--r-- | media-gfx/gnome-photos/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch | 34 | ||||
-rw-r--r-- | media-gfx/gnome-photos/gnome-photos-40.0.ebuild | 6 |
3 files changed, 41 insertions, 2 deletions
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 46ef5e8b0020..f7a7c51655a7 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,3 +1,4 @@ +AUX 40.0-fix-build-with-meson-0.61.1.patch 779 BLAKE2B 12af9247983044bf674c38f4011dc497e8f10f77dd46e87b4a2ae882922f8936a19bcda0cd440cb96f5be646852e27d0d994987ab0a070288193c76c04b33df6 SHA512 96fb1217b6265f229e0d70a65413fb0b56c110c28f300b26020cb7bf575cf1ec8dd8905bddae2e7c334f90b213f8a5bf208ce664e66343fda713ac98f472d6b4 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814 -EBUILD gnome-photos-40.0.ebuild 2426 BLAKE2B 44675ac89e656fc79a4940ca8bebcbfb09b56ec493b04a7702107b6b329b1b21a12f941d29eb3d016524ed61f60a130b16fb34562da9c46e51946b26a4dd4526 SHA512 d88388a40c4536fd3b2650504cb0d88793a7f39b858ba9f38e152450580a0dc30f4ee895518aad3da1c886ddcd1d431fab8f3f42e5a0d551bd804afd39b481cf +EBUILD gnome-photos-40.0.ebuild 2494 BLAKE2B bc43ce338ed54d1dd9a6e10c8a21a9e368d777189f13353c368bb76edc869722256acfa8f7ea04df69c17d3cef0ff93bfd47a0da668bb5bf4d816aa4e21ed6b2 SHA512 8322244c02ba16047cbdec6510e9f9a5b6e5419599a8bf6a1d90c80b80b53c0254a6cf2f4c752cfcc28235384127dedca6557e01633b2e7dcbb4314b55cfae8c MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4 diff --git a/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..dbd8d72ffb67 --- /dev/null +++ b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,34 @@ +https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/a0ac868a19d55dc52100e54fe4b2d29041bc6752 +https://bugs.gentoo.org/831933 + +From: rvalue <i@rvalue.moe> +Date: Fri, 21 Jan 2022 12:36:02 +0000 +Subject: [PATCH] meson: remove incorrect args for i18n.merge_file + +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 6e7192e0..94271de2 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -3,7 +3,6 @@ subdir('icons') + appdata = photos_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -23,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild index 3e60765e15a2..b3eaa56efd2a 100644 --- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-40.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 @@ -59,6 +59,10 @@ BDEPEND=" test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + DOCS=() # meson installs docs itself python_check_deps() { |