diff options
author | 2016-12-04 04:52:43 +0100 | |
---|---|---|
committer | 2016-12-04 04:52:43 +0100 | |
commit | 2ef83c43456d4812e8a94255cca1ff1bbf32fff6 (patch) | |
tree | 71f45e3576615dcd4832539430b540ed38a695cf /dev-qt/qtcore/files | |
parent | net-analyzer/nagios{,-core}: new version 4.2.3 to fix CVE-2016-8641. (diff) | |
download | gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.gz gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.bz2 gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.zip |
dev-qt: remove Qt 5.5.1
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-qt/qtcore/files')
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch | 56 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch | 45 |
2 files changed, 0 insertions, 101 deletions
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch deleted file mode 100644 index edb58d13d51b..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c689bcafd3196aad22372e8056fe0ccb13c15f35 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 12 Feb 2016 12:37:15 +0100 -Subject: Search for libsystemd first, fall back to libsystemd-journal - -systemd >= 209 merged the individual libraries libsystemd-journal, -libsystemd-login, libsystemd-id128 and libsystemd-daemon into -a single library, libsystemd. To ease the transition one could pass -an option to its build to generate stub libraries and matching -pkg-config files. With systemd >= 229 this option has now been -removed, causing the build to fail when the journald option is -enabled. - -Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> -Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> ---- - config.tests/unix/journald/journald.pro | 6 +++++- - src/corelib/global/global.pri | 5 ++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro -index 2bb50ce..ea76564 100644 ---- a/config.tests/unix/journald/journald.pro -+++ b/config.tests/unix/journald/journald.pro -@@ -1,6 +1,10 @@ - SOURCES = journald.c - - CONFIG += link_pkgconfig --PKGCONFIG_PRIVATE += libsystemd-journal -+ -+packagesExist(libsystemd): \ -+ PKGCONFIG_PRIVATE += libsystemd -+else: \ -+ PKGCONFIG_PRIVATE += libsystemd-journal - - CONFIG -= qt -diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri -index aa4945f..dd84695 100644 ---- a/src/corelib/global/global.pri -+++ b/src/corelib/global/global.pri -@@ -53,7 +53,10 @@ slog2 { - - journald { - CONFIG += link_pkgconfig -- PKGCONFIG_PRIVATE += libsystemd-journal -+ packagesExist(libsystemd): \ -+ PKGCONFIG_PRIVATE += libsystemd -+ else: \ -+ PKGCONFIG_PRIVATE += libsystemd-journal - DEFINES += QT_USE_JOURNALD - } - --- -2.8.1 - 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 deleted file mode 100644 index c45fd91abc06..000000000000 --- a/dev-qt/qtcore/files/qtcore-5.5.1-qatomic_ia64.h.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |