* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/
@ 2016-09-17 17:44 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-09-17 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 2ea5b5d982ed56fcfa17d5c06c9f5a34fbaba727
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 14:25:59 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 17:43:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea5b5d9
sci-chemistry/gelemental: Allow for compiling with GCC 6
Gentoo-bug: 593994
Package-Manager: portage-2.3.0
.../gelemental/files/gelemental-1.2.0-fix-c++14.patch | 14 ++++++++++++++
sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
new file mode 100644
index 00000000..0965fe1
--- /dev/null
+++ b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
@@ -0,0 +1,14 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=593994
+
+--- a/src/dialogs.cc
++++ b/src/dialogs.cc
+@@ -255,7 +255,7 @@
+ const Gtk::TreePath& tpath, bool)
+ {
+ Gtk::TreeIter iter = store->get_iter (tpath);
+- return iter ? iter->get_value (cols.property) : false;
++ return iter ? iter->get_value (cols.property) : NULL;
+ }
+
+
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
index e85ddb0..43e2cb8 100644
--- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
+++ b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,6 +40,7 @@ PATCHES=(
"${WORKDIR}"/debian/patches/fix_zinc_german_translation.patch
"${WORKDIR}"/debian/patches/ftbfs_missing_limits.patch
"${WORKDIR}"/debian/patches/lp673285_link_in_about.patch
+ "${FILESDIR}"/${PN}-1.2.0-fix-c++14.patch
)
AUTOTOOLS_IN_SOURCE_BUILD=1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/
@ 2020-05-01 17:58 Matthias Maier
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Maier @ 2020-05-01 17:58 UTC (permalink / raw
To: gentoo-commits
commit: a5e7c232279af1aaafaced70cfb7a6d0b51b99db
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri May 1 17:51:39 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri May 1 17:57:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e7c232
sci-chemistry/gelemental: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-chemistry/gelemental/Manifest | 2 -
.../files/gelemental-1.2.0-doxygen.patch | 30 ----------
.../files/gelemental-1.2.0-fix-c++14.patch | 14 -----
.../gelemental/files/gelemental-1.2.0-gcc4.3.patch | 12 ----
.../files/gelemental-1.2.0-glib-2.32.patch | 46 ---------------
.../gelemental/gelemental-1.2.0-r1.ebuild | 65 ----------------------
6 files changed, 169 deletions(-)
diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
index 988825456b9..08477ae3060 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1,3 +1 @@
-DIST gelemental-1.2.0.tar.bz2 460757 BLAKE2B 53fd40cdc37909495cd9051c83418ace482fdf17930df2a94d8cb7f44a8eff2a5e7c37e54dac4e72810b1420d0bf2722eca47eb8c375fc05ecf26b753beb4e9d SHA512 2e6ef2c22b389cff69728b01e1eb397578974362356f5132098f29a9e01a64be228a24686738bd84ea575cee5aef068d9ab3d6c20233f995ccc5f1a1cb5d5673
DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
-DIST gelemental_1.2.0-8.debian.tar.gz 29877 BLAKE2B a19c853cd426e1abdf73b48a21d1d7c830a613dc5802b1478d699d21b3211060b150c25bd525414147d02972dd9ac0940468a2f873aad03f9b7c522e862f29a7 SHA512 83c236e3b91af304c96f28c0f12577821ee2f47c9e01fb1f3664228afb002dc19b1a71e6dcd6040d09ea991d131b147ea5b36283d8ead290d50014c15e69878c
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
deleted file mode 100644
index 8c904e84458..00000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Joachim Reichel <reichel@debian.org>
-Description: Skip installing (no longer generated) .dot and .gif files
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590382#15
-Bug-Debian: http://bugs.debian.org/590382
-Reviewed-By: Michael Banck <mbanck@debian.org>
-Forwarded: no
-Last-Update: 2010-09-22
-
---- a/docs/api/Makefile.am
-+++ b/docs/api/Makefile.am
-@@ -12,7 +12,7 @@
- install-api: $(srcdir)/html/index.html
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)/$(apidir)
-- @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
-+ @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
---- a/docs/api/Makefile.in
-+++ b/docs/api/Makefile.in
-@@ -393,7 +393,7 @@
- install-api: $(srcdir)/html/index.html
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)/$(apidir)
-- @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
-+ @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
deleted file mode 100644
index 0965fe15b43..00000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix building with C++14, which errors out due to bool -> T* conversions
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593994
-
---- a/src/dialogs.cc
-+++ b/src/dialogs.cc
-@@ -255,7 +255,7 @@
- const Gtk::TreePath& tpath, bool)
- {
- Gtk::TreeIter iter = store->get_iter (tpath);
-- return iter ? iter->get_value (cols.property) : false;
-+ return iter ? iter->get_value (cols.property) : NULL;
- }
-
-
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
deleted file mode 100644
index 8e69e98a543..00000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru gelemental-1.2.0/libelemental/value.tcc gelemental-1.2.0.new/libelemental/value.tcc
---- gelemental-1.2.0/libelemental/value.tcc 2007-09-25 01:10:16.000000000 -0400
-+++ gelemental-1.2.0.new/libelemental/value.tcc 2008-10-19 10:08:35.000000000 -0400
-@@ -26,6 +26,8 @@
- #error "value.tcc must be included from value.hh."
- #endif
-
-+#include <limits>
-+
- namespace Elemental {
-
-
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
deleted file mode 100644
index eab2ad1f194..00000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- libelemental/misc/extras.cc | 2 +-
- libelemental/misc/widgets.cc | 2 +-
- src/main.cc | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libelemental/misc/extras.cc b/libelemental/misc/extras.cc
-index a8e5720..c042604 100644
---- a/libelemental/misc/extras.cc
-+++ b/libelemental/misc/extras.cc
-@@ -21,7 +21,7 @@
-
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
-
- namespace misc {
-diff --git a/libelemental/misc/widgets.cc b/libelemental/misc/widgets.cc
-index 002310c..941d881 100644
---- a/libelemental/misc/widgets.cc
-+++ b/libelemental/misc/widgets.cc
-@@ -20,7 +20,7 @@
- #include "macros.hh"
- #include "widgets.hh"
-
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include <gtkmm/alignment.h>
- #include <gtkmm/image.h>
- #include <gtkmm/label.h>
-diff --git a/src/main.cc b/src/main.cc
-index 41cfe03..68bbb4c 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -26,8 +26,8 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
deleted file mode 100644
index 27588692bfb..00000000000
--- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils eutils
-
-DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
-HOMEPAGE="https://github.com/ginggs/gelemental/"
-SRC_URI="
- http://www.kdau.com/files/${P}.tar.bz2
- mirror://debian/pool/main/g/${PN}/${PN}_${PV}-8.debian.tar.gz"
-
-LICENSE="GPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- dev-cpp/gtkmm:2.4
- dev-cpp/glibmm:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext
- dev-util/intltool
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc4.3.patch
- "${FILESDIR}"/${P}-glib-2.32.patch
- "${FILESDIR}"/${P}-doxygen.patch
- "${WORKDIR}"/debian/patches/579183_adjust_size_middle_button.patch
- "${WORKDIR}"/debian/patches/604612_fix_menu_category.patch
- "${WORKDIR}"/debian/patches/604618_scrollable_properties_dialog.patch
- "${WORKDIR}"/debian/patches/656372_element_renames.patch
- "${WORKDIR}"/debian/patches/add_new_wave_theme.patch
- "${WORKDIR}"/debian/patches/czech_translation_559028.patch
- "${WORKDIR}"/debian/patches/fix_gtkmm_2.18.patch
- "${WORKDIR}"/debian/patches/fix_zinc_german_translation.patch
- "${WORKDIR}"/debian/patches/ftbfs_missing_limits.patch
- "${WORKDIR}"/debian/patches/lp673285_link_in_about.patch
- "${FILESDIR}"/${PN}-1.2.0-fix-c++14.patch
- )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- append-cxxflags -std=c++11 #566450
- local myeconfargs=( $(use_enable doc api-docs) )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/
@ 2022-04-24 13:28 Matthias Maier
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Maier @ 2022-04-24 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 18ea2dae1d58e86addb1a3e8960b4c501d5135e6
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 13:27:34 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 13:28:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ea2dae
sci-chemistry/gelemental: add 2.0.1
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-chemistry/gelemental/Manifest | 1 +
.../gelemental/files/gelemental-2.0.1-pango.patch | 18 ++++++++
sci-chemistry/gelemental/gelemental-2.0.1.ebuild | 48 ++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
index 08477ae30607..f10db30bd029 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1 +1,2 @@
DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
+DIST gelemental-2.0.1.tar.gz 779930 BLAKE2B 99d4da62c10201134868241403bc3472c5d0c1d80ae2319cf4a152655eb829e9e1c4cac35e01b89176658e99ab872c74b7415d8a453f5b6970c16c88295604b5 SHA512 e3f8e1757ff3e7843f2a860ffd41413e15a8382a3d4bd41d850b629857764b1e1508de8e825d257e5232617395d56bc5f517797301d9fe13849ceb0e48a68da2
diff --git a/sci-chemistry/gelemental/files/gelemental-2.0.1-pango.patch b/sci-chemistry/gelemental/files/gelemental-2.0.1-pango.patch
new file mode 100644
index 000000000000..cd4b7b4ef2de
--- /dev/null
+++ b/sci-chemistry/gelemental/files/gelemental-2.0.1-pango.patch
@@ -0,0 +1,18 @@
+Description: Fix build with Pango 1.50
+Applied-Upstream: https://github.com/ginggs/gelemental/commit/689d343086ca151ecc4c4a407c1650bc64c7c931
+Bug-Debian: https://bugs.debian.org/1005490
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2022-04-24
+
+--- a/libelemental/value.cc
++++ b/libelemental/value.cc
+@@ -25,7 +25,7 @@
+
+ #include <ext/stdio_filebuf.h>
+ #include <glibmm/utility.h>
+-#include <pango/pango-attributes.h>
++#include <pango/pango.h>
+
+ namespace Elemental {
+
+
diff --git a/sci-chemistry/gelemental/gelemental-2.0.1.ebuild b/sci-chemistry/gelemental/gelemental-2.0.1.ebuild
new file mode 100644
index 000000000000..d74be9286d1e
--- /dev/null
+++ b/sci-chemistry/gelemental/gelemental-2.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg
+
+DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
+HOMEPAGE="https://github.com/ginggs/gelemental/"
+SRC_URI="https://github.com/ginggs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ dev-cpp/gtkmm:2.4
+ dev-cpp/glibmm:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pango.patch
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++11 #566450
+
+ econf \
+ --disable-static \
+ $(use_enable doc api-docs)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-24 13:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-24 13:28 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2020-05-01 17:58 Matthias Maier
2016-09-17 17:44 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox