From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E47601382C5 for ; Tue, 22 May 2018 12:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3A7FE08DB; Tue, 22 May 2018 12:17:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89398E08DB for ; Tue, 22 May 2018 12:17:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0CAD335C7A for ; Tue, 22 May 2018 12:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F21D037 for ; Tue, 22 May 2018 12:17:41 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1526991423.85e6e0e04ae19670b071820947d941e521d1200e.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch dev-cpp/glibmm/glibmm-2.52.1.ebuild X-VCS-Directories: dev-cpp/glibmm/ dev-cpp/glibmm/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 85e6e0e04ae19670b071820947d941e521d1200e X-VCS-Branch: master Date: Tue, 22 May 2018 12:17:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 09bf2880-84e7-4200-b0ce-a8cd8ded3b2b X-Archives-Hash: 1db5e2c21e0f88038dc026be6a4f845b commit: 85e6e0e04ae19670b071820947d941e521d1200e Author: Jan Kundrát kde org> AuthorDate: Sat May 5 08:59:52 2018 +0000 Commit: Gilles Dartiguelongue gentoo 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 +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