summaryrefslogtreecommitdiff
path: root/dev-cpp/glibmm/files
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-12-12 12:27:47 +0100
committerPacho Ramos <pacho@gentoo.org>2015-12-12 15:27:44 +0100
commit38623bac6b069dbac89671121f04dbb51150f1d2 (patch)
tree6aef489944ec70b713e8f5e3f73b4767cf61d93e /dev-cpp/glibmm/files
parent63798b78efcd7452bda55ee325fdfc615b85d773 (diff)
downloadgentoo-38623bac6b069dbac89671121f04dbb51150f1d2.tar.gz
gentoo-38623bac6b069dbac89671121f04dbb51150f1d2.tar.bz2
gentoo-38623bac6b069dbac89671121f04dbb51150f1d2.zip
dev-cpp/glibmm: Version bump, fix build failure with gcc-4.7 (bug #566426 by Émeric Maschino)
Package-Manager: portage-2.2.24
Diffstat (limited to 'dev-cpp/glibmm/files')
-rw-r--r--dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch29
-rw-r--r--dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch15
2 files changed, 44 insertions, 0 deletions
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
new file mode 100644
index 000000000000..085441d96679
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..c6c38ff5a568
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-2.46.2-use-noexcept2.patch
@@ -0,0 +1,15 @@
+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);