diff options
Diffstat (limited to 'media-libs/libqaccessibilityclient')
3 files changed, 105 insertions, 2 deletions
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 0d4b76c9c414..136871a032ce 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -1,3 +1,4 @@ +AUX libqaccessibilityclient-0.2.0-gcc8.patch 3363 BLAKE2B f4e06e749d3571bbf57fa9747ab803a5862c92dd8087ddfd987bf208eb77caeac86b1ed86f9a657c78a92edbb39c62f4beb3b44f2bfdbfa70b9df1c35df7d897 SHA512 c1e8ef104b992805c62371912c7109ff6fba17fed242af821d9980bc939225423a7ffbd1486da38716b318eced18fa9496c20d257b663a025d343b5a039b0038 DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34 -EBUILD libqaccessibilityclient-0.2.0.ebuild 703 BLAKE2B 6881be7f9673d83581794acdcdeb0b738260f37de0c277d98ddf721d539db16e9048533ca732494860baf84111f379177990857357d6bcc9b56644d4fea3b482 SHA512 6b3435f1ab30c35dfe06a3ee5e0b09931d591f1003a1c0144eaa179fafc1c9942d4f475eafc05fd1b89fa09a46c0e5b18fa2cb3eca58a998c2b7b77f36ee13e3 +EBUILD libqaccessibilityclient-0.2.0.ebuild 746 BLAKE2B e4fb414bd5debd4116197967170eb90dacdb11958d3fc2a75767f244073f425fed6c57b91f92caaa3937c327a15589cafdd248de64899dcf70494e2f35889257 SHA512 a78f29b3af374a838b4bc7cbfbcd225be1f70dc11d49e7ba8c77e32052131ef14f4bbce99a3c050473ff585f7a20a3e2f00a45bf79fe34b38cf104a3ea14575f MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch new file mode 100644 index 000000000000..74c97982e4c7 --- /dev/null +++ b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch @@ -0,0 +1,100 @@ +From 34f6084ff3ba1dd025cae17e5d114caff1d7fa6f Mon Sep 17 00:00:00 2001 +From: Frederik Gladhorn <frederik.gladhorn@qt.io> +Date: Tue, 25 Jul 2017 16:27:12 +0200 +Subject: Compile with clang and make sure qHash works with AccessibleObject + +Clang didn't like the complicated friend declaration. To make sure it's +not broken again, add one test to verify that we can use AO in hashes, +since apps might want to do that. +--- + src/qaccessibilityclient/accessibleobject.cpp | 4 ---- + src/qaccessibilityclient/accessibleobject.h | 17 ++++++++++------- + tests/auto/tst_accessibilityclient.cpp | 9 +++++++++ + 3 files changed, 19 insertions(+), 11 deletions(-) + +diff --git a/src/qaccessibilityclient/accessibleobject.cpp b/src/qaccessibilityclient/accessibleobject.cpp +index b2b005b..b8c9d33 100644 +--- a/src/qaccessibilityclient/accessibleobject.cpp ++++ b/src/qaccessibilityclient/accessibleobject.cpp +@@ -534,7 +534,3 @@ QACCESSIBILITYCLIENT_EXPORT QDebug QAccessibleClient::operator<<(QDebug d, const + return d.space(); + } + #endif +- +-uint qHash(const QAccessibleClient::AccessibleObject& object) { +- return qHash(object.d); +-} +diff --git a/src/qaccessibilityclient/accessibleobject.h b/src/qaccessibilityclient/accessibleobject.h +index a0d0db4..ee2e5ad 100644 +--- a/src/qaccessibilityclient/accessibleobject.h ++++ b/src/qaccessibilityclient/accessibleobject.h +@@ -27,8 +27,6 @@ namespace QAccessibleClient { + class AccessibleObject; + } + +-uint qHash(const QAccessibleClient::AccessibleObject& object); +- + #include <qlist.h> + #include <QSharedPointer> + #include <qaction.h> +@@ -40,6 +38,11 @@ namespace QAccessibleClient { + class AccessibleObjectPrivate; + class RegistryPrivate; + ++ ++#ifndef QT_NO_DEBUG_STREAM ++ QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &); ++#endif ++ + /** + This class represents an accessible object. + +@@ -746,13 +749,13 @@ private: + friend class RegistryPrivate; + friend class CacheWeakStrategy; + friend class CacheStrongStrategy; +- friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &); +- friend uint ::qHash(const AccessibleObject& object); +-}; +- + #ifndef QT_NO_DEBUG_STREAM +-QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &); ++ friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &); + #endif ++ friend uint qHash(const QAccessibleClient::AccessibleObject& object) { ++ return qHash(object.d); ++ } ++}; + + } + +diff --git a/tests/auto/tst_accessibilityclient.cpp b/tests/auto/tst_accessibilityclient.cpp +index ad98c0e..c377982 100644 +--- a/tests/auto/tst_accessibilityclient.cpp ++++ b/tests/auto/tst_accessibilityclient.cpp +@@ -75,6 +75,7 @@ private Q_SLOTS: + + void tst_registry(); + void tst_accessibleObject(); ++ void tst_hashable(); + void tst_application(); + void tst_navigation(); + void tst_focus(); +@@ -145,6 +146,14 @@ void AccessibilityClientTest::tst_accessibleObject() + QVERIFY(!invalid2.isValid()); + } + ++void AccessibilityClientTest::tst_hashable() ++{ ++ AccessibleObject testObject; ++ QHash<AccessibleObject, int> testHash; ++ testHash[testObject] = 1; ++ QCOMPARE(testHash[testObject], 1); ++} ++ + void AccessibilityClientTest::tst_application() + { + QString appName = QLatin1String("Lib QAccessibleClient test"); +-- +cgit v0.11.2 + diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild index de1d15f27a17..e18e8169c11e 100644 --- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild +++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-gcc8.patch" ) + src_prepare() { kde5_src_prepare cmake_comment_add_subdirectory tests |