public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/AusweisApp2] f45: Fix application crashing on startup
@ 2026-11-20 16:29 Julian Sikorski
  0 siblings, 0 replies; only message in thread
From: Julian Sikorski @ 2026-11-20 16:29 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/AusweisApp2
Branch : f45
Commit : 47327796222f73eb0a12fbe85fb056f3db26074c
Author : Julian Sikorski <belegdol@fedoraproject.org>
Date   : 2026-11-20T17:23:12+01:00
Stats  : +84/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/AusweisApp2/c/47327796222f73eb0a12fbe85fb056f3db26074c?branch=f45

Log:
Fix application crashing on startup

---
diff --git a/AusweisApp2.spec b/AusweisApp2.spec
index 1622c6b..4d0375e 100644
--- a/AusweisApp2.spec
+++ b/AusweisApp2.spec
@@ -41,6 +41,9 @@ Source0003:       %{rel_url}/%{newname}-%{version}.tar.gz.sha256
 Source0004:       https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%%20EN.txt#/EUPL-12_EN.txt
 Source1000:       gen_openssl_cnf.py
 
+# Fix application crashing on startup
+Patch00001:       https://raw.githubusercontent.com/flathub/de.bund.ausweisapp.ausweisapp2/refs/heads/master/vendor.patch
+
 # Downstream.
 Patch01000:       %{name}-1.24.1-use_Qt_TranslationsPath.patch
 

diff --git a/vendor.patch b/vendor.patch
new file mode 100644
index 0000000..342a265
--- /dev/null
+++ b/vendor.patch
@@ -0,0 +1,81 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,10 +74,14 @@ if(NOT VENDOR)
+ endif()
+ message(STATUS "VENDOR: ${VENDOR}")
+ 
+-if(NOT VENDOR_PATH)
+-	set(VENDOR_PATH "${PROJECT_NAME}")
++if(NOT VENDOR_SETTINGS)
++	if(VENDOR)
++		set(VENDOR_SETTINGS "${VENDOR}")
++	else()
++		set(VENDOR_SETTINGS "${PROJECT_NAME}")
++	endif()
+ endif()
+-message(STATUS "VENDOR_PATH: ${VENDOR_PATH}")
++message(STATUS "VENDOR_SETTINGS: ${VENDOR_SETTINGS}")
+ 
+ if(VENDOR MATCHES "Governikus")
+ 	set(VENDOR_GOVERNIKUS TRUE)
+diff --git a/cmake/Install.cmake b/cmake/Install.cmake
+--- a/cmake/Install.cmake
++++ b/cmake/Install.cmake
+@@ -118,7 +118,7 @@ elseif(UNIX)
+ 		set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+ 	endif()
+ 
+-	set(DEFAULT_FILE_DESTINATION ${CMAKE_INSTALL_DATADIR}/${VENDOR_PATH}/${PROJECT_NAME})
++	set(DEFAULT_FILE_DESTINATION ${CMAKE_INSTALL_DATADIR}/${VENDOR}/${PROJECT_NAME})
+ 
+ 	if(INTEGRATED_SDK AND NOT CONTAINER_SDK)
+ 		GET_PUBLIC_HEADER(AusweisAppBinary PUBLIC_HEADER)
+diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
+--- a/cmake/Packaging.cmake
++++ b/cmake/Packaging.cmake
+@@ -105,7 +105,7 @@ if(WIN32)
+ 		set(CPACK_WIX_UI_BANNER ${RESOURCES_DIR}/images/wix_banner.jpg)
+ 		set(CPACK_WIX_UI_DIALOG ${RESOURCES_DIR}/images/wix_dialog.jpg)
+ 		set(CPACK_WIX_EXTENSIONS WixToolset.Util.wixext WixToolset.Firewall.wixext)
+-		set(CPACK_WIX_BUILD_EXTRA_FLAGS -loc ${PACKAGING_DIR}/win/WIX.Texts.de-DE.wxl -loc ${PACKAGING_DIR}/win/WIX.Texts.en-US.wxl -d CPACK_PACKAGE_VENDOR_PATH=${VENDOR_PATH})
++		set(CPACK_WIX_BUILD_EXTRA_FLAGS -loc ${PACKAGING_DIR}/win/WIX.Texts.de-DE.wxl -loc ${PACKAGING_DIR}/win/WIX.Texts.en-US.wxl -d CPACK_PACKAGE_VENDOR_SETTINGS=${VENDOR_SETTINGS})
+ 		if(CMAKE_VERSION VERSION_LESS "4.1")
+ 			set(CPACK_WIX_BUILD_EXTRA_FLAGS -i ${CMAKE_BINARY_DIR}/_CPack_Packages/win64/WIX ${CPACK_WIX_BUILD_EXTRA_FLAGS})
+ 		endif()
+diff --git a/resources/packaging/win/WIX.template.in b/resources/packaging/win/WIX.template.in
+--- a/resources/packaging/win/WIX.template.in
++++ b/resources/packaging/win/WIX.template.in
+@@ -40,7 +40,7 @@
+ 
+         <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)" />
+ 
+-        <WixVariable Id="CompanyRootKey" Value="Software\$(var.CPACK_PACKAGE_VENDOR_PATH)\AusweisApp2" /> <!-- use var.CPACK_PACKAGE_NAME after migrating to new registry key -->
++        <WixVariable Id="CompanyRootKey" Value="Software\$(var.CPACK_PACKAGE_VENDOR_SETTINGS)\AusweisApp2" /> <!-- use var.CPACK_PACKAGE_NAME after migrating to new registry key -->
+ 
+         <?ifdef CPACK_WIX_PRODUCT_ICON?>
+         <Property Id="ARPPRODUCTICON" Value="ProductIcon.ico" />
+diff --git a/src/settings/AbstractSettings.cpp b/src/settings/AbstractSettings.cpp
+--- a/src/settings/AbstractSettings.cpp
++++ b/src/settings/AbstractSettings.cpp
+@@ -29,7 +29,7 @@ QString AbstractSettings::getOrganizatio
+ 	return QCoreApplication::organizationDomain();
+ 
+ #else
+-	return QStringLiteral(VENDOR_PATH);
++	return QStringLiteral(VENDOR_SETTINGS);
+ 
+ #endif
+ }
+diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
+--- a/src/settings/CMakeLists.txt
++++ b/src/settings/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ ADD_PLATFORM_LIBRARY(AusweisAppSettings)
+ 
+ target_link_libraries(AusweisAppSettings ${Qt}::Core ${Qt}::Network ${Qt}::Concurrent OpenSSL::Crypto AusweisAppGlobal AusweisAppCrypto)
+-target_compile_definitions(AusweisAppSettings PRIVATE VENDOR_PATH="${VENDOR_PATH}")
++target_compile_definitions(AusweisAppSettings PRIVATE VENDOR_SETTINGS="${VENDOR_SETTINGS}")
+ 
+ if(MACOS)
+ 	target_link_libraries(AusweisAppSettings ${OSX_APPKIT} ${OSX_SERVICEMANAGEMENT})

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-20 16:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 16:29 [rpms/AusweisApp2] f45: Fix application crashing on startup Julian Sikorski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox