* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
@ 2021-05-30 20:14 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2021-05-30 20:14 UTC (permalink / raw
To: gentoo-commits
commit: e5248c87f3cf8e8f09289374da3ef1804c39e7c5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 20:11:27 2021 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 30 20:11:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5248c87
sci-chemistry/gnome-chemistry-utils: Drop old
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../gnome-chemistry-utils-0.14.17-gnumeric.patch | 47 ----------------
.../gnome-chemistry-utils-0.14.17.ebuild | 62 ----------------------
2 files changed, 109 deletions(-)
diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch
deleted file mode 100644
index 826d9b056df..00000000000
--- a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: gchemutils/configure.ac
-===================================================================
---- gchemutils/configure.ac (revision 2072)
-+++ gchemutils/configure.ac (revision 2073)
-@@ -352,7 +352,7 @@
- libspreadsheet=libspreadsheet-1.12
- fi
-
--PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.11.6], [build_gnumeric_plugin=yes],
-+PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.12.42], [build_gnumeric_plugin=yes],
- [build_gnumeric_plugin=no])
- dnl --without is not handled
-
-Index: gchemutils/gnumeric/functions.cc
-===================================================================
---- gchemutils/gnumeric/functions.cc (revision 2072)
-+++ gchemutils/gnumeric/functions.cc (revision 2073)
-@@ -195,23 +195,23 @@
- const GnmFuncDescriptor Chemistry_functions[] = {
-
- { N_("molarmass"), "s",
-- help_molarmass, gnumeric_molarmass, NULL, NULL, NULL,
-+ help_molarmass, gnumeric_molarmass, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
- { N_("monoisotopicmass"), "s",
-- help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, NULL, NULL,
-+ help_monoisotopicmass, gnumeric_monoisotopicmass, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
- { N_("chemcomposition"), "ss",
-- help_chemcomposition, gnumeric_chemcomposition, NULL, NULL, NULL,
-+ help_chemcomposition, gnumeric_chemcomposition, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
- { N_("elementnumber"), "s",
-- help_elementnumber, gnumeric_elementnumber, NULL, NULL, NULL,
-+ help_elementnumber, gnumeric_elementnumber, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
- { N_("elementsymbol"), "f",
-- help_elementsymbol, gnumeric_elementsymbol, NULL, NULL, NULL,
-+ help_elementsymbol, gnumeric_elementsymbol, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
-
-
-- {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-+ {NULL, NULL, NULL, NULL, NULL,
- GNM_FUNC_IS_PLACEHOLDER, GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}
- };
-
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild
deleted file mode 100644
index 40a653132cd..00000000000
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg
-
-DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
-HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(ver_cut 1-2)/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-IUSE="gnumeric"
-
-RDEPEND="
- >=app-text/gnome-doc-utils-0.3.2
- >=dev-libs/glib-2.36.0:2
- >=dev-libs/libxml2-2.4.16:2
- >=gnome-extra/libgsf-1.14.9
- >=sci-chemistry/bodr-5
- >=sci-chemistry/chemical-mime-data-0.1.94
- >=sci-chemistry/openbabel-2.3.0:0
- >=x11-libs/cairo-1.6.0
- >=x11-libs/gdk-pixbuf-2.22.0
- >=x11-libs/goffice-0.10.12
- x11-libs/gtk+:3
- >=x11-libs/libX11-1.0.0
- gnumeric? ( >=app-office/gnumeric-1.12.42 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-doc/doxygen
- gnome-base/gnome-common
- virtual/pkgconfig
-"
-
-src_prepare() {
- xdg_src_prepare
-
- # From Debian
- eapply "${FILESDIR}/${P}-gnumeric.patch"
- eautoreconf
-}
-
-src_configure() {
- # lasem is not in the tree
- econf \
- --without-lasem \
- --disable-mozilla-plugin \
- --disable-scrollkeeper \
- --disable-update-databases
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
- rm -rf "${ED}"/usr/share/mimelnk/ || die
-
- find "${D}" -name '*.la' -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
@ 2025-05-03 9:13 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2025-05-03 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 3030bc7580acbb82a64e1dd491ebd35b812b6f76
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Apr 29 15:57:42 2025 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 3 08:44:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3030bc75
sci-chemistry/gnome-chemistry-utils: fix build adding BDEPS
> * Running 'intltoolize --automake --copy --force' ... [ !! ]
>
> * Failed running 'intltoolize'!
> *
> make[3]: Entering directory '/var/tmp/portage/sci-chemistry/gnome-chemistry-
> utils-0.14.17_p6-r2/work/gnome-chemistry-utils-0.14.17/libs/gcugtk'
> prefix=gcu_ --header marshalers.list >marshalers.h
> /bin/sh: line 1: --header: command not found
> make[3]: [Makefile:994: marshalers.h] Error 127 (ignored)
BDEP (above errors) :
add dev-util/intltool
add dev-util/glib-utils (GLIB_GENMARSHAL)
update subslot operator :=
R/DEP :
add x11-libs/pango
add media-libs/libglvnd
virtual/glu is only required on build-time
set pkg-config without native-symlinks
skip tests for manpages, useless and it causes failures
set HTTP+S
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41867
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../gnome-chemistry-utils-disable_tests_man.patch | 26 +++++++++++++++++++
... => gnome-chemistry-utils-0.14.17_p6-r3.ebuild} | 30 ++++++++++++++--------
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-disable_tests_man.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-disable_tests_man.patch
new file mode 100644
index 000000000000..3cf549c4bfe0
--- /dev/null
+++ b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-disable_tests_man.patch
@@ -0,0 +1,26 @@
+Disable tests for manpages, useless and it causes failures
+diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
+index eb8e3f5..fcddc85 100644
+--- a/docs/man/Makefile.am
++++ b/docs/man/Makefile.am
+@@ -40,20 +40,3 @@ if HAVE_XSLTPROC
+ else
+ echo "***** Cannot update the XML sources without `xsltproc'."
+ endif
+-
+-
+-check-local:
+- @echo "***** Correct any errors before making a distribution."
+-if HAVE_XMLLINT
+- $(XMLLINT) $(XMLLINT_FLAGS) $(gcu_man_src)
+-else
+- @echo "***** Cannot check the XML sources without `xmllint'."
+-endif
+-if HAVE_MAN
+- @for man in $(man_MANS) ; do \
+- LANG=C MANWIDTH=80 $(MAN) $(srcdir)/$${man} > /dev/null ; \
+- done
+-else
+- @echo "***** Cannot check the manpages without `man'."
+-endif
+-
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r2.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r3.ebuild
similarity index 68%
rename from sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r2.ebuild
rename to sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r3.ebuild
index 591709b1fa59..f85a192059e9 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r2.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit autotools flag-o-matic xdg
+inherit autotools flag-o-matic toolchain-funcs xdg
DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
-HOMEPAGE="http://gchemutils.nongnu.org/"
+HOMEPAGE="https://gchemutils.nongnu.org/"
SRC_URI="
- http://download.savannah.gnu.org/releases/gchemutils/$(ver_cut 1-2)/${P/_p*}.tar.xz
+ https://download.savannah.gnu.org/releases/gchemutils/$(ver_cut 1-2)/${P/_p*}.tar.xz
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
"
S="${WORKDIR}/${P/_p*}"
@@ -20,22 +20,26 @@ IUSE="gnumeric"
RDEPEND="
>=dev-libs/glib-2.36.0:2
>=dev-libs/libxml2-2.4.16:2
- >=gnome-extra/libgsf-1.14.9
+ >=gnome-extra/libgsf-1.14.9:=
+ media-libs/libglvnd[X]
>=sci-chemistry/bodr-5
>=sci-chemistry/chemical-mime-data-0.1.94
>=sci-chemistry/openbabel-2.3.0:0=
>=x11-libs/cairo-1.6.0
- >=x11-libs/gdk-pixbuf-2.22.0
- >=x11-libs/goffice-0.10.12
+ >=x11-libs/gdk-pixbuf-2.22.0:2
+ >=x11-libs/goffice-0.10.12:0.10
x11-libs/gtk+:3[X]
>=x11-libs/libX11-1.0.0
- virtual/glu
- gnumeric? ( >=app-office/gnumeric-1.12.42:= )
+ x11-libs/pango
+ gnumeric? ( >=app-office/gnumeric-1.12.42 )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/glu"
BDEPEND="
app-text/doxygen
app-text/yelp-tools
+ dev-util/glib-utils
+ dev-util/intltool
virtual/pkgconfig
"
@@ -54,6 +58,12 @@ src_prepare() {
# From Fedora
eapply "${FILESDIR}"/${PN}-fix_pointer_types.patch
+ # Disable tests for manpages
+ eapply "${FILESDIR}"/${PN}-disable_tests_man.patch
+
+ sed -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
+ -i configure.ac || die
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
@ 2025-09-29 12:22 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2025-09-29 12:22 UTC (permalink / raw
To: gentoo-commits
commit: d761e927eb76c17696a8aec890f66284d875a239
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Sep 29 08:49:48 2025 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Sep 29 12:21:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d761e927
sci-chemistry/gnome-chemistry-utils: fix underlinking w/ slibtool
Closes: https://bugs.gentoo.org/913669
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43980
Closes: https://github.com/gentoo/gentoo/pull/43980
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../gnome-chemistry-utils-fix_underlinking.patch | 30 ++++++++++++++++++++++
.../gnome-chemistry-utils-0.14.17_p6-r4.ebuild | 3 +++
2 files changed, 33 insertions(+)
diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-fix_underlinking.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-fix_underlinking.patch
new file mode 100644
index 000000000000..9b80a5590827
--- /dev/null
+++ b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-fix_underlinking.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/913669
+fix underlinking with slibtool
+--- a/plugins/loaders/cdx/Makefile.am
++++ b/plugins/loaders/cdx/Makefile.am
+@@ -18,8 +18,9 @@ gcu_loader_cdx_LTLIBRARIES = cdx.la
+ cdx_la_LDFLAGS = -module -avoid-version -no-undefined
+
+ cdx_la_LIBADD = \
+- $(gsf_LIBS) \
+- $(top_builddir)/libs/gcu/libgcu-@GCU_API_VER@.la
++ $(gtk_LIBS) $(gsf_LIBS) \
++ $(top_builddir)/libs/gcu/libgcu-@GCU_API_VER@.la \
++ $(top_builddir)/libs/gcp/libgcp-@GCU_API_VER@.la
+
+ cdx_la_SOURCES = \
+ cdx.cc
+--- a/plugins/loaders/cdxml/Makefile.am
++++ b/plugins/loaders/cdxml/Makefile.am
+@@ -17,8 +17,9 @@ gcu_loader_cdxml_LTLIBRARIES = cdxml.la
+ cdxml_la_LDFLAGS = -module -avoid-version -no-undefined
+
+ cdxml_la_LIBADD = \
+- $(gsf_LIBS) $(goffice_LIBS) \
+- $(top_builddir)/libs/gcu/libgcu-@GCU_API_VER@.la
++ $(gtk_LIBS) $(gsf_LIBS) $(goffice_LIBS) \
++ $(top_builddir)/libs/gcu/libgcu-@GCU_API_VER@.la \
++ $(top_builddir)/libs/gcp/libgcp-@GCU_API_VER@.la
+
+ cdxml_la_SOURCES = \
+ cdxml.cc
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r4.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r4.ebuild
index bf12f2c92679..54c80b7ee569 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r4.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p6-r4.ebuild
@@ -61,6 +61,9 @@ src_prepare() {
# Disable tests for manpages
eapply "${FILESDIR}"/${PN}-disable_tests_man.patch
+ # bug 913669 fix underlinking with slibtool
+ eapply "${FILESDIR}"/${PN}-fix_underlinking.patch
+
sed -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
-i configure.ac || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-29 12:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-30 20:14 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2025-05-03 9:13 Pacho Ramos
2025-09-29 12:22 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox