[neon/extras/qca2/Neon/unstable] debian/patches: refresh patches and remove two test patches that no longer apply

[Jonathan Riddell]

Git commit bbd39115a12749b66e16afd14c6a809b8ab22a6c by Jonathan Riddell.
Committed on 02/10/2020 at 11:35.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches and remove two test patches that no longer apply

M  +11   -10   debian/patches/define_qca_export.diff
M  +4    -4    debian/patches/kubuntu_ignore_filewatch_test.diff
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/extras/qca2/commit/bbd39115a12749b66e16afd14c6a809b8ab22a6c

diff --git a/debian/patches/define_qca_export.diff b/debian/patches/define_qca_export.diff
index 6bfafb6..23330e3 100644
--- a/debian/patches/define_qca_export.diff
+++ b/debian/patches/define_qca_export.diff
@@ -2,15 +2,16 @@ Description: Define QCA_EXPORT as Q_DECL_EXPORT on non-Windows systems so we
  can build with -fvisibility=hidden.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
-diff -Nur qca2-2.0.3.orig/include/QtCrypto/qca_export.h qca2-2.0.3/include/QtCrypto/qca_export.h
---- qca2-2.0.3.orig/include/QtCrypto/qca_export.h
-+++ qca2-2.0.3/include/QtCrypto/qca_export.h
-@@ -44,6 +44,8 @@
- #   define QCA_EXPORT Q_DECL_IMPORT
- #  endif
- # endif
-+#else
-+# define QCA_EXPORT Q_DECL_EXPORT
+Index: qca/include/QtCrypto/qca_export.h
+===================================================================
+--- qca.orig/include/QtCrypto/qca_export.h
++++ qca/include/QtCrypto/qca_export.h
+@@ -45,6 +45,8 @@
  #endif
+ #endif
+ #else
++#define QCA_EXPORT Q_DECL_EXPORT
++#endif
  #ifndef QCA_EXPORT
- # define QCA_EXPORT
+ #define QCA_EXPORT
+ #endif
diff --git a/debian/patches/kubuntu_ignore_filewatch_test.diff b/debian/patches/kubuntu_ignore_filewatch_test.diff
index eb7b88f..1094611 100644
--- a/debian/patches/kubuntu_ignore_filewatch_test.diff
+++ b/debian/patches/kubuntu_ignore_filewatch_test.diff
@@ -6,11 +6,11 @@ Forwarded: no, needs investigation why it is failing
 Last-Update: 2014-11-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: qca2-2.1.0/unittest/CMakeLists.txt
+Index: qca/unittest/CMakeLists.txt
 ===================================================================
---- qca2-2.1.0.orig/unittest/CMakeLists.txt
-+++ qca2-2.1.0/unittest/CMakeLists.txt
-@@ -13,7 +13,6 @@ add_subdirectory(cipherunittest)
+--- qca.orig/unittest/CMakeLists.txt
++++ qca/unittest/CMakeLists.txt
+@@ -11,7 +11,6 @@ add_subdirectory(cipherunittest)
  add_subdirectory(clientplugin)
  add_subdirectory(cms)
  add_subdirectory(dsaunittest)
diff --git a/debian/patches/series b/debian/patches/series
index f9b23b5..74bd91d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 define_qca_export.diff
-pipeunittest_more_wait.diff
-hurd_msync.diff
 kubuntu_ignore_filewatch_test.diff