commit: a91e8bcf4d45eb1332e18d42843d489ced7edff1 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Jan 14 18:07:44 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Jan 14 18:10:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91e8bcf
media-gfx/raw-thumbnailer: Support libopenraw >=0.1 Closes: https://bugs.gentoo.org/609972 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/raw-thumbnailer-0.2.1-libopenraw.patch | 28 ++++++++++++++++++++++ ....2.1.ebuild => raw-thumbnailer-0.2.1-r1.ebuild} | 18 ++++++++++---- .../raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild | 4 ++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch b/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch new file mode 100644 index 00000000000..1106493622a --- /dev/null +++ b/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch @@ -0,0 +1,28 @@ +From 8711d72122e2e67641cc9a0166c1c35ce64719b2 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +Date: Sun, 14 Jan 2018 18:50:17 +0100 +Subject: [PATCH] Use pkgconfig name "libopenraw-0.1" to support recent + libopenraw + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7562e2b..ef14d87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,8 +12,8 @@ AC_PROG_CXX + AC_PROG_INSTALL + + # Checks for libraries. +-PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= 0.0.4, HAVE_OPENRAW=yes) +-PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-1.0, HAVE_OPENRAWGNOME=yes) ++PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= 0.1.0, HAVE_OPENRAW=yes) ++PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-0.1, HAVE_OPENRAWGNOME=yes) + PKG_CHECK_MODULES(GDK, gdk-pixbuf-2.0, HAVE_GDK=yes) + + AC_SUBST(OPENRAW_CFLAGS) +-- +2.16.0.rc1 + diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild similarity index 58% copy from media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild copy to media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild index cf2c9096972..8d3bedb4b40 100644 --- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild +++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 + +inherit autotools DESCRIPTION="A lightweight and fast raw image thumbnailer" HOMEPAGE="https://github.com/erlendd/raw-thumbnailer"; @@ -9,13 +11,21 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -RDEPEND=">=media-libs/libopenraw-0.0.9[gtk] +RDEPEND=">=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer" DEPEND="${RDEPEND} virtual/pkgconfig" DOCS=( AUTHORS ChangeLog ) +PATCHES=( + "${FILESDIR}"/${P}-libopenraw.patch # bug 609972 +) + +src_prepare() { + default + eautoreconf +} diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild index cf2c9096972..baf2934ea32 100644 --- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild +++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="" -RDEPEND=">=media-libs/libopenraw-0.0.9[gtk] +RDEPEND="~media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer" DEPEND="${RDEPEND}
