From 30be13e085ae6c5de9f7c0360808c71ec1f54c65 Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Tue, 21 Apr 2015 03:50:09 +0000 Subject: [PATCH] Fix bug #542604, thanks to Coacher. Package-Manager: portage-2.2.18/cvs/Linux x86_64 --- media-gfx/ristretto/ChangeLog | 9 +++- media-gfx/ristretto/Manifest | 27 ++---------- ...stretto-0.8.0-fix-appdata-validation.patch | 25 +++++++++++ ...istretto-0.8.0-fix-icon-installation.patch | 20 +++++++++ media-gfx/ristretto/ristretto-0.8.0-r1.ebuild | 42 +++++++++++++++++++ 5 files changed, 99 insertions(+), 24 deletions(-) create mode 100644 media-gfx/ristretto/files/ristretto-0.8.0-fix-appdata-validation.patch create mode 100644 media-gfx/ristretto/files/ristretto-0.8.0-fix-icon-installation.patch create mode 100644 media-gfx/ristretto/ristretto-0.8.0-r1.ebuild 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 +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/Manifest b/media-gfx/ristretto/Manifest index 6ecc162662d8..f6d3a2d8200a 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,28 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX ristretto-0.8.0-fix-appdata-validation.patch 1084 SHA256 89ae1eee31329352eaf6427e6c4699023c584e1683caef37ee03736937da5738 SHA512 dcd2ee1a6b21c7973b0de30632029628eadc604f4d606f16d72eb344b2f321caeed527c9964ddd4972d5db529bf48bc234ef67759953943b2df21ddaaed94fa4 WHIRLPOOL 29e59618ed720991ec4722ab146b1160eb590a91a80420c86102e61a3e443e4a42d7433026f7cfb295051871618c90745ead43defda26080985dd9fbc3a5bcb8 +AUX ristretto-0.8.0-fix-icon-installation.patch 745 SHA256 e5f581a2087dafa22bf6114c6a656cc5ac2bff7c761f5f04af4a94267eaa72d1 SHA512 878c6e377ab261b7034d659be768c816ad61be960a792d506dde404d0a7c04436d8ca60bec35a4562ead219cc329b53e301afda1536ce456270cb5469472a079 WHIRLPOOL 64d21daa1af162e34c3f43340a939ca4ac32234d565cb6603c48315f9e5a122d0683dfca2674fac100a323d3fc46050d01305bf422fbeaeced506436504d3b0a DIST ristretto-0.6.3.tar.bz2 499323 SHA256 2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79 SHA512 996ed14ab749efd2df702a87e559711791bad71226e8b097c630e9c425059805ca52523ef68e8757849837e89a59bbb580459cc45b4e207785aedcfbaf733166 WHIRLPOOL 402b1f1747dc47b39bc08772e8169130aea2e1826fb0fe01b5a40bc669d1d3d37bdf7f1a21ef19108f70382c9843cdc66d99ce21b5def3eadb83dd3dd8f356c3 DIST ristretto-0.8.0.tar.bz2 541473 SHA256 71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328 SHA512 067d3e7b5ec4fe3537cc796b94e8b999fc99efdb58c52a2a71160405626a3784caa877724e756b363012dce4719ee534f4ce0c92f2f6f2adaf937da8d5abab99 WHIRLPOOL 85b7dbbf7009b5a100f8fa5302f683df2832d448c5580e94ae8e48cd74ec600b9964b101f774cb9610f63786ffe7f11a779a5a4c333ba4778c058ac2f70d35c9 EBUILD ristretto-0.6.3.ebuild 952 SHA256 ba56df7091bc8a666128bf0d89808825aa99c628c0f10fe80cb28c7268ff0066 SHA512 6c3668bd47a2ccdc2b83bcf5246540868af56cd9e38b4ae42497bbce264c6cdaee156bf31fa05d8f4ced226e2c9aaea50bec650e820d15326369a9d69206d078 WHIRLPOOL 902e7d8fd200ba59a52c7b5a2d59104aec2866796a9b1cda810616f5cd579ca2e2f57dcdf14c689d8a01d91d97cec7220a1e64bd732d1e395ede61bea54998f6 +EBUILD ristretto-0.8.0-r1.ebuild 1095 SHA256 25567a81c0d5a1104ac99a30782daec97ee101cb8e044267b788e9ac35782978 SHA512 c0b1a2b75ae5539622cc448bd37545fed2f979c2b63ea2b9c8e42476b5e7c2c8f5852cbda21a0cf26a7da32aea65712eb143f629be6c4d3abb4691fc1ef3417f WHIRLPOOL e306a31341458a4842a46040fc68d1f81b4e8971a08e0b0d7df6e5c23edb34e756f684eaca45f15271d86ded6eca8347cdcf53eef73e979371b91764ab74bff9 EBUILD ristretto-0.8.0.ebuild 976 SHA256 fd8c5b574b1bd6cd5ccc7bc05ce1206788503fd35b461ce275b730c91d96bb9e SHA512 efe028fa65988b341e6fc96e9f709062ec07074e45527ae61cee1ff475d3c57b486f547016da8d7f8ecacb2bf0657c2e6a75afcac7bf2ec10c82c7e0dad0c7ac WHIRLPOOL f2537f34fc88c1b216377b3cfe41313aa94a07fd3f4991d9c2f784fa3e34cde6cb3465069b76c052a0a61e500add07f8e1a4261482d1bfd9693a1842a831df45 -MISC ChangeLog 13836 SHA256 6432c5851f822895321ec4d6c44f6c0dab635b1d4aaa3e9342f4893d407f5f84 SHA512 92a48f6eb86e7864165aa6eaf04472a41c3d54f8cb28a3d64b32e77d1bf8257b1c15744bfc2e187a7de9afa0f1eed6ae878987b5d0502593b2da993ad589bc3d WHIRLPOOL 7e5c46688ba1d5c05ae2263249c3d3c7560c64cabc94decd07213518fbb504e3588e34eaeeb854965f70d0b1686917b5c8dd082e98218d513238618be6f99f60 +MISC ChangeLog 14099 SHA256 f35643e09f0e7ce83d691dbb19da0b9ba0f05a07af3e7d1241b6c4e43b8cec94 SHA512 301c4ece0609c57d32293d5ef46a0a4da0c33f5f05b4c85fde3b271beba47efd70ef63cda599a482b996f5b0dfda62f77b1c8026288772d5b706dc94069d8be7 WHIRLPOOL 38128f436cb3a2632ec1047c421f5255a8ab78ee2e9c61f3c240885e5626dd8512c03eee991126d68c550ad6c4be8a3f0d70d6f039dd54f01d4ac84db06aa3ea MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQJ8BAEBCABmBQJU/exmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyR4QANnLZEMDGqJxQbVwf6m2WC8z -PLntzVnOKZVR8Y7OHTbnKy7gop47tfOV/pkTG8eAICvxEtlwXfMTgCnl0cZTU9wh -vCC1ElXhhShAwm7k5CtJlpT02nV2ZvLyy1dAc7iaU6joCEEaMLI68ORRPlUkbMF+ -8C/YmofoP0/7xQhbWXNlyztAE4GrfqCq3F6wOfDVv5/ygHlkMxVCmRD7bpU6dfNm -pQEWh/k/GFQLgS/EcJ/7AVd2jd11F4KvUVF62StyH6HweZYei683j1vyKVPc68rs -4vXBkhldrrG85nyuhzELq/zfFeUfZpFr3t0s/dRzaeA3bMIKElYmKZ3Cdbk+4Vnp -/yQVXt81BIDZqGO7pAfv/cmvLEnpJ5wbV6HTiXU/993AKKxMflLNeYJ2MRhC8WFz -153SQFLC0/x19eGIRBE0I8DdHDafI2b2+jaKOim+jo2LNTUhebzp1YgCWJMUothx -tChMJXZFfgVfG1ZjYReGrfDXI1yC4TFrbXc1/ave8mbpv1JgK+0PKaiPoKEzs9uR -kxghDZre87XkC4JE6qw5qKjOhH/et8cSSS4+FWydd3DjFMNphDN3VYPSIACz6pxJ -CQw1uU/GcY/mFRQtYAysWyXNr0T1dBGy7V+9au6t+ffTYj9B+uvtbYnyIfBUknZj -AYVcxmBrYRTkXsxLxyy2 -=3T5s ------END PGP SIGNATURE----- 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 +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 + +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 @@ + + + <_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 + +--- 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 ) +} -- 2.26.2