From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D67FA13888F for ; Tue, 20 Oct 2015 01:36:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC99A21C001; Tue, 20 Oct 2015 01:36:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F3F721C001 for ; Tue, 20 Oct 2015 01:36:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 410D23403C1 for ; Tue, 20 Oct 2015 01:36:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B661362 for ; Tue, 20 Oct 2015 01:36:10 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1445304927.b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch dev-qt/qtcore/qtcore-5.5.1.ebuild X-VCS-Directories: dev-qt/qtcore/files/ dev-qt/qtcore/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b13815a11545ddf9d5ef1db942ad7aea1d8c58c3 X-VCS-Branch: master Date: Tue, 20 Oct 2015 01:36:10 +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: 9f486196-6bbd-462d-a248-2a297b3291ac X-Archives-Hash: 37e44af02694d72e11f1573c5b7fd014 commit: b13815a11545ddf9d5ef1db942ad7aea1d8c58c3 Author: Davide Pesavento gentoo org> AuthorDate: Tue Oct 20 01:35:27 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Oct 20 01:35:27 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13815a1 dev-qt/qtcore: fix build on ia64 Gentoo-Bug: 559802 Package-Manager: portage-2.2.23 .../qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch | 45 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.5.1.ebuild | 4 ++ 2 files changed, 49 insertions(+) diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch new file mode 100644 index 0000000..c45fd91 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch @@ -0,0 +1,45 @@ +From deb6b5032c8eed35021b3c697a770645d90b11ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89meric=20MASCHINO?= +Date: Wed, 9 Sep 2015 22:56:32 +0200 +Subject: [PATCH] Fixed compilation errors in qatomic_ia64.h + +QBasicAtomicOps::testAndSetRelaxed(T &, T, T) and +QBasicAtomicOps::testAndSetOrdered(T &, T, T) bodies don't match +any prototypes in qatomic_ia64.h: the optional parameter T *currentValue +is missing. + +Task-number: QTBUG-48197 +Change-Id: I0112c429b161b4a0ddb6e8a0400a436282ffb1c7 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_ia64.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h +index c880e85..2ba6d12 100644 +--- a/src/corelib/arch/qatomic_ia64.h ++++ b/src/corelib/arch/qatomic_ia64.h +@@ -1035,16 +1035,16 @@ bool QBasicAtomicOps::deref(T &_q_value) Q_DECL_NOTHROW + } + + template template inline +-bool QBasicAtomicOps::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW ++bool QBasicAtomicOps::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW + { +- return testAndSetAcquire(_q_value, expectedValue, newValue); ++ return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue); + } + + template template inline +-bool QBasicAtomicOps::testAndSetOrdered(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW ++bool QBasicAtomicOps::testAndSetOrdered(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW + { + orderedMemoryFence(_q_value); +- return testAndSetAcquire(_q_value, expectedValue, newValue); ++ return testAndSetAcquire(_q_value, expectedValue, newValue, currentValue); + } + + template template inline +-- +2.6.2 + diff --git a/dev-qt/qtcore/qtcore-5.5.1.ebuild b/dev-qt/qtcore/qtcore-5.5.1.ebuild index 6ba815b..9f42484 100644 --- a/dev-qt/qtcore/qtcore-5.5.1.ebuild +++ b/dev-qt/qtcore/qtcore-5.5.1.ebuild @@ -24,6 +24,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-qatomic_ia64.h.patch" # bug 559802 +) + QT5_TARGET_SUBDIRS=( src/tools/bootstrap src/tools/moc