Upgrade to 2.0.0

4 files changed, 13 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 199d7512b161..50c8d742a9b5 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 = 3
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://www.ausweisapp.bund.de/
 	arch = i686
 	arch = x86_64
@@ -21,14 +21,10 @@ pkgbase = ausweisapp2
 	optdepends = ccid
 	optdepends = acsccid
 	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
-	source = qml.patch
+	source = https://github.com/Governikus/AusweisApp2/releases/download/2.0.0/AusweisApp-2.0.0.tar.gz
+	source = https://github.com/Governikus/AusweisApp2/releases/download/2.0.0/AusweisApp-2.0.0.tar.gz.asc
 	validpgpkeys = 699BF3055B0A49224EFDE7C72D7479A531451088
-	sha256sums = 8062fe04332e9a7bee4c75fe3ef3efda6748c1a19a6fda8770f7914939c7bd28
+	sha256sums = f1eff8e9028539f6374045b31b1cef05f30814900c24acaf0451e9982a6be274
 	sha256sums = SKIP
-	sha256sums = 59beebd6777d772488dc371dd85f9c28d554c480d0c094ee05b463b17cd1f0d6
-	sha256sums = d00b62baebddfb643a67df2ab088efc388fe2a87a195b5b293087dacad261a34
 
 pkgname = ausweisapp2
diff --git a/PKGBUILD b/PKGBUILD
index 50c7e3592c05..dd796d7baa9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: A. Klitzing <aklitzing@gmail.com>
 
 pkgname=ausweisapp2
-pkgver=1.26.7
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 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,27 +10,23 @@ 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} "qt66.patch" "qml.patch")
+source=("https://github.com/Governikus/AusweisApp2/releases/download/${pkgver}/AusweisApp-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=('699BF3055B0A49224EFDE7C72D7479A531451088')
-sha256sums=('8062fe04332e9a7bee4c75fe3ef3efda6748c1a19a6fda8770f7914939c7bd28'
-            'SKIP'
-            '59beebd6777d772488dc371dd85f9c28d554c480d0c094ee05b463b17cd1f0d6'
-            'd00b62baebddfb643a67df2ab088efc388fe2a87a195b5b293087dacad261a34')
+sha256sums=('f1eff8e9028539f6374045b31b1cef05f30814900c24acaf0451e9982a6be274'
+            'SKIP')
 
 prepare() {
-  cd "AusweisApp2-$pkgver"
-  patch -p1 -i "$srcdir/qt66.patch"
-  patch -p1 -i "$srcdir/qml.patch"
+  cd "AusweisApp-$pkgver"
 }
 
 build() {
   cd "${srcdir}"
-  cmake -GNinja -B build -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr "${srcdir}/AusweisApp2-${pkgver}"
+  cmake -GNinja -B build -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr "${srcdir}/AusweisApp-${pkgver}"
   cmake --build build
 }
 
 package() {
   cd "${srcdir}"
   DESTDIR="$pkgdir" cmake --install build
-  install -Dm644 "${srcdir}/AusweisApp2-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  install -Dm644 "${srcdir}/AusweisApp-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }
diff --git a/qml.patch b/qml.patch
deleted file mode 100644
index c0316e4561f6..000000000000
--- a/qml.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/resources/qml/Governikus/Global/+desktop/NavigationButton.qml b/resources/qml/Governikus/Global/+desktop/NavigationButton.qml
---- a/resources/qml/Governikus/Global/+desktop/NavigationButton.qml
-+++ b/resources/qml/Governikus/Global/+desktop/NavigationButton.qml
-@@ -64,7 +64,6 @@ Button {
- 				}
- 				sourceSize.height: Style.dimens.large_icon_size
- 				tintColor: Style.color.button_text
--				transformOrigin: Item.Center
- 			}
- 			GText {
- 				anchors.centerIn: parent
-diff --git a/resources/qml/Governikus/Global/TintableIcon.qml b/resources/qml/Governikus/Global/TintableIcon.qml
---- a/resources/qml/Governikus/Global/TintableIcon.qml
-+++ b/resources/qml/Governikus/Global/TintableIcon.qml
-@@ -17,7 +17,6 @@ Item {
- 	property alias sourceSize: image.sourceSize
- 	property color tintColor: Style.color.primary_text
- 	property bool tintEnabled: true
--	property alias transformOrigin: image.transformOrigin
- 
- 	implicitHeight: image.implicitHeight
- 	implicitWidth: image.implicitWidth
-diff --git a/resources/qml/Governikus/Workflow/+mobile/NfcProgressIndicator.qml b/resources/qml/Governikus/Workflow/+mobile/NfcProgressIndicator.qml
---- a/resources/qml/Governikus/Workflow/+mobile/NfcProgressIndicator.qml
-+++ b/resources/qml/Governikus/Workflow/+mobile/NfcProgressIndicator.qml
-@@ -154,7 +154,6 @@ Item {
- 		opacity: 0
- 		source: "qrc:///images/ausweis.svg"
- 		sourceSize.height: phone.height * 0.5
--		transformOrigin: Item.Center
- 		visible: !phone.tintEnabled
- 	}
- 	TintableIcon {
-@@ -175,7 +174,6 @@ Item {
- 			rotation: card.rotation
- 			source: "qrc:///images/ausweis_outline.svg"
- 			sourceSize.height: card.sourceSize.height
--			transformOrigin: Item.Center
- 			visible: !phone.tintEnabled
- 			x: card.x - phone.x
- 			y: card.y - phone.y
diff --git a/qt66.patch b/qt66.patch
deleted file mode 100644
index 1f84b010e438..000000000000
--- a/qt66.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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.