* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/files/, sci-chemistry/chemical-mime-data/
@ 2020-02-07 18:41 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2020-02-07 18:41 UTC (permalink / raw
To: gentoo-commits
commit: db812912bedf3a9abd4e24a9db087d3212638159
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 18:35:45 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 18:41:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db812912
sci-chemistry/chemical-mime-data: Drop problematic mime type
Bug: https://bugs.gentoo.org/701900
Closes: https://bugs.gentoo.org/707284
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../chemical-mime-data-0.1.94-r4.ebuild | 53 ++++++++++++++++++++++
...me-data-0.1.94-drop-turbomole-vibrational.patch | 20 ++++++++
2 files changed, 73 insertions(+)
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
new file mode 100644
index 00000000000..ad703d67872
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 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="mirror://sourceforge/${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.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 \
+ --htmldir=/usr/share/doc/${PF}/html
+}
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
new file mode 100644
index 00000000000..4c25b1a1834
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch
@@ -0,0 +1,20 @@
+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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/files/, sci-chemistry/chemical-mime-data/
@ 2020-03-20 22:52 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2020-03-20 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 6e55faca8e30c09560fd910ac2040759af689b54
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 22:52:38 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 22:52:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e55faca
sci-chemistry/chemical-mime-data: Fix rsvg-convert vs convert interaction
Thanks-to: Agostino Sarubbo
Closes: https://bugs.gentoo.org/713584
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../chemical-mime-data-0.1.94-r4.ebuild | 2 +-
...chemical-mime-data-0.1.94-rsvg-convert-r2.patch | 36 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
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
index 3abec36ba7d..02cd6e2bc87 100644
--- 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
@@ -33,7 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-turbomole.patch
"${FILESDIR}"/${P}-pigz.patch
"${FILESDIR}"/${P}-namespace-svg.patch
- "${FILESDIR}"/${P}-rsvg-convert.patch
+ "${FILESDIR}"/${P}-rsvg-convert-r2.patch
# https://github.com/dleidert/chemical-mime/issues/1
"${FILESDIR}"/${P}-drop-turbomole-vibrational.patch
)
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
new file mode 100644
index 00000000000..55039f8be07
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch
@@ -0,0 +1,36 @@
+--- 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 \
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-20 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-20 22:52 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/files/, sci-chemistry/chemical-mime-data/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-02-07 18:41 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox