[neon/qt6/qt6-libqaccessibilityclient/Neon/unstable] debian: update the patches
Pino Toscano
null at kde.org
Mon Mar 13 14:22:58 GMT 2023
Git commit c7033483993562ae9c52ad51050d29f13da3c770 by Pino Toscano.
Committed on 19/11/2018 at 20:09.
Pushed by jriddell into branch 'Neon/unstable'.
update the patches
- libdir.diff: drop, fixed upstream
- upstream_Add-missing-virtual-destructor.patch: drop, backported from
upstream
- upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch:
drop, backported from upstream
M +6 -0 debian/changelog
D +0 -23 debian/patches/libdir.diff
D +0 -3 debian/patches/series
D +0 -24 debian/patches/upstream_Add-missing-virtual-destructor.patch
D +0 -101 debian/patches/upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch
https://invent.kde.org/neon/qt6/qt6-libqaccessibilityclient/commit/c7033483993562ae9c52ad51050d29f13da3c770
diff --git a/debian/changelog b/debian/changelog
index 78d1b01..3807176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ libqaccessibilityclient (0.3.0-0r1) UNRELEASED; urgency=medium
[ Pino Toscano ]
* New upstream release.
* Switch watch file back to use "stable" releases, now that there are again.
+ * Update the patches:
+ - libdir.diff: drop, fixed upstream
+ - upstream_Add-missing-virtual-destructor.patch: drop, backported from
+ upstream
+ - upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch:
+ drop, backported from upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Mon, 19 Nov 2018 21:02:47 +0100
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
deleted file mode 100644
index 41686de..0000000
--- a/debian/patches/libdir.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libqaccessibilityclient/CMakeLists.txt
-===================================================================
---- libqaccessibilityclient.orig/CMakeLists.txt 2014-02-26 14:56:05.000000000 +0100
-+++ libqaccessibilityclient/CMakeLists.txt 2014-02-26 16:35:45.263545936 +0100
-@@ -47,7 +47,7 @@
-
- if (WIN32)
- set(EXEC_INSTALL_PREFIX "")
-- set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-+ set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install")
- set(BIN_INSTALL_DIR "bin")
- set(INCLUDE_INSTALL_DIR "include")
- else (WIN32)
-@@ -56,7 +56,8 @@
- endif(APPLE)
- set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
- set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin")
-- set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+ set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING
-+ "Directory where lib will install")
- set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
- endif (WIN32)
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d3ad73f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-libdir.diff
-upstream_Add-missing-virtual-destructor.patch
-upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch
diff --git a/debian/patches/upstream_Add-missing-virtual-destructor.patch b/debian/patches/upstream_Add-missing-virtual-destructor.patch
deleted file mode 100644
index c68d542..0000000
--- a/debian/patches/upstream_Add-missing-virtual-destructor.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f5a27fab1eda69c6cca24463868262f487977aac Mon Sep 17 00:00:00 2001
-From: Frederik Gladhorn <frederik.gladhorn at qt.io>
-Date: Tue, 25 Jul 2017 15:41:54 +0200
-Subject: [PATCH] Add missing virtual destructor
-
----
- src/qaccessibilityclient/cachestrategy_p.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qaccessibilityclient/cachestrategy_p.h b/src/qaccessibilityclient/cachestrategy_p.h
-index ed01298..13395f1 100644
---- a/src/qaccessibilityclient/cachestrategy_p.h
-+++ b/src/qaccessibilityclient/cachestrategy_p.h
-@@ -35,6 +35,7 @@ public:
- virtual void clear() = 0;
- virtual AccessibleObject::Interfaces interfaces(const AccessibleObject &object) = 0;
- virtual void setInterfaces(const AccessibleObject &object, AccessibleObject::Interfaces interfaces) = 0;
-+ virtual ~ObjectCache() {}
- };
-
- class CacheWeakStrategy : public ObjectCache
---
-2.18.0
-
diff --git a/debian/patches/upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch b/debian/patches/upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch
deleted file mode 100644
index c8be217..0000000
--- a/debian/patches/upstream_Compile-with-clang-and-make-sure-qHash-works-with-Ac.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 34f6084ff3ba1dd025cae17e5d114caff1d7fa6f Mon Sep 17 00:00:00 2001
-From: Frederik Gladhorn <frederik.gladhorn at qt.io>
-Date: Tue, 25 Jul 2017 16:27:12 +0200
-Subject: [PATCH] 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");
---
-2.18.0
-
More information about the Neon-commits
mailing list