* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/, sci-chemistry/chemical-mime-data/files/
@ 2017-02-12 19:08 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2017-02-12 19:08 UTC (permalink / raw
To: gentoo-commits
commit: e9b522a3b065fa8ce8e376a918ba257141b862ab
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 18:55:54 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 19:08:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b522a3
sci-chemistry/chemical-mime-data: Add back support for rsvg from gnome-base/librsvg
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../chemical-mime-data-0.1.94-r3.ebuild | 8 ++++--
.../chemical-mime-data-0.1.94-rsvg-convert.patch | 30 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
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
index 5b8fc00d5b..a120487084 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,13 +22,17 @@ DEPEND="${RDEPEND}
dev-util/intltool
dev-util/desktop-file-utils
dev-libs/libxslt
- media-gfx/imagemagick[xml,png,svg]
+ || (
+ gnome-base/librsvg[tools]
+ media-gfx/imagemagick[xml,png,svg]
+ )
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-turbomole.patch
"${FILESDIR}"/${P}-pigz.patch
"${FILESDIR}"/${P}-namespace-svg.patch
+ "${FILESDIR}"/${P}-rsvg-convert.patch
)
src_prepare() {
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
new file mode 100644
index 0000000000..8a92e19e15
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
@@ -0,0 +1,30 @@
+ configure.ac | 2 +-
+ icons/hicolor/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6f87a94..a503da4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,7 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
+ [RSVG],
+ [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
+ )
+- AC_PATH_PROG([RSVG], [rsvg], [no])
++ AC_PATH_PROG([RSVG], [rsvg-convert], [no])
+ AC_SUBST([RSVG])
+ fi
+
+diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
+index ba0847a..f2e0a84 100644
+--- a/icons/hicolor/Makefile.am
++++ b/icons/hicolor/Makefile.am
+@@ -24,7 +24,7 @@ if BOOL_HICOLOR_THEME
+ gzip -c $< > $@
+ for size in $(icon_sizes) ; do \
+ if test "x$(RSVG)" != "x" ; then \
+- $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
++ $(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
+ else \
+ $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
+ fi \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/, sci-chemistry/chemical-mime-data/files/
@ 2024-09-25 9:33 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2024-09-25 9:33 UTC (permalink / raw
To: gentoo-commits
commit: d391532aefd1d43a8a9cd1cd1d13abf32f117511
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Tue Sep 24 17:53:12 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 09:32:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d391532a
sci-chemistry/chemical-mime-data: drop 0.1.94-r4 and it's patches
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37842
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-chemistry/chemical-mime-data/Manifest | 1 -
.../chemical-mime-data-0.1.94-r4.ebuild | 52 --------------------
...me-data-0.1.94-drop-turbomole-vibrational.patch | 20 --------
.../chemical-mime-data-0.1.94-namespace-svg.patch | 16 ------
.../files/chemical-mime-data-0.1.94-pigz.patch | 16 ------
...chemical-mime-data-0.1.94-rsvg-convert-r2.patch | 36 --------------
.../chemical-mime-data-0.1.94-turbomole.patch | 57 ----------------------
7 files changed, 198 deletions(-)
diff --git a/sci-chemistry/chemical-mime-data/Manifest b/sci-chemistry/chemical-mime-data/Manifest
index c87c4dfa11bc..db84314bdfd1 100644
--- a/sci-chemistry/chemical-mime-data/Manifest
+++ b/sci-chemistry/chemical-mime-data/Manifest
@@ -1,2 +1 @@
-DIST chemical-mime-data-0.1.94.tar.bz2 146077 BLAKE2B 9996c240446dc9571b6b4afbcdc6cf16a08e11314da9f785490b1b20933b6d18a333132492e30315c08f4441c048ec593a111815253050cfb5ab562aadb784f1 SHA512 7f3d967149f27ab1de53c948dc055959e661e1be9d778e3d56d06bea95769da7770ab5fb66afab6607747ef91ffb1dbbcf921e5f06e3303351781968594b5f00
DIST chemical-mime-data-0.1.95_pre20171122.tar.gz 84515 BLAKE2B 42f76b44408c04e5a254c17502ea2c297727bb58fa3e86b8bca7f0c4c056ae7400b31f06b7d0c64b0712e97ab8a1f82549f44a3677720cd37a301ba99adb3d7a SHA512 a031e7a5bc31a74adcd8e5d827de71b6e0eafdceba16cf6f7407aa0266a9a082b0011963b315d2369f39abf45c4b41cedafccddbc2171673bf96ccbea51a4790
diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
deleted file mode 100644
index e11f018ac371..000000000000
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg
-
-DESCRIPTION="A collection of data files to add support for chemical MIME types"
-HOMEPAGE="https://github.com/dleidert/chemical-mime"
-SRC_URI="https://downloads.sourceforge.net/${PN/-data/}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-RDEPEND="
- x11-misc/shared-mime-info
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/intltool
- dev-util/desktop-file-utils
- dev-libs/libxslt
- || (
- gnome-base/librsvg
- media-gfx/imagemagick[xml,png,svg]
- )
- media-gfx/imagemagick[png]
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-turbomole.patch
- "${FILESDIR}"/${P}-pigz.patch
- "${FILESDIR}"/${P}-namespace-svg.patch
- "${FILESDIR}"/${P}-rsvg-convert-r2.patch
- # https://github.com/dleidert/chemical-mime/issues/1
- "${FILESDIR}"/${P}-drop-turbomole-vibrational.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-update-database \
- --without-gnome-mime \
- --without-pixmaps \
- --without-kde-mime
-}
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch
deleted file mode 100644
index 4c25b1a18343..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole_vibration chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
---- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole_vibration 2020-01-29 17:32:45.000000000 +0100
-+++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in 2020-01-29 17:32:45.000000000 +0100
-@@ -1401,16 +1401,6 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-vibrational" support="yes">
-- <_comment>Turbomole Vibrational Data File</_comment>
-- <glob pattern="???"/>
-- <sub-class-of type="text/plain"/>
-- <icon kde="qc"/>
-- <supported-by>
-- <application name="viewmol"/>
-- </supported-by>
-- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
-- </mime-type>
-
- <mime-type type="chemical/x-vamas-iso14976" cm:support="no">
- <_comment>VAMAS document</_comment>
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-namespace-svg.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-namespace-svg.patch
deleted file mode 100644
index 9860261af403..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-namespace-svg.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- icons/hicolor/gnome-mime-chemical.svg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/icons/hicolor/gnome-mime-chemical.svg b/icons/hicolor/gnome-mime-chemical.svg
-index 1a8d428..804514c 100644
---- a/icons/hicolor/gnome-mime-chemical.svg
-+++ b/icons/hicolor/gnome-mime-chemical.svg
-@@ -5,7 +5,7 @@
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
- ]>
--<svg xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-+<svg xmlns:svg="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- width="128" height="128" viewBox="0 0 128 128" overflow="visible" enable-background="new 0 0 128 128" xml:space="preserve">
- <g id="Layer_1">
- <g>
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-pigz.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-pigz.patch
deleted file mode 100644
index 8b5ccfbc3fd9..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-pigz.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 96e03ab..ba0847a 100644
---- a/icons/hicolor/Makefile.am
-+++ b/icons/hicolor/Makefile.am
-@@ -21,7 +21,7 @@ icon_sizes = 16 22 24 32 36 48 64 72 96 128 192
- if BOOL_HICOLOR_THEME
-
- .svg.svgz:
-- gzip $< -c > $@
-+ gzip -c $< > $@
- for size in $(icon_sizes) ; do \
- if test "x$(RSVG)" != "x" ; then \
- $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch
deleted file mode 100644
index 55039f8be07e..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/configure.ac.old 2020-03-20 23:32:05.866604992 +0100
-+++ b/configure.ac 2020-03-20 23:32:30.866022834 +0100
-@@ -97,14 +97,12 @@
- AC_PATH_PROG([CONVERT], [convert], [no])
- AC_SUBST([CONVERT])
-
--if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
-- AC_ARG_VAR(
-- [RSVG],
-- [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
-- )
-- AC_PATH_PROG([RSVG], [rsvg], [no])
-- AC_SUBST([RSVG])
--fi
-+AC_ARG_VAR(
-+ [RSVG],
-+ [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
-+)
-+AC_PATH_PROG([RSVG], [rsvg-convert], [no])
-+AC_SUBST([RSVG])
-
- if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then
- AC_MSG_ERROR([Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them.])
---- a/icons/hicolor/Makefile.am.old 2020-03-20 23:32:54.292414381 +0100
-+++ b/icons/hicolor/Makefile.am 2020-03-20 23:33:40.052179227 +0100
-@@ -23,8 +23,8 @@
- .svg.svgz:
- gzip $< -c > $@
- for size in $(icon_sizes) ; do \
-- if test "x$(RSVG)" != "x" ; then \
-- $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
-+ if test "x$(RSVG)" != "xno" ; then \
-+ $(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
- else \
- $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
- fi \
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-turbomole.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-turbomole.patch
deleted file mode 100644
index 852d6b0605be..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-turbomole.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
---- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole 2009-08-10 09:37:06.000000000 +0200
-+++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in 2009-08-10 09:40:57.000000000 +0200
-@@ -1290,7 +1290,7 @@
- <specification url="http://ca.expasy.org/sprot/userman.html"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-basis" support="no">
-+ <mime-type type="chemical/x-turbomole-basis" support="yes">
- <_comment>Turbomole Basis Set File</_comment>
- <glob pattern="basis"/>
- <sub-class-of type="text/plain"/>
-@@ -1304,7 +1304,7 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-control" support="no">
-+ <mime-type type="chemical/x-turbomole-control" support="yes">
- <_comment>Turbomole Control File</_comment>
- <glob pattern="control"/>
- <sub-class-of type="text/plain"/>
-@@ -1320,7 +1320,7 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/node230.html"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-coord" support="no">
-+ <mime-type type="chemical/x-turbomole-coord" support="yes">
- <_comment>Turbomole Coordinate File</_comment>
- <glob pattern="coord"/>
- <glob pattern="*.tmol"/>
-@@ -1335,7 +1335,7 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-grad" support="no">
-+ <mime-type type="chemical/x-turbomole-grad" support="yes">
- <_comment>Turbomole Gradient File</_comment>
- <glob pattern="gradient"/>
- <sub-class-of type="text/plain"/>
-@@ -1383,7 +1383,7 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-scfmo" support="no">
-+ <mime-type type="chemical/x-turbomole-scfmo" support="yes">
- <_comment>Turbomole SCF Molecular Orbital File</_comment>
- <acronym>MO</acronym>
- <expanded-acronym>Molecular Orbital</expanded-acronym>
-@@ -1401,7 +1401,7 @@
- <specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
- </mime-type>
-
-- <mime-type type="chemical/x-turbomole-vibrational" support="no">
-+ <mime-type type="chemical/x-turbomole-vibrational" support="yes">
- <_comment>Turbomole Vibrational Data File</_comment>
- <glob pattern="???"/>
- <sub-class-of type="text/plain"/>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-25 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-12 19:08 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/, sci-chemistry/chemical-mime-data/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2024-09-25 9:33 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox