commit: 81d667dbf9efd5e7eda4dfc68d1340cc516327a9 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Wed Jan 16 03:28:21 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Wed Jan 16 03:31:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d667db
media-gfx/gnome-photos: bump to 3.26.4 Includes patch to support both tracker-1 and tracker-2, however ebuild doesn't support tracker-2 yet, as we don't have a tracker-miners atom to depend on in the main tree. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> media-gfx/gnome-photos/Manifest | 1 + .../files/3.26.4-support-tracker1.patch | 30 +++++++++ media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild | 74 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 617c6f47ec6..65478537b2e 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1 +1,2 @@ DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22 +DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489 diff --git a/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch b/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch new file mode 100644 index 00000000000..508b5d3c9a5 --- /dev/null +++ b/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch @@ -0,0 +1,30 @@ +From 7b81db71110e325fc6343ae2582942a9ad038311 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <l...@gentoo.org> +Date: Wed, 16 Jan 2019 05:08:25 +0200 +Subject: [PATCH] build: Keep supporting building against tracker-1 too + +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5965d33d..13196605 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,7 +115,12 @@ PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, [gsettings-desktop-schemas]) + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_MIN_VERSION]) + PKG_CHECK_MODULES(GTK_UNIX_PRINT, [gtk+-unix-print-3.0]) + PKG_CHECK_MODULES(PNG, [libpng16]) +-PKG_CHECK_MODULES(TRACKER, [tracker-control-2.0 tracker-sparql-2.0]) ++tracker_api="1.0" ++m4_foreach([VERSION], [[1.0], [2.0]], ++ [PKG_CHECK_EXISTS([tracker-control-VERSION tracker-sparql-VERSION], ++ [tracker_api="VERSION"]) ++ ]) ++PKG_CHECK_MODULES(TRACKER, [tracker-control-$tracker_api tracker-sparql-$tracker_api]) + + LIBGD_INIT([ + gtk-hacks +-- +2.17.0 + diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild new file mode 100644 index 00000000000..e2c8b5c0544 --- /dev/null +++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +GNOME2_EAUTORECONF="yes" + +inherit gnome2 python-any-r1 virtualx + +DESCRIPTION="Access, organize and share your photos on GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Photos"; + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="flickr test upnp-av" + +# tracker-2 is supported, but we need to pull in tracker-miners for that, which we didn't have in main tree yet +COMMON_DEPEND=" + app-misc/tracker:0/100[miner-fs] + >=dev-libs/glib-2.44:2 + gnome-base/gsettings-desktop-schemas + >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] + media-libs/babl + >=media-libs/gegl-0.3.15:0.3[cairo,jpeg2k,raw] + media-libs/gexiv2 + >=media-libs/grilo-0.3.0:0.3= + >=media-libs/libpng-1.6:0= + >=net-libs/gnome-online-accounts-3.8:= + >=net-libs/libgfbgraph-0.2.1:0.2 + sci-geosciences/geocode-glib + >=x11-libs/cairo-1.14 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22.16:3 +" +# 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 +RDEPEND="${COMMON_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] ) +" +DEPEND="${COMMON_DEPEND} + app-text/yelp-tools + dev-util/desktop-file-utils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" +# app-text/yelp-tools needed for eautoreconf; otherwise probably just itstool + +PATCHES=( + "${FILESDIR}"/${PV}-support-tracker1.patch # requires eautoreconf +) + +python_check_deps() { + use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # XXX: how to deal with rdtscp support, x86intrin + gnome2_src_configure \ + $(use_enable test dogtail) +} + +src_test() { + virtx emake check +}
