From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
Date: Tue, 20 Oct 2015 01:36:10 +0000 (UTC) [thread overview]
Message-ID: <1445304927.b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.pesa@gentoo> (raw)
commit: b13815a11545ddf9d5ef1db942ad7aea1d8c58c3
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 01:35:27 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> 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?= <emeric.maschino@gmail.com>
+Date: Wed, 9 Sep 2015 22:56:32 +0200
+Subject: [PATCH] Fixed compilation errors in qatomic_ia64.h
+
+QBasicAtomicOps<size>::testAndSetRelaxed(T &, T, T) and
+QBasicAtomicOps<size>::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 <thiago.macieira@intel.com>
+---
+ 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<size>::deref(T &_q_value) Q_DECL_NOTHROW
+ }
+
+ template<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::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<int size> template <typename T> inline
+-bool QBasicAtomicOps<size>::testAndSetOrdered(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW
++bool QBasicAtomicOps<size>::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<int size> template <typename T> 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
next reply other threads:[~2015-10-20 1:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 1:36 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-17 14:36 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ Michael Palimaka
2017-04-23 19:08 Andreas Sturmlechner
2017-05-14 0:14 Davide Pesavento
2017-11-28 11:00 Michael Palimaka
2018-10-19 20:23 Andreas Sturmlechner
2020-01-25 23:56 Andreas Sturmlechner
2020-02-09 18:51 Andreas Sturmlechner
2021-01-02 1:23 Andreas Sturmlechner
2021-02-13 11:38 Andreas Sturmlechner
2021-08-25 14:36 Andreas Sturmlechner
2022-03-30 18:57 Andreas Sturmlechner
2022-06-26 8:25 Sam James
2023-02-05 13:54 Andreas Sturmlechner
2023-02-19 13:24 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445304927.b13815a11545ddf9d5ef1db942ad7aea1d8c58c3.pesa@gentoo \
--to=pesa@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox