Fix bug #542604, thanks to Coacher.

(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 95 insertions, 1 deletions

diff --git a/media-gfx/ristretto/ChangeLog b/media-gfx/ristretto/ChangeLog
index 21b9cd448051..4f9183c6ea73 100644
--- a/media-gfx/ristretto/ChangeLog
+++ b/media-gfx/ristretto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/ristretto
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ChangeLog,v 1.80 2015/03/09 18:54:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ChangeLog,v 1.81 2015/04/21 03:50:07 calchan Exp $
+
+*ristretto-0.8.0-r1 (21 Apr 2015)
+
+  21 Apr 2015; Denis Dupeyron <calchan@gentoo.org> +ristretto-0.8.0-r1.ebuild,
+  +files/ristretto-0.8.0-fix-appdata-validation.patch,
+  +files/ristretto-0.8.0-fix-icon-installation.patch:
+  Fix bug #542604, thanks to Coacher.
 
 *ristretto-0.8.0 (09 Mar 2015)
 
diff --git a/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch b/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch
new file mode 100644
index 000000000000..e1266ab547b9
--- /dev/null
+++ b/media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch
@@ -0,0 +1,25 @@
+From 3ae341ba0bbf5c0fefcdb02a3674061a6b73f7db Mon Sep 17 00:00:00 2001
+From: Kevin Fenzi <kevin@scrye.com>
+Date: Mon, 2 Mar 2015 15:41:11 +0300
+Subject: appdata fails validation (Bug #11622)
+
+appstream-util fails with "cannot contain a hyperlink".
+
+Signed-off-by: Eric Koegel <eric.koegel@gmail.com>
+
+diff --git a/ristretto.appdata.xml.in b/ristretto.appdata.xml.in
+index 0ff8b22..ea7a96f 100644
+--- a/ristretto.appdata.xml.in
++++ b/ristretto.appdata.xml.in
+@@ -66,7 +66,7 @@
+     <release version="0.6.0" timestamp="1335662454">
+       <description>
+         <_p>This version comes with several changes such as online documentation on
+-           http://docs.xfce.org, the option to limit the maximum image-quality to
++           docs.xfce.org, the option to limit the maximum image-quality to
+            the screen dimensions to improve memory-usage and performance - now ristretto
+            renders at full quality with this option disabled, only one toolbar - instead 
+            of two, a quick-launch button on the toolbar to execute an editor, the option
+-- 
+cgit v0.10.1
+
diff --git a/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch b/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch
new file mode 100644
index 000000000000..79eed6b47b7d
--- /dev/null
+++ b/media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch
@@ -0,0 +1,20 @@
+This should normally patch Makefile.am and use autotools.eclass to re-run
+autoreconf. However, this does not work out of the box and pulling out the big
+artillery to fix a simple typo which will be gone in the next release wasn't
+worth the trouble.
+
+See https://bugs.gentoo.org/542604.
+
+Denis Dupeyron <calchan@gentoo.org>
+
+--- icons/128x128/Makefile.in.orig	2015-04-20 21:16:04.376497095 -0600
++++ icons/128x128/Makefile.in	2015-04-20 21:16:23.423138219 -0600
+@@ -337,7 +337,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-iconsdir = $(datadir)/icons/hicolor/48x48/apps
++iconsdir = $(datadir)/icons/hicolor/128x128/apps
+ icons_DATA = ristretto.png
+ EXTRA_DIST = $(icons_DATA)
+ all: all-am
diff --git a/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild b/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..94a5d41c7b22
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ristretto-0.8.0-r1.ebuild,v 1.1 2015/04/21 03:50:07 calchan Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A fast and lightweight picture viewer for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.98:0=
+	>=dev-libs/glib-2.24:2=
+	media-libs/libexif:0=
+	x11-libs/cairo:0=
+	>=x11-libs/gtk+-2.20:2=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.10:0=
+	>=xfce-base/libxfce4util-4.10:0=
+	>=xfce-base/xfconf-4.10:0="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-fix-appdata-validation.patch
+		"${FILESDIR}"/${P}-fix-icon-installation.patch
+		)
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS TODO )
+}