gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-07 05:57:07 -08:00
Code Issues Projects Releases Wiki Activity

dev-cpp/gtkmm: Fix compilation with gcc-4.7 (#567882 by Émeric Maschino)

Browse Source 
Package-Manager: portage-2.2.26
This commit is contained in:
Pacho Ramos
2016-01-16 11:56:42 +01:00
parent 5474fa5c70
commit 9c9c81dec0
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch
+44
View File
@@ -0,0 +1,44 @@
--- a/gtk/src/menushell.ccg 2015-07-16 21:00:55.000000000 +0200
+++ b/gtk/src/menushell.ccg 2015-12-09 01:03:45.127863899 +0100
@@ -43,7 +43,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
{}
// TODO: Why do we need a custom dtor?
-MenuShell::~MenuShell()
+MenuShell::~MenuShell() noexcept
{}
void MenuShell::accelerate(Window& window)
--- a/gtk/gtkmm/menushell.cc 2015-09-22 11:41:47.000000000 +0200
+++ b/gtk/gtkmm/menushell.cc 2015-12-09 01:06:27.641701385 +0100
@@ -54,7 +54,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
{}
// TODO: Why do we need a custom dtor?
-MenuShell::~MenuShell()
+MenuShell::~MenuShell() noexcept
{}
void MenuShell::accelerate(Window& window)
--- a/gtk/src/widget.ccg 2015-07-16 21:00:55.000000000 +0200
+++ b/gtk/src/widget.ccg 2015-12-09 07:36:47.328538621 +0100
@@ -413,7 +413,7 @@ void Widget_Class::get_preferred_width_f
(*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
}
-Widget::~Widget()
+Widget::~Widget() noexcept
{}
void Widget::reparent(Widget& new_parent)
--- a/gtk/gtkmm/widget.cc 2015-09-22 11:44:13.000000000 +0200
+++ b/gtk/gtkmm/widget.cc 2015-12-09 07:39:29.318214641 +0100
@@ -423,7 +423,7 @@ void Widget_Class::get_preferred_width_f
(*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
}
-Widget::~Widget()
+Widget::~Widget() noexcept
{}
void Widget::reparent(Widget& new_parent)
dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+4 -1
View File
@@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
inherit gnome2 multilib-minimal
inherit eutils gnome2 multilib-minimal
DESCRIPTION="C++ interface for GTK+"
HOMEPAGE="http://www.gtkmm.org"
@@ -37,6 +37,9 @@ DEPEND="${RDEPEND}
# eautoreconf needs mm-common
src_prepare() {
# Fix building with gcc-4.7, fixed in next version, bug #567882
epatch "${FILESDIR}"/${P}-gcc47.patch
if ! use test; then
# don't waste time building tests
sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \