Accepting request 1187159 from security

OBS-URL: https://build.opensuse.org/request/show/1187159
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/AusweisApp?expand=0&rev=8

0001-fix-qml-error-with-qt6.6.patch

@@ -0,0 +1,51 @@
+From d01d6ee97b7e1fbb804e12614004f9c5eab7fee3 Mon Sep 17 00:00:00 2001
+From: Lars Schmertmann <SmallLars@t-online.de>
+Date: Thu, 11 Jul 2024 16:35:09 +0200
+Subject: [PATCH] Fix QML error with Qt 6.6.3
+
+Got QML warning: DetachedLogView.qml:16:2: Cannot override FINAL property
+---
+ .../qml/modules/FeedbackView/+desktop/DetachedLogView.qml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ui/qml/modules/FeedbackView/+desktop/DetachedLogView.qml b/src/ui/qml/modules/FeedbackView/+desktop/DetachedLogView.qml
+index 953a3766..db7e446a 100644
+--- a/src/ui/qml/modules/FeedbackView/+desktop/DetachedLogView.qml
++++ b/src/ui/qml/modules/FeedbackView/+desktop/DetachedLogView.qml
+@@ -12,8 +12,8 @@ import Governikus.View
+ Rectangle {
+ 	id: root
+ 
++	readonly property int controlRadius: 15
+ 	readonly property int horizontalPadding: 18
+-	readonly property int radius: 15
+ 	readonly property int spacing: 10
+ 	readonly property int verticalPadding: 6
+ 
+@@ -55,7 +55,7 @@ Rectangle {
+ 					Layout.preferredWidth: 200
+ 					horizontalPadding: root.horizontalPadding
+ 					model: LogModel.logFileNames
+-					radius: root.radius
++					radius: root.controlRadius
+ 					textStyle: logTextStyle
+ 					verticalPadding: root.verticalPadding
+ 
+@@ -64,7 +64,7 @@ Rectangle {
+ 						border.width: 1
+ 						color: Style.color.transparent
+ 						drawShadow: false
+-						radius: root.radius
++						radius: root.controlRadius
+ 					}
+ 
+ 					onCurrentIndexChanged: LogModel.setLogFile(currentIndex)
+@@ -286,7 +286,7 @@ Rectangle {
+ 		Layout.minimumWidth: -1
+ 		borderWidth: 1
+ 		horizontalPadding: root.horizontalPadding
+-		radius: root.radius
++		radius: root.controlRadius
+ 		spacing: root.spacing
+ 		tintIcon: true
+ 		verticalPadding: root.verticalPadding

AusweisApp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 12 13:24:10 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Cherry-pick upstream patch to fix QML error with Qt 6.6
+  + 0001-fix-qml-error-with-qt6.6.patch
+
 -------------------------------------------------------------------
 Fri Jul  5 11:30:50 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

AusweisApp.spec

@@ -24,6 +24,7 @@ License:        EUPL-1.2
 Group:          Productivity/Security
 URL:            https://www.ausweisapp.bund.de
 Source0:        https://github.com/Governikus/AusweisApp2/archive/%{version}.tar.gz
+Patch0:         https://github.com/Governikus/AusweisApp/pull/53.patch#/0001-fix-qml-error-with-qt6.6.patch
 BuildRequires:  cmake
 %if 0%{?suse_version} > 1500
 BuildRequires:  gcc-c++
@@ -63,6 +64,7 @@ reader or compatible NFC smart phone is required.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch -P0 -p1
 
 %build
 %if 0%{?suse_version} <= 1500