From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- media-libs/libqaccessibilityclient/Manifest | 6 +- .../files/libqaccessibilityclient-0.2.0-gcc8.patch | 100 --------------------- .../libqaccessibilityclient-0.3.0-tests.patch | 37 ++++++++ .../libqaccessibilityclient-0.2.0.ebuild | 37 -------- .../libqaccessibilityclient-0.3.0.ebuild | 30 +++++++ 5 files changed, 70 insertions(+), 140 deletions(-) delete mode 100644 media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch create mode 100644 media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch delete mode 100644 media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild create mode 100644 media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild (limited to 'media-libs/libqaccessibilityclient') diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 136871a032ce..94dae3b97ade 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -1,4 +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 746 BLAKE2B e4fb414bd5debd4116197967170eb90dacdb11958d3fc2a75767f244073f425fed6c57b91f92caaa3937c327a15589cafdd248de64899dcf70494e2f35889257 SHA512 a78f29b3af374a838b4bc7cbfbcd225be1f70dc11d49e7ba8c77e32052131ef14f4bbce99a3c050473ff585f7a20a3e2f00a45bf79fe34b38cf104a3ea14575f +AUX libqaccessibilityclient-0.3.0-tests.patch 1117 BLAKE2B 0382b50d8244249b4b1e7cf1efd3ad301648341ae66496296d7f216dae79a7acd6641fe9d69ecd94f0e6124b92c7aed7915dcbd9f8bd217c620125437a7ecad0 SHA512 becaf6dd528f461370ec474e98aac8da33ee6803096d33137f5ea9284b65f4db2413553566def1c0615bcc920c885dc459c425afa105af02522da67f5a25859f +DIST libqaccessibilityclient-0.3.0.tar.xz 104784 BLAKE2B a472cd2287340fbe5e5e4404fcdb4d1b6a28f39bf61117156f2e38622f10e0913f4c3818a9f7ff682eb195905e837c589d396df5fc8637a511d6e293e4b59a6a SHA512 d3c28a2dcb308e3248276c5b1ab822decb0c32afce8636ce30941320381431a8d7e064ff1451b14e64cbc83d03e3693d645d1739e64830bacefcd7fa68b0d2e1 +EBUILD libqaccessibilityclient-0.3.0.ebuild 670 BLAKE2B ec6c4e9af062116a47addb5cb595a52d23f0c7e0e20dcdd2c752b848761f8f6ad57a38da3501c7a0cfd122386507ef662ef7ac7efe5d090f58f32b5b1e6eb341 SHA512 864d17e0172c08d0026f3a8f177d53149f4bc12f781e232518fd106cf474358c312bd822f6ecc7002d9a7d69ddaee63f80473f1ebeb6863e16945bd924fde2bf 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 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 -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 - #include - #include -@@ -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 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/files/libqaccessibilityclient-0.3.0-tests.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch new file mode 100644 index 000000000000..1ec1317ea80f --- /dev/null +++ b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch @@ -0,0 +1,37 @@ +From a85bce953b8a231cfe9b47d9f3fd80f6149f51f2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 18 Nov 2018 12:13:28 +0100 +Subject: [PATCH] Use standard BUILD_TESTING instead of BUILD_TESTS + +Add tests subdir conditionally. +--- + CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73bb3cb..13531cc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,7 @@ include_directories( + find_package(Qt5Widgets QUIET) + find_package(Qt5DBus QUIET) + find_package(Qt5Test QUIET) +-set(BUILD_TESTS ${Qt5Test_FOUND}) ++set(BUILD_TESTING ${Qt5Test_FOUND}) + + add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5DBus_DEFINITIONS}) + include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS}) +@@ -70,7 +70,9 @@ if(APPLE) + endif(APPLE) + + add_subdirectory(src) +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + add_subdirectory(examples) + + # we need the absolute directories where stuff will be installed too +-- +2.19.1 + 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 -} diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild new file mode 100644 index 000000000000..37ae0d8ab71f --- /dev/null +++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +ECM_KDEINSTALLDIRS="false" +KDE_TEST="optional" +KDE_EXAMPLES="true" +VIRTUALX_REQUIRED="test" +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/stable/${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}" + +# tests require DBus +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-tests.patch" ) -- cgit v1.2.3