Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package AusweisApp2 for openSUSE:Factory checked in at 2023-10-18 21:26:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/AusweisApp2 (Old) and /work/SRC/openSUSE:Factory/.AusweisApp2.new.31755 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "AusweisApp2" Wed Oct 18 21:26:10 2023 rev:28 rq:1118497 version:1.26.7 Changes: -------- --- /work/SRC/openSUSE:Factory/AusweisApp2/AusweisApp2.changes 2023-08-02 16:50:58.713693121 +0200 +++ /work/SRC/openSUSE:Factory/.AusweisApp2.new.31755/AusweisApp2.changes 2023-10-18 21:26:29.386395887 +0200 @@ -1,0 +2,8 @@ +Tue Oct 17 08:55:19 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaub...@suse.com> + +- Add patch to fix FTBFS with Qt 6.6 + + 0001-fix-ftbfs-with-qt6.6.patch +- Add patch to update QML for Qt 6.6 + + 0002-update-qml-for-qt6.6.patch + +------------------------------------------------------------------- New: ---- 0001-fix-ftbfs-with-qt6.6.patch 0002-update-qml-for-qt6.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ AusweisApp2.spec ++++++ --- /var/tmp/diff_new_pack.ZZElX8/_old 2023-10-18 21:26:30.038419506 +0200 +++ /var/tmp/diff_new_pack.ZZElX8/_new 2023-10-18 21:26:30.038419506 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Security URL: https://www.ausweisapp.bund.de Source0: https://github.com/Governikus/AusweisApp2/archive/%{version}.tar.gz +Patch0: 0001-fix-ftbfs-with-qt6.6.patch +Patch1: 0002-update-qml-for-qt6.6.patch BuildRequires: cmake %if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ @@ -38,9 +40,9 @@ BuildRequires: pkgconfig BuildRequires: qt6-concurrent-devel BuildRequires: qt6-core-devel +BuildRequires: qt6-core-private-devel BuildRequires: qt6-linguist-devel BuildRequires: qt6-network-devel -BuildRequires: qt6-core-private-devel BuildRequires: qt6-qml-devel BuildRequires: qt6-qmlworkerscript-devel BuildRequires: qt6-quick-devel @@ -61,6 +63,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %if 0%{?suse_version} <= 1500 ++++++ 0001-fix-ftbfs-with-qt6.6.patch ++++++ 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. ++++++ 0002-update-qml-for-qt6.6.patch ++++++ 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
