diff options
3 files changed, 0 insertions, 138 deletions
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 5137bf9b8066..13363de31680 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -1,2 +1 @@ -DIST libqaccessibilityclient-0.2.0.tar.xz 103280 BLAKE2B e5e416be98871c1e6fc28a6de5d2476c240fe4474f6c11f3d1e178209a9e78200549ed5bc6967fd24f0f758798719f8c9f3cbd6d06bbf1e2d44fe47e9ba4300b SHA512 1ebe8a6b6dcc2f47b57329fd96a026f9e0fa05d7c78cc1a816bb9e5928efa6e719f42267dfc8b18e73546957dc7a336c75e62190ff09a83cc84ac0c4c32b3e34 DIST libqaccessibilityclient-0.3.0.tar.xz 104784 BLAKE2B a472cd2287340fbe5e5e4404fcdb4d1b6a28f39bf61117156f2e38622f10e0913f4c3818a9f7ff682eb195905e837c589d396df5fc8637a511d6e293e4b59a6a SHA512 d3c28a2dcb308e3248276c5b1ab822decb0c32afce8636ce30941320381431a8d7e064ff1451b14e64cbc83d03e3693d645d1739e64830bacefcd7fa68b0d2e1 diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch deleted file mode 100644 index 74c97982e4c7..000000000000 --- a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 deleted file mode 100644 index e18e8169c11e..000000000000 --- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -ECM_KDEINSTALLDIRS="false" -KDE_EXAMPLES="true" -inherit kde5 - -DESCRIPTION="Library for writing accessibility clients such as screen readers" -HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git" -SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-gcc8.patch" ) - -src_prepare() { - kde5_src_prepare - cmake_comment_add_subdirectory tests -} - -src_configure() { - local mycmakeargs=( - -DQT5_BUILD=ON - ) - kde5_src_configure -} |