diff options
Diffstat (limited to 'dev-cpp/glibmm')
-rw-r--r-- | dev-cpp/glibmm/Manifest | 3 | ||||
-rw-r--r-- | dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch | 34 | ||||
-rw-r--r-- | dev-cpp/glibmm/glibmm-2.52.1.ebuild | 6 |
3 files changed, 42 insertions, 1 deletions
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest index c67b9c62003c..3d9bf3ec6c0e 100644 --- a/dev-cpp/glibmm/Manifest +++ b/dev-cpp/glibmm/Manifest @@ -1,5 +1,6 @@ +AUX glibmm-fix-threads-gobject.patch 933 BLAKE2B 83d9e91db00b4de81615733e557281cdc191b2662aa016799b3e72bc3f4e738a997d3ca084a3d36e1212406cedfde5c7f6ca2975fbef3ea34d1ee3c8e941728a SHA512 b4fbfdafe7198ddf7c40513e1b490880a1fd2013fa221231d6605bde0b3757d6a8820c540f417281853939efdc7c5f13656e7f6b8c8302d318aa28e10dfac4a9 DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3 -EBUILD glibmm-2.52.1.ebuild 1637 BLAKE2B 435a139bc6042f957b6bed37c3901f1a0a45806e02eeaa2cfae1a1453105694c44a016980a3d7b12c3fab14ceabeeb14be256e57491e35ed7f28044ff78929c4 SHA512 a5a8d73b29c590a5691284b296b1ad05e9914f27c79db0ec6b7455880a17ae11c631f3a2fefaf5e54138fc468e5eb1fa7c795cd5540891b87aee207bf7423ce4 +EBUILD glibmm-2.52.1.ebuild 1755 BLAKE2B ddf4532a95e8302604b56f15b8f32395959a0e2afeda1af2d88579fc0d8bbd610e70a601e5a1a85ecb784f274170eb0d4cddd44576130ecd689166b0e2dd4c59 SHA512 656b51cec372a71babba2ff9d2e04d3e5813cf76b78536afe038b7de508f5801adafdf968d48aed3eea59efa7577c7020f37d6e7284f69f86b5d7eef2e0edcab MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 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 000000000000..2da4a5621992 --- /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 925442a83aeb..18a948873dbe 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 |