From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- media-gfx/gnome-photos/Manifest | 5 +- .../files/40.0-fix-build-with-meson-0.61.1.patch | 34 ------- media-gfx/gnome-photos/gnome-photos-40.0.ebuild | 103 --------------------- media-gfx/gnome-photos/gnome-photos-42.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch delete mode 100644 media-gfx/gnome-photos/gnome-photos-40.0.ebuild (limited to 'media-gfx/gnome-photos') diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 9eb1e60809c8..cbb8e631121e 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,6 +1,3 @@ -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 DIST gnome-photos-42.0.tar.xz 2855624 BLAKE2B a980cc2f581f1f6834925426ba3e0e7e6c341d939b2fbe2aa40c737669fb09fcdd8bb64fd0dfbee640d8dd73061281b6b92f97cfb5737cbeca9788c9e01d7fbe SHA512 cddaa84596a180fb2a4d70db65c6e625e3d94bccbdc7bcc83ed577b9306210a2879e3d40f8823a9e097f78caa6fccc53404194e7dce0629db3ebda1aa428b714 -EBUILD gnome-photos-40.0.ebuild 2493 BLAKE2B 1d72bed250adf2098adeb9ec402751bd45817f3969cec39c459feaa3c93b066bbfc9c7f92a780f95e400cb4bac429db0c512464788e1fe6fdcccca27850e3c46 SHA512 e8dc79d269d3c1506dfaf16e03c87239a51f24c2d56f8b611c4d3f44a2cb7fffb0db9ee5af1b2a93b990c12363e7643bed58b1269c45662a7581f9beb763e973 -EBUILD gnome-photos-42.0.ebuild 2444 BLAKE2B d4dec905f1a30fe7439b9aee77bd1abf43baa3502a7f7b7b63b54334880652b4a5e19c577d17e867ca12bfd6815b0e98c2497dab4a193cb1b3acb5f225e7fd16 SHA512 b2998fa278183fb7643d1870050205e24c1f88269782fdb22982e22b8d63253c4a351eaf9bfbbc5ebc5f5fd43f59cc10680d4ce672e7c2c7944c634d0d30b17d +EBUILD gnome-photos-42.0.ebuild 2441 BLAKE2B cbc42c5c0874e2af6880e01266f2e8a7dc4a4ae7f2cffcd60e35c22e1244dd9836e9f762e2faea89de9556e0ccf207a554c7e087256e645bff243266d4c5285c SHA512 e586a55bf2988b9767d7cf68d6364b4f730a36d90cbf02864796a5012bd8038fb5e5446a9951c752a208e3976b19b5aa31668b8df09e377ee639827313fec491 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 deleted file mode 100644 index dbd8d72ffb67..000000000000 --- a/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/a0ac868a19d55dc52100e54fe4b2d29041bc6752 -https://bugs.gentoo.org/831933 - -From: rvalue -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 deleted file mode 100644 index 915728b707fc..000000000000 --- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="Access, organize and share your photos on GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Photos" - -LICENSE="GPL-3+ LGPL-2+ CC0-1.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="flickr test upnp-av" -RESTRICT="!test? ( test )" - -DEPEND=" - media-libs/babl - >=x11-libs/cairo-1.14.0 - >=x11-libs/gdk-pixbuf-2.36.8:2 - >=media-libs/gegl-0.4.0:0.4[cairo,raw] - sci-geosciences/geocode-glib - >=media-libs/gexiv2-0.10.8 - >=dev-libs/glib-2.62.0:2 - >=net-libs/gnome-online-accounts-3.8.0:= - >=media-libs/grilo-0.3.5:0.3= - gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.22.16:3 - >=dev-libs/libdazzle-3.26.0 - >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] - >=net-libs/libgfbgraph-0.2.1:0.2 - >=gui-libs/libhandy-1.1.90:1= - virtual/jpeg:0 - >=media-libs/libpng-1.6:0= - app-misc/tracker:3= - sys-apps/dbus -" -# gnome-online-miners is also used for google, facebook, DLNA - not only flickr -# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here, -# so don't pull it always, but only if either USE flag is enabled. -# tracker-miners gschema used at runtime. -RDEPEND="${DEPEND} - net-misc/gnome-online-miners[flickr?] - upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) - flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) - app-misc/tracker-miners:3 -" -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - dev-util/desktop-file-utils - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - 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() { - use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build -} - -src_configure() { - local emesonargs=( - $(meson_use test dogtail) - -Dflatpak=false - -Dinstalled_tests=false - -Dmanuals=true - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild index 0ad5b2620be4..69c57dce0b5a 100644 --- a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos" LICENSE="GPL-3+ LGPL-2+ CC0-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="flickr test upnp-av" RESTRICT="!test? ( test )" -- cgit v1.2.3