Fix build with Qt 6.6

3 files changed, 48 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8be7f9bd46e5..4f3d316e1019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ausweisapp2
 	pkgdesc = A software application that you install on your computer to use your national identity card or your electronic residence permit for online identification
 	pkgver = 1.26.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.ausweisapp.bund.de/
 	arch = i686
 	arch = x86_64
@@ -23,8 +23,10 @@ pkgbase = ausweisapp2
 	optdepends = pcsc-cyberjack
 	source = https://github.com/Governikus/AusweisApp2/releases/download/1.26.7/AusweisApp2-1.26.7.tar.gz
 	source = https://github.com/Governikus/AusweisApp2/releases/download/1.26.7/AusweisApp2-1.26.7.tar.gz.asc
+	source = qt66.patch
 	validpgpkeys = 699BF3055B0A49224EFDE7C72D7479A531451088
 	sha256sums = 8062fe04332e9a7bee4c75fe3ef3efda6748c1a19a6fda8770f7914939c7bd28
 	sha256sums = SKIP
+	sha256sums = 59beebd6777d772488dc371dd85f9c28d554c480d0c094ee05b463b17cd1f0d6
 
 pkgname = ausweisapp2
diff --git a/PKGBUILD b/PKGBUILD
index 0c5cf1debd89..d8c473437788 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ausweisapp2
 pkgver=1.26.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A software application that you install on your computer to use your national identity card or your electronic residence permit for online identification"
 arch=('i686' 'x86_64' 'aarch64')
 license=('custom:EUPL1.2')
@@ -10,13 +10,15 @@ url="https://www.ausweisapp.bund.de/"
 depends=('qt6-declarative' 'qt6-svg' 'qt6-websockets' 'qt6-scxml' 'pcsclite' 'http-parser')
 makedepends=('cmake' 'qt6-tools' 'qt6-shadertools' 'ninja' 'pkgconf')
 optdepends=('ccid' 'acsccid' 'pcsc-cyberjack')
-source=("https://github.com/Governikus/AusweisApp2/releases/download/${pkgver}/AusweisApp2-${pkgver}.tar.gz"{,.asc})
+source=("https://github.com/Governikus/AusweisApp2/releases/download/${pkgver}/AusweisApp2-${pkgver}.tar.gz"{,.asc} "qt66.patch")
 validpgpkeys=('699BF3055B0A49224EFDE7C72D7479A531451088')
 sha256sums=('8062fe04332e9a7bee4c75fe3ef3efda6748c1a19a6fda8770f7914939c7bd28'
-            'SKIP')
+            'SKIP'
+            '59beebd6777d772488dc371dd85f9c28d554c480d0c094ee05b463b17cd1f0d6')
 
 prepare() {
   cd "AusweisApp2-$pkgver"
+  patch -p1 -i "$srcdir/qt66.patch"
 }
 
 build() {
diff --git a/qt66.patch b/qt66.patch
new file mode 100644
index 000000000000..1f84b010e438
--- /dev/null
+++ b/qt66.patch
@@ -0,0 +1,40 @@
+diff --git a/src/card/pcsc/PcscUtils.cpp b/src/card/pcsc/PcscUtils.cpp
+--- a/src/card/pcsc/PcscUtils.cpp
++++ b/src/card/pcsc/PcscUtils.cpp
+@@ -18,3 +18,22 @@ QString PcscUtils::toString(PCSC_RETURNC
+ 
+ 	return QString::fromLatin1(name);
+ }
++
++
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
++QDataStream& governikus::operator<<(QDataStream& pStream, const PcscUtils::PcscReturnCode& pCode)
++{
++	return pStream << static_cast<qint64>(pCode);
++}
++
++
++QDataStream& governikus::operator>>(QDataStream& pStream, PcscUtils::PcscReturnCode& pCode)
++{
++	qint64 tmp;
++	pStream >> tmp;
++	pCode = static_cast<PcscUtils::PcscReturnCode>(tmp);
++	return pStream;
++}
++
++
++#endif
+diff --git a/src/card/pcsc/PcscUtils.h b/src/card/pcsc/PcscUtils.h
+--- a/src/card/pcsc/PcscUtils.h
++++ b/src/card/pcsc/PcscUtils.h
+@@ -141,6 +141,10 @@ class PcscUtils
+ 		static QString toString(PCSC_RETURNCODE pCode);
+ };
+ 
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
++QDataStream& operator<<(QDataStream& pStream, const PcscUtils::PcscReturnCode& pCode);
++QDataStream& operator>>(QDataStream& pStream, PcscUtils::PcscReturnCode& pCode);
++#endif
+ 
+ /**
+  * Make sure we do not use these macros directly in our code.