| 1 |
commit: e9b522a3b065fa8ce8e376a918ba257141b862ab |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 18:55:54 2017 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 19:08:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b522a3 |
| 7 |
|
| 8 |
sci-chemistry/chemical-mime-data: Add back support for rsvg from gnome-base/librsvg |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
.../chemical-mime-data-0.1.94-r3.ebuild | 8 ++++-- |
| 14 |
.../chemical-mime-data-0.1.94-rsvg-convert.patch | 30 ++++++++++++++++++++++ |
| 15 |
2 files changed, 36 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild |
| 18 |
index 5b8fc00d5b..a120487084 100644 |
| 19 |
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild |
| 20 |
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2016 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
@@ -22,13 +22,17 @@ DEPEND="${RDEPEND} |
| 28 |
dev-util/intltool |
| 29 |
dev-util/desktop-file-utils |
| 30 |
dev-libs/libxslt |
| 31 |
- media-gfx/imagemagick[xml,png,svg] |
| 32 |
+ || ( |
| 33 |
+ gnome-base/librsvg[tools] |
| 34 |
+ media-gfx/imagemagick[xml,png,svg] |
| 35 |
+ ) |
| 36 |
virtual/pkgconfig" |
| 37 |
|
| 38 |
PATCHES=( |
| 39 |
"${FILESDIR}"/${P}-turbomole.patch |
| 40 |
"${FILESDIR}"/${P}-pigz.patch |
| 41 |
"${FILESDIR}"/${P}-namespace-svg.patch |
| 42 |
+ "${FILESDIR}"/${P}-rsvg-convert.patch |
| 43 |
) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
|
| 47 |
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000000..8a92e19e15 |
| 50 |
--- /dev/null |
| 51 |
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch |
| 52 |
@@ -0,0 +1,30 @@ |
| 53 |
+ configure.ac | 2 +- |
| 54 |
+ icons/hicolor/Makefile.am | 2 +- |
| 55 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 56 |
+ |
| 57 |
+diff --git a/configure.ac b/configure.ac |
| 58 |
+index 6f87a94..a503da4 100644 |
| 59 |
+--- a/configure.ac |
| 60 |
++++ b/configure.ac |
| 61 |
+@@ -102,7 +102,7 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then |
| 62 |
+ [RSVG], |
| 63 |
+ [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.] |
| 64 |
+ ) |
| 65 |
+- AC_PATH_PROG([RSVG], [rsvg], [no]) |
| 66 |
++ AC_PATH_PROG([RSVG], [rsvg-convert], [no]) |
| 67 |
+ AC_SUBST([RSVG]) |
| 68 |
+ fi |
| 69 |
+ |
| 70 |
+diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am |
| 71 |
+index ba0847a..f2e0a84 100644 |
| 72 |
+--- a/icons/hicolor/Makefile.am |
| 73 |
++++ b/icons/hicolor/Makefile.am |
| 74 |
+@@ -24,7 +24,7 @@ if BOOL_HICOLOR_THEME |
| 75 |
+ gzip -c $< > $@ |
| 76 |
+ for size in $(icon_sizes) ; do \ |
| 77 |
+ if test "x$(RSVG)" != "x" ; then \ |
| 78 |
+- $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \ |
| 79 |
++ $(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \ |
| 80 |
+ else \ |
| 81 |
+ $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \ |
| 82 |
+ fi \ |
Archives