From a6e3999aeb4635a13565c7e7afbac14f49e33f62d16c36047aed9679226fb749 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 1 Feb 2022 06:53:58 +0000 Subject: [PATCH 1/5] up to 4.19.0 OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=45 --- datovka-4.18.0.tar.xz | 3 --- datovka-4.18.0.tar.xz.sha256 | 1 - datovka-4.19.0.tar.xz | 3 +++ datovka-4.19.0.tar.xz.sha256 | 1 + datovka.changes | 20 ++++++++++++++++++++ datovka.spec | 8 ++++---- 6 files changed, 28 insertions(+), 8 deletions(-) delete mode 100644 datovka-4.18.0.tar.xz delete mode 100644 datovka-4.18.0.tar.xz.sha256 create mode 100644 datovka-4.19.0.tar.xz create mode 100644 datovka-4.19.0.tar.xz.sha256 diff --git a/datovka-4.18.0.tar.xz b/datovka-4.18.0.tar.xz deleted file mode 100644 index 619aae3..0000000 --- a/datovka-4.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d57112450532be66f1c14efaa909ab71c3c34e123a2201393cd0b144808d8ef -size 2966652 diff --git a/datovka-4.18.0.tar.xz.sha256 b/datovka-4.18.0.tar.xz.sha256 deleted file mode 100644 index bf03dae..0000000 --- a/datovka-4.18.0.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -5d57112450532be66f1c14efaa909ab71c3c34e123a2201393cd0b144808d8ef diff --git a/datovka-4.19.0.tar.xz b/datovka-4.19.0.tar.xz new file mode 100644 index 0000000..9e867cb --- /dev/null +++ b/datovka-4.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14f27bb1f313ee818e1c4aaa246925b8f548918c70f351495df7c9385db27b6e +size 2978904 diff --git a/datovka-4.19.0.tar.xz.sha256 b/datovka-4.19.0.tar.xz.sha256 new file mode 100644 index 0000000..1878137 --- /dev/null +++ b/datovka-4.19.0.tar.xz.sha256 @@ -0,0 +1 @@ +14f27bb1f313ee818e1c4aaa246925b8f548918c70f351495df7c9385db27b6e diff --git a/datovka.changes b/datovka.changes index 9f9fbd0..0eea0c7 100644 --- a/datovka.changes +++ b/datovka.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Feb 1 06:50:56 UTC 2022 - Jiri Slaby + +- Update to 4.19.0 + * Stored message envelope is updated when the type of a commercial message + changes (e.g. when consuming the prepaid answer). + * The application is downloading information about the state of the long term + storage. This build requires libdatovka-0.2.1. + * Messages which are going to be deleted from ISDS can be displayed using a + user-specified colour. + * Fixed a memory leak occurring while initialising the application. + * Fixed compilation when using GCC 11. + * Modified sources to compile with Qt-6.1 and Qt-6.2. Qt-6.0 still causes + compilation issues. (Qt-6.0 should be fixed instead.) + * Fixed a bug in a conversion function causing struct tm to Epoch time + conversion errors when converted value fits within an interval limited by + midnight and the time zone difference. + * Suppressed notification dialogues when uploading into records management + service as too many of them were generated occasionally. + ------------------------------------------------------------------- Mon Aug 30 06:35:45 UTC 2021 - Jiri Slaby diff --git a/datovka.spec b/datovka.spec index 2190f9d..42d4124 100644 --- a/datovka.spec +++ b/datovka.spec @@ -1,7 +1,7 @@ # # spec file for package datovka # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: datovka -Version: 4.18.0 +Version: 4.19.0 Release: 0 Summary: Library to access Czech eGov system "Datove schranky" License: GPL-3.0-or-later @@ -45,8 +45,8 @@ Obsoletes: python-dslib %if 0%{?suse_version} < 1330 Requires(post): hicolor-icon-theme Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files +Requires(postun):hicolor-icon-theme +Requires(postun):update-desktop-files %endif %description From d048a8b398ffd67d4d85a97a4f2793383f4c3e6b5d92cc5e40744d075afd58d0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 1 Feb 2022 07:57:07 +0000 Subject: [PATCH 2/5] qt6 OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=46 --- datovka-fix-pro.patch | 2 +- datovka.changes | 1 + datovka.spec | 54 +++++++++++++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/datovka-fix-pro.patch b/datovka-fix-pro.patch index dd5c143..2b47748 100644 --- a/datovka-fix-pro.patch +++ b/datovka-fix-pro.patch @@ -40,7 +40,7 @@ Index: datovka-4.13.0/datovka.pro - -g -O0 -std=c++11 \ - -Wall -Wextra -pedantic \ - -Wdate-time -Wformat -Werror=format-security -+ -g -std=c++11 $$(CXXFLAGS) \ ++ -g $$(CXXFLAGS) \ + -Wall -Wextra -pedantic #INCLUDEPATH += diff --git a/datovka.changes b/datovka.changes index 0eea0c7..0872b1f 100644 --- a/datovka.changes +++ b/datovka.changes @@ -17,6 +17,7 @@ Tue Feb 1 06:50:56 UTC 2022 - Jiri Slaby midnight and the time zone difference. * Suppressed notification dialogues when uploading into records management service as too many of them were generated occasionally. +- switch to Qt6 on Tumbleweed ------------------------------------------------------------------- Mon Aug 30 06:35:45 UTC 2021 - Jiri Slaby diff --git a/datovka.spec b/datovka.spec index 42d4124..95a93de 100644 --- a/datovka.spec +++ b/datovka.spec @@ -16,6 +16,16 @@ # +%if 0%{?suse_version} > 1500 +%define qt_version 6 +%define qt_version_full 6.2.0 +%define lrelease lrelease6 +%else +%define qt_version 5 +%define qt_version_full 5.4.1 +%define lrelease lrelease-qt5 +%endif + Name: datovka Version: 4.19.0 Release: 0 @@ -27,18 +37,28 @@ Source0: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-% Source1: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-%{version}.tar.xz.sha256 # PATCH-FIX-UPSTREAM: remove some issues with current .pro file Patch0: datovka-fix-pro.patch +%if 0%{qt_version} == 6 +# private-devel is only temporary to fix "Library 'libatomic' is not defined." +BuildRequires: qt6-base-private-devel +BuildRequires: qt6-tools-linguist +%else BuildRequires: libqt5-linguist +%endif BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: cmake(Qt%{qt_version}Core) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}PrintSupport) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Sql) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Svg) >= %{qt_version_full} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{qt_version_full} BuildRequires: pkgconfig(libdatovka) >= 0.1.2 +%if 0%{qt_version} == 6 +Requires: qt6-sql-sqlite +%else Requires: libqt5_sql_backend +%endif Recommends: %{name}-lang # Included inside with different approach Obsoletes: python-dslib @@ -59,18 +79,31 @@ Data Box Information System) SOAP services as defined in Czech ISDS Act %prep %autosetup -p1 sed -i \ - -e 's:lrelease:lrelease-qt5:g' \ + -e 's:lrelease:%{lrelease}:g' \ %{name}.pro %build export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -lrelease-qt5 datovka.pro +%if 0%{qt_version} == 6 +export CXXFLAGS="-std=c++17 %{optflags}" +%else +export CXXFLAGS="-std=c++11 %{optflags}" +%endif +%{lrelease} datovka.pro +%if 0%{qt_version} == 6 +%qmake6 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 +%qmake6_build +%else %qmake5 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 %make_jobs +%endif %install +%if 0%{qt_version} == 6 +%qmake6_install +%else %qmake5_install +%endif # fix desktop file sed -i \ @@ -99,6 +132,7 @@ rm -rf %{buildroot}%{_datadir}/datovka/doc %dir %{_datadir}/datovka/localisations/ %{_datadir}/datovka/localisations/datovka_cs.qm %{_datadir}/datovka/localisations/datovka_en.qm +%dir %{_datadir}/icons/hicolor/ %{_datadir}/icons/hicolor/* %changelog From c535d5c5e2256a3291156ef3654eca105875c4bd30e2370ad6a5cff9ca83af3c Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 1 Feb 2022 08:11:59 +0000 Subject: [PATCH 3/5] require less private pkgs OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=47 --- datovka.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datovka.spec b/datovka.spec index 95a93de..befa95e 100644 --- a/datovka.spec +++ b/datovka.spec @@ -39,7 +39,7 @@ Source1: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-% Patch0: datovka-fix-pro.patch %if 0%{qt_version} == 6 # private-devel is only temporary to fix "Library 'libatomic' is not defined." -BuildRequires: qt6-base-private-devel +BuildRequires: qt6-core-private-devel BuildRequires: qt6-tools-linguist %else BuildRequires: libqt5-linguist From b51ce47eb749df64a01b146d06a158822e0c0dd04fa5a65b250eb7df295db140 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 1 Feb 2022 08:16:02 +0000 Subject: [PATCH 4/5] workaround QMAKE_LIBS_LIBATOMIC OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=48 --- datovka.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datovka.spec b/datovka.spec index befa95e..4505057 100644 --- a/datovka.spec +++ b/datovka.spec @@ -38,8 +38,6 @@ Source1: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-% # PATCH-FIX-UPSTREAM: remove some issues with current .pro file Patch0: datovka-fix-pro.patch %if 0%{qt_version} == 6 -# private-devel is only temporary to fix "Library 'libatomic' is not defined." -BuildRequires: qt6-core-private-devel BuildRequires: qt6-tools-linguist %else BuildRequires: libqt5-linguist @@ -91,7 +89,9 @@ export CXXFLAGS="-std=c++11 %{optflags}" %endif %{lrelease} datovka.pro %if 0%{qt_version} == 6 -%qmake6 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 +# QMAKE_LIBS_LIBATOMIC= is only temporary to fix: +# "Library 'libatomic' is not defined." +%qmake6 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 QMAKE_LIBS_LIBATOMIC= %qmake6_build %else %qmake5 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1 From ca50e7fd006aa3a35a017d2aaf287a4c9d2ea6faa2b08c4f8b9dcd653ace0948 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 2 Feb 2022 07:31:48 +0000 Subject: [PATCH 5/5] add sqlite requires OBS-URL: https://build.opensuse.org/package/show/network/datovka?expand=0&rev=49 --- datovka.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datovka.spec b/datovka.spec index 4505057..08a40b7 100644 --- a/datovka.spec +++ b/datovka.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libdatovka) >= 0.1.2 %if 0%{qt_version} == 6 Requires: qt6-sql-sqlite %else -Requires: libqt5_sql_backend +Requires: libqt5-sql-sqlite %endif Recommends: %{name}-lang # Included inside with different approach