* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/
@ 2016-04-17 11:13 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-04-17 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 105f77fe60228e0c7c53af15a440c90e77f27336
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 10:51:00 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 11:13:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105f77fe
dev-cpp/glibmm: Drop old
Package-Manager: portage-2.2.28
dev-cpp/glibmm/Manifest | 2 -
.../glibmm/files/glibmm-2.46.2-use-noexcept.patch | 29 --------
.../glibmm/files/glibmm-2.46.2-use-noexcept2.patch | 15 ----
dev-cpp/glibmm/glibmm-2.46.1.ebuild | 77 --------------------
dev-cpp/glibmm/glibmm-2.46.2.ebuild | 81 ----------------------
5 files changed, 204 deletions(-)
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index b1c5987..8da7e51 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,4 +1,2 @@
DIST glibmm-2.44.0.tar.xz 6102664 SHA256 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8 SHA512 4a932b127ce0ed0798cef3555fdd1ca1632fc10720b74f9a39626989c216542807d76ae67ebc980049b65b1c163d236fc9875506ca2d80584c724394bbb8bfd7 WHIRLPOOL d1fad56af4487e661398ec3be006c528c5c6c1cba0181ad08725f14cb94bbbfe2f9c20870722b90ebca61a51e9959eee89b1f92a7f00f99bc3a573b123360197
-DIST glibmm-2.46.1.tar.xz 6470952 SHA256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa SHA512 4209264ec40e8894d3b4876f65af1458b6a15e22e3069058bf7f32854b5150a1890359cee878d29de94f609e423dc6f8467cffbbecf4a30d5810c890ad40b981 WHIRLPOOL 909a283d06e45e6d4077f0058eaa884acc268a93d97d80009f81cd91f3b8e73dd0016e7071797a1e9e95775752673fd6b47e295c58338052a0976054278964e7
-DIST glibmm-2.46.2.tar.xz 6471124 SHA256 7221a01a768c1cce2bb994cb6ebfe634246dba4788f910484d04e3b0d903a3c8 SHA512 f6748c6833c5733784ade3a28bcb72131bc5f1d291250094b51cf3676974f80f1d1616cb77c7b77b59fbdcd15cc692210caf27ecf1eaa5a3498042499a060ff1 WHIRLPOOL 9038724f9f9a63415126cbaf8946f31cea11d082c69d2c53bf24ec17f11e2266ca7a8ffa480f02a8a7706626cf5bb8fb4624615272a476b3cca0dec096d1be55
DIST glibmm-2.46.3.tar.xz 6470984 SHA256 c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf SHA512 24e112edd2bb6d2cf05a275d2ee781a4921f408dbb7fd317259c3303a993845a40f2e3e3fbaa819b88f718e25c30f02ad32695767eb6688a90389aea961b1a66 WHIRLPOOL e390fad02e5c254097b69302905a09d13c7abc6bcf3ca623b948de54004f601884397b7381c2b51d913879d2872a58d519249ba6af10dab3b0728dca013a6ad7
diff --git a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch
deleted file mode 100644
index 085441d..0000000
--- a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6c7c14875d0f1d249abcccb0033297c8d48619dc Mon Sep 17 00:00:00 2001
-From: Murray Cumming <murrayc@murrayc.com>
-Date: Sun, 29 Nov 2015 21:32:46 +0100
-Subject: Gio::Application: Destructor: Use noexcept in the implementation too.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug #758798 (Émeric MASCHINO)
----
- gio/src/application.ccg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/src/application.ccg b/gio/src/application.ccg
-index 9fb5866..c7488ac 100644
---- a/gio/src/application.ccg
-+++ b/gio/src/application.ccg
-@@ -278,7 +278,7 @@ Application::Application(const Glib::ustring& application_id, ApplicationFlags f
-
- }
-
--Application::~Application()
-+Application::~Application() noexcept
- {
- // Delete all OptionArgCallbackData instances that belong to this application.
- std::lock_guard<std::mutex> lock(option_arg_callback_data_mutex);
---
-cgit v0.11.2
-
diff --git a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch
deleted file mode 100644
index c6c38ff..0000000
--- a/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gio::Application: Destructor: Use noexcept in the implementation too.
-
-Bug #566426 (https://bugs.gentoo.org/show_bug.cgi?id=566426)
-
---- a/gio/giomm/application.cc 2015-09-22 11:13:25.000000000 +0200
-+++ b/gio/giomm/application.cc 2015-12-08 21:54:44.914338546 +0100
-@@ -284,7 +284,7 @@ Application::Application(const Glib::ust
-
- }
-
--Application::~Application()
-+Application::~Application() noexcept
- {
- // Delete all OptionArgCallbackData instances that belong to this application.
- Glib::Threads::Mutex::Lock lock(option_arg_callback_data_mutex);
diff --git a/dev-cpp/glibmm/glibmm-2.46.1.ebuild b/dev-cpp/glibmm/glibmm-2.46.1.ebuild
deleted file mode 100644
index b85daf6..0000000
--- a/dev-cpp/glibmm/glibmm-2.46.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND="
- >=dev-libs/libsigc++-2.6.0:2[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 1 failed"
- fi
-
- # don't build examples - we want to install example sources, not binaries
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- # Test fails with IPv6 but not v4, upstream bug #720073
-# sed -e 's:giomm_tls_client/test::' \
-# -i tests/Makefile.{am,in} || die
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable debug debug-refcounting) \
- $(multilib_native_use_enable doc documentation) \
- --enable-deprecated-api
-}
-
-multilib_src_test() {
- cd tests
- default
-
- for i in */test; do
- ${i} || die "Running tests failed at ${i}"
- done
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if ! use doc && ! use examples; then
- rm -fr "${ED}usr/share/doc/glibmm*"
- fi
-
- if use examples; then
- find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- dodoc -r examples
- fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.46.2.ebuild b/dev-cpp/glibmm/glibmm-2.46.2.ebuild
deleted file mode 100644
index 7cd6563..0000000
--- a/dev-cpp/glibmm/glibmm-2.46.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug examples test"
-
-RDEPEND="
- >=dev-libs/libsigc++-2.6.0:2[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
- # Gio::Application: Destructor: Use noexcept in the implementation too
- # (from 'master')
- epatch "${FILESDIR}"/${PN}-2.46.2-use-noexcept{,2}.patch
-
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 1 failed"
- fi
-
- # don't build examples - we want to install example sources, not binaries
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- # Test fails with IPv6 but not v4, upstream bug #720073
-# sed -e 's:giomm_tls_client/test::' \
-# -i tests/Makefile.{am,in} || die
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable debug debug-refcounting) \
- $(multilib_native_use_enable doc documentation) \
- --enable-deprecated-api
-}
-
-multilib_src_test() {
- cd tests
- default
-
- for i in */test; do
- ${i} || die "Running tests failed at ${i}"
- done
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if ! use doc && ! use examples; then
- rm -fr "${ED}usr/share/doc/glibmm*"
- fi
-
- if use examples; then
- find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- dodoc -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/
@ 2018-05-22 12:17 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2018-05-22 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 85e6e0e04ae19670b071820947d941e521d1200e
Author: Jan Kundrát <jkt <AT> kde <DOT> org>
AuthorDate: Sat May 5 08:59:52 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 22 12:17:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e6e0e0
dev-cpp/glibmm: Fix build with GCC 8
Patch taken from upstream and adapted to actually touch the pregenerated
file shipped with the release tarbal as well. That code appears to have
been always wrong, with no chance to build. This probably means that GCC
8 is suddenly being detected in some other way, making the code use that
include file which was previously apparently kept unused. But anyway,
upstream killed that include in a later release, so let's just let this
build and watch the eventual breakage.
Upstream says:
> Fixed in the glibmm-2-54 branch. No fix is necessary in the master
> branch. The threads.hg and threads.h files don't exist there.
Closes: https://bugs.gentoo.org/654776
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=791711
Closes: https://github.com/gentoo/gentoo/pull/8324
.../glibmm/files/glibmm-fix-threads-gobject.patch | 34 ++++++++++++++++++++++
dev-cpp/glibmm/glibmm-2.52.1.ebuild | 6 ++++
2 files changed, 40 insertions(+)
diff --git a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
new file mode 100644
index 00000000000..2da4a562199
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
@@ -0,0 +1,34 @@
+From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
+Date: Wed, 20 Dec 2017 20:00:32 +0100
+Subject: [PATCH] Glib::Threads::Private: Fix gobj()
+
+Bug 791711
+---
+ glib/src/threads.hg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/src/threads.hg b/glib/src/threads.hg
+index 86d7a17b..c82a6130 100644
+--- a/glib/src/threads.hg
++++ b/glib/src/threads.hg
+@@ -628,7 +628,7 @@ public:
+ */
+ inline void replace(T* data);
+
+- GPrivate* gobj() { return gobject_; }
++ GPrivate* gobj() { return &gobject_; }
+
+ private:
+ GPrivate gobject_;
+--- a/glib/glibmm/threads.h 2017-09-04 15:27:31.000000000 +0200
++++ b/glib/glibmm/threads.h 2018-05-05 10:53:44.339288554 +0200
+@@ -657,7 +657,7 @@
+ */
+ inline void replace(T* data);
+
+- GPrivate* gobj() { return gobject_; }
++ GPrivate* gobj() { return &gobject_; }
+
+ private:
+ GPrivate gobject_;
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
index 925442a83ae..18a948873db 100644
--- a/dev-cpp/glibmm/glibmm-2.52.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}
"
# dev-cpp/mm-common needed for eautoreconf
+PATCHES=(
+ # Fix build with GCC-8
+ # https://bugs.gentoo.org/654776
+ "${FILESDIR}"/${PN}-fix-threads-gobject.patch
+)
+
src_prepare() {
if ! use test; then
# don't waste time building tests
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/
@ 2019-01-03 9:34 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-01-03 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 6fb259ee7ff21a0bd94eb2c20716e62ae21580b7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 3 09:32:15 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 3 09:32:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb259ee
dev-cpp/glibmm: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-cpp/glibmm/Manifest | 3 -
.../glibmm/files/glibmm-fix-threads-gobject.patch | 34 -----------
dev-cpp/glibmm/glibmm-2.50.1.ebuild | 65 --------------------
dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild | 71 ----------------------
dev-cpp/glibmm/glibmm-2.54.1.ebuild | 71 ----------------------
5 files changed, 244 deletions(-)
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index c8bbf06fc8c..72791e8e4f4 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,2 @@
-DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
-DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
-DIST glibmm-2.54.1.tar.xz 6837384 BLAKE2B 98e4acb5b80786a27195bea43cc425a45219078ef839e97c60c9e3f52b3a0b3c928e19469d679529b5091d8ac1953d4f315ea75618c3fcc8f33d15f6565b5783 SHA512 94f2a4d6972684e25e38ff2e6bcfc1e9c5e4d096856d3419320c14166e27e26b1ad69be434337e9b70c23842989988113521aae7a800ef2f29e81f1ae6c25a13
DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60abae6506395b318be876d5ed680b1451920063f06d6d9655137d50482a9ba936caa0f6da127bb3855e43b4d877f SHA512 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08
DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
diff --git a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
deleted file mode 100644
index 2da4a562199..00000000000
--- a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Wed, 20 Dec 2017 20:00:32 +0100
-Subject: [PATCH] Glib::Threads::Private: Fix gobj()
-
-Bug 791711
----
- glib/src/threads.hg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glib/src/threads.hg b/glib/src/threads.hg
-index 86d7a17b..c82a6130 100644
---- a/glib/src/threads.hg
-+++ b/glib/src/threads.hg
-@@ -628,7 +628,7 @@ public:
- */
- inline void replace(T* data);
-
-- GPrivate* gobj() { return gobject_; }
-+ GPrivate* gobj() { return &gobject_; }
-
- private:
- GPrivate gobject_;
---- a/glib/glibmm/threads.h 2017-09-04 15:27:31.000000000 +0200
-+++ b/glib/glibmm/threads.h 2018-05-05 10:53:44.339288554 +0200
-@@ -657,7 +657,7 @@
- */
- inline void replace(T* data);
-
-- GPrivate* gobj() { return gobject_; }
-+ GPrivate* gobj() { return &gobject_; }
-
- private:
- GPrivate gobject_;
diff --git a/dev-cpp/glibmm/glibmm-2.50.1.ebuild b/dev-cpp/glibmm/glibmm-2.50.1.ebuild
deleted file mode 100644
index a111edbd892..00000000000
--- a/dev-cpp/glibmm/glibmm-2.50.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
- >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 1 failed"
- fi
-
- # don't build examples - we want to install example sources, not binaries
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable debug debug-refcounting) \
- $(multilib_native_use_enable doc documentation) \
- --enable-deprecated-api
-}
-
-multilib_src_test() {
- cd tests
- default
-
- for i in */test; do
- ${i} || die "Running tests failed at ${i}"
- done
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
- dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild
deleted file mode 100644
index 2a4e3739f62..00000000000
--- a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
- >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-PATCHES=(
- # Fix build with GCC-8
- # https://bugs.gentoo.org/654776
- "${FILESDIR}"/${PN}-fix-threads-gobject.patch
-)
-
-src_prepare() {
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 1 failed"
- fi
-
- # don't build examples - we want to install example sources, not binaries
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable debug debug-refcounting) \
- $(multilib_native_use_enable doc documentation) \
- --enable-deprecated-api
-}
-
-multilib_src_test() {
- cd tests
- default
-
- for i in */test; do
- ${i} || die "Running tests failed at ${i}"
- done
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
- dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.54.1.ebuild b/dev-cpp/glibmm/glibmm-2.54.1.ebuild
deleted file mode 100644
index 04705cc0aa2..00000000000
--- a/dev-cpp/glibmm/glibmm-2.54.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
- >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-PATCHES=(
- # Fix build with GCC-8
- # https://bugs.gentoo.org/654776
- "${FILESDIR}"/${PN}-fix-threads-gobject.patch
-)
-
-src_prepare() {
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 1 failed"
- fi
-
- # don't build examples - we want to install example sources, not binaries
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- $(use_enable debug debug-refcounting) \
- $(multilib_native_use_enable doc documentation) \
- --enable-deprecated-api
-}
-
-multilib_src_test() {
- cd tests
- default
-
- for i in */test; do
- ${i} || die "Running tests failed at ${i}"
- done
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
- dodoc -r examples
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/
@ 2024-12-12 5:40 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-12-12 5:40 UTC (permalink / raw
To: gentoo-commits
commit: b8cca5206e08045a5aae0dd807962abcb3c28533
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Fri Nov 29 07:51:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 05:39:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cca520
dev-cpp/glibmm: remove method that is not used any where
Closes: https://bugs.gentoo.org/945375
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39525
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../glibmm/files/glibmm-2.78.1-libcxx-fix.patch | 52 ++++++++++++++++++++++
dev-cpp/glibmm/glibmm-2.78.1.ebuild | 2 +
2 files changed, 54 insertions(+)
diff --git a/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch b/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch
new file mode 100644
index 000000000000..0b7cc7ee28d4
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch
@@ -0,0 +1,52 @@
+# This patch is fetched from the upstream and dedicated to making compiling with clang-19 possible
+# Bug related https://bugs.gentoo.org/945375
+# The patch is added by Denis Pronin <dannftk@yandex.ru>
+
+From 72c5ad98d858fa4fc0183a5ec1a61bb48ef5bd95 Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
+Date: Fri, 22 Mar 2024 10:32:45 +0100
+Subject: [PATCH] Gio::content_type_guess(): Remove most of an unneccesary
+ overload
+
+clang 19.0.0 does not like the overload that takes a
+const std::basic_string<guchar>&. This overload should have been removed
+16 years ago by commit 84135b93a20e6c9fe652849959d3ff90474c99bb.
+It can't be removed completely now, because that would break ABI.
+Remove as much as possible.
+Fixes #118
+---
+ gio/giomm/contenttype.cc | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/gio/giomm/contenttype.cc b/gio/giomm/contenttype.cc
+index abe67337..8eb1bd71 100644
+--- a/gio/giomm/contenttype.cc
++++ b/gio/giomm/contenttype.cc
+@@ -84,15 +84,18 @@ content_type_from_mime_type(const Glib::ustring& mime_type)
+ g_content_type_from_mime_type(mime_type.c_str()));
+ }
+
++//TODO: When we can break ABI, remove this content_type_guess() overload.
++// Commit https://gitlab.gnome.org/GNOME/glibmm/-/commit/84135b93a20e6c9fe652849959d3ff90474c99bb
++// removed it from contenttype.h, but not from contenttype.cc.
++// For the time being, it's replaced by a function that does almost nothing.
++// clang 19.0.0 does not like a complete version.
++// See issue https://gitlab.gnome.org/GNOME/glibmm/-/issues/118
+ Glib::ustring
+ content_type_guess(
+- const std::string& filename, const std::basic_string<guchar>& data, bool& result_uncertain)
++ const std::string& /*filename*/, const std::basic_string<guchar>& /*data*/, bool& result_uncertain)
+ {
+- gboolean c_result_uncertain = FALSE;
+- const gchar* c_filename = filename.empty() ? nullptr : filename.c_str();
+- gchar* cresult = g_content_type_guess(c_filename, data.c_str(), data.size(), &c_result_uncertain);
+- result_uncertain = c_result_uncertain;
+- return Glib::convert_return_gchar_ptr_to_ustring(cresult);
++ result_uncertain = true;
++ return Glib::ustring();
+ }
+
+ Glib::ustring
+--
+2.45.2
+
diff --git a/dev-cpp/glibmm/glibmm-2.78.1.ebuild b/dev-cpp/glibmm/glibmm-2.78.1.ebuild
index a8e3d22a6aa2..b5b3c5c985a0 100644
--- a/dev-cpp/glibmm/glibmm-2.78.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.78.1.ebuild
@@ -29,6 +29,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}"/${P}-libcxx-fix.patch )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-12 5:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-17 11:13 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-05-22 12:17 Gilles Dartiguelongue
2019-01-03 9:34 Mart Raudsepp
2024-12-12 5:40 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox