From c3ecd077fd16acec3c6a893e8df6ad41f3c482cd Mon Sep 17 00:00:00 2001 From: Governikus Date: Fri, 28 Jul 2023 15:46:00 +0200 Subject: [PATCH] Add revision: v1.26.7 --- CMakeLists.txt | 2 +- docs/releasenotes/1.26.7.rst | 13 +++++++++++++ docs/releasenotes/appcast.rst | 1 + docs/releasenotes/versions.rst | 1 + ...e-0011-Improve-Intent-source-app-detection.patch | 6 +++--- ...Reader-change-fastScanName-to-take-a-Value.patch | 2 +- ...Reader-make-fastScanName-indicate-parsing-.patch | 2 +- ...Reader-use-qOffsetStringArray-for-storing-.patch | 2 +- ...eamReader-Raise-error-on-unexpected-tokens.patch | 2 +- ...ingArray-fix-ambiguous-qOffsetStringArray-.patch | 2 +- ...tStringArray-fix-size_t-qsizetype-mismatch.patch | 2 +- 11 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 docs/releasenotes/1.26.7.rst diff --git a/CMakeLists.txt b/CMakeLists.txt index 60501342b..8e2bfb77d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ if(UNIX AND NOT IOS) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version") endif() -project(AusweisApp2 VERSION 1.26.6 LANGUAGES ${LANGUAGES}) +project(AusweisApp2 VERSION 1.26.7 LANGUAGES ${LANGUAGES}) # Set TWEAK if not defined in PROJECT_VERSION above to # have a valid tweak version without propagating it diff --git a/docs/releasenotes/1.26.7.rst b/docs/releasenotes/1.26.7.rst new file mode 100644 index 000000000..b66cb0c64 --- /dev/null +++ b/docs/releasenotes/1.26.7.rst @@ -0,0 +1,13 @@ +AusweisApp2 1.26.7 +^^^^^^^^^^^^^^^^^^ + +**Releasedatum:** 28. Juli 2023 + + +Anwender +"""""""" +- Ein möglicher Absturz beim Start unter Android wurde behoben. + + +Entwickler +"""""""""" diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst index c2f49f280..e2f81110e 100644 --- a/docs/releasenotes/appcast.rst +++ b/docs/releasenotes/appcast.rst @@ -4,6 +4,7 @@ Release Notes .. toctree:: :maxdepth: 1 + 1.26.7 1.26.6 1.26.5 1.26.4 diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst index ed4ca1cc0..8e7b467f6 100644 --- a/docs/releasenotes/versions.rst +++ b/docs/releasenotes/versions.rst @@ -6,6 +6,7 @@ Versionszweig 1.26 .. toctree:: :maxdepth: 1 + 1.26.7 1.26.6 1.26.5 1.26.4 diff --git a/libs/patches/qtbase-0011-Improve-Intent-source-app-detection.patch b/libs/patches/qtbase-0011-Improve-Intent-source-app-detection.patch index 4dcdca6fe..b6a242503 100644 --- a/libs/patches/qtbase-0011-Improve-Intent-source-app-detection.patch +++ b/libs/patches/qtbase-0011-Improve-Intent-source-app-detection.patch @@ -1,4 +1,4 @@ -From bdc4845cd844e674f17161435a11e60dde2769cc Mon Sep 17 00:00:00 2001 +From f0f55fda3a29ca4f53fcd9d93476e5658cf6f9f4 Mon Sep 17 00:00:00 2001 From: Jens Trillmann Date: Wed, 5 Jul 2023 09:33:03 +0200 Subject: Improve Intent source app detection @@ -17,7 +17,7 @@ Change-Id: I33d1edd52de98486d9616713e531ea20ada87bcb 1 file changed, 12 insertions(+), 3 deletions(-) diff --git x/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java y/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java -index 9cef8146fd..f862f6aaee 100644 +index 9cef8146fd..c22a4f4278 100644 --- x/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java +++ y/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java @@ -16,6 +16,7 @@ import android.graphics.Canvas; @@ -36,7 +36,7 @@ index 9cef8146fd..f862f6aaee 100644 - if (referrer != null) - sourceInformation = referrer.toString().replaceFirst("android-app://", ""); + String browserApplicationId = intent.getExtras() == null ? "" : intent.getExtras().getString(Browser.EXTRA_APPLICATION_ID); -+ if (!browserApplicationId.isEmpty()) ++ if (browserApplicationId != null && !browserApplicationId.isEmpty()) + { + sourceInformation = browserApplicationId; + } diff --git a/libs/patches/qtbase-0012-QXmlStreamReader-change-fastScanName-to-take-a-Value.patch b/libs/patches/qtbase-0012-QXmlStreamReader-change-fastScanName-to-take-a-Value.patch index 5602a0238..519134038 100644 --- a/libs/patches/qtbase-0012-QXmlStreamReader-change-fastScanName-to-take-a-Value.patch +++ b/libs/patches/qtbase-0012-QXmlStreamReader-change-fastScanName-to-take-a-Value.patch @@ -1,4 +1,4 @@ -From f9a1c8668e5f4787e9b0b3136076138f4fda5563 Mon Sep 17 00:00:00 2001 +From da582e1a6ca1ed0dbdb63f95749bef5c44ef401d Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 12 Apr 2023 13:10:26 +0200 Subject: QXmlStreamReader: change fastScanName() to take a Value* diff --git a/libs/patches/qtbase-0013-QXmlStreamReader-make-fastScanName-indicate-parsing-.patch b/libs/patches/qtbase-0013-QXmlStreamReader-make-fastScanName-indicate-parsing-.patch index 375a274a4..49137e9fb 100644 --- a/libs/patches/qtbase-0013-QXmlStreamReader-make-fastScanName-indicate-parsing-.patch +++ b/libs/patches/qtbase-0013-QXmlStreamReader-make-fastScanName-indicate-parsing-.patch @@ -1,4 +1,4 @@ -From 836d7df23ec9b6cb3dea1bb68b7c8bc75090702e Mon Sep 17 00:00:00 2001 +From ecf9967e196afa80bb3117d794387aba8b536f32 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 22 Jun 2023 15:56:07 +0300 Subject: QXmlStreamReader: make fastScanName() indicate parsing status to diff --git a/libs/patches/qtbase-0014-QXmlStreamReader-use-qOffsetStringArray-for-storing-.patch b/libs/patches/qtbase-0014-QXmlStreamReader-use-qOffsetStringArray-for-storing-.patch index 978dbb41e..d38f838c4 100644 --- a/libs/patches/qtbase-0014-QXmlStreamReader-use-qOffsetStringArray-for-storing-.patch +++ b/libs/patches/qtbase-0014-QXmlStreamReader-use-qOffsetStringArray-for-storing-.patch @@ -1,4 +1,4 @@ -From 6f79fea4b7ee471adbed09d7e4b6da688a571c80 Mon Sep 17 00:00:00 2001 +From 472133b864b04e359aba2f5db1f1b1fe2890121a Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 2 Sep 2022 16:52:04 +0200 Subject: QXmlStreamReader: use qOffsetStringArray for storing token types diff --git a/libs/patches/qtbase-0015-QXmlStreamReader-Raise-error-on-unexpected-tokens.patch b/libs/patches/qtbase-0015-QXmlStreamReader-Raise-error-on-unexpected-tokens.patch index b9fd729ba..0fe420cef 100644 --- a/libs/patches/qtbase-0015-QXmlStreamReader-Raise-error-on-unexpected-tokens.patch +++ b/libs/patches/qtbase-0015-QXmlStreamReader-Raise-error-on-unexpected-tokens.patch @@ -1,4 +1,4 @@ -From ce9ffbc726f7a0d90561db7206f3061371126190 Mon Sep 17 00:00:00 2001 +From 625af289b43f8e665b83eb4c86aeef91140e59ab Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 30 Jun 2023 12:43:59 +0200 Subject: QXmlStreamReader: Raise error on unexpected tokens diff --git a/libs/patches/qtbase-0016-QOffsetStringArray-fix-ambiguous-qOffsetStringArray-.patch b/libs/patches/qtbase-0016-QOffsetStringArray-fix-ambiguous-qOffsetStringArray-.patch index 9f06617f8..2d4a641f8 100644 --- a/libs/patches/qtbase-0016-QOffsetStringArray-fix-ambiguous-qOffsetStringArray-.patch +++ b/libs/patches/qtbase-0016-QOffsetStringArray-fix-ambiguous-qOffsetStringArray-.patch @@ -1,4 +1,4 @@ -From e6d25e8d3b67cf7d9601d3fdd07131280f8ff056 Mon Sep 17 00:00:00 2001 +From 335a97b94afdfe8c0156ac3d3a0dab8ec784f00d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 4 Sep 2022 12:31:10 +0200 Subject: QOffsetStringArray: fix ambiguous qOffsetStringArray overloads diff --git a/libs/patches/qtbase-0017-QOffsetStringArray-fix-size_t-qsizetype-mismatch.patch b/libs/patches/qtbase-0017-QOffsetStringArray-fix-size_t-qsizetype-mismatch.patch index 5f23bbb77..ac59adfde 100644 --- a/libs/patches/qtbase-0017-QOffsetStringArray-fix-size_t-qsizetype-mismatch.patch +++ b/libs/patches/qtbase-0017-QOffsetStringArray-fix-size_t-qsizetype-mismatch.patch @@ -1,4 +1,4 @@ -From 72533c561d6952e63f86f11d9e4f0c6ffe8ed5a1 Mon Sep 17 00:00:00 2001 +From 5d3108ae7f32a0489833d358aced86cb27184d49 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 5 Sep 2022 08:59:23 +0200 Subject: QOffsetStringArray: fix size_t/qsizetype mismatch