Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:harbour-contrac.spec
@@ -2,10 +2,15 @@ %define version_major 0 %define version_minor 7 -%define version_revis 9 +%define version_revis 10 +%if %{defined sailfishos_version} +%define sailfish_version %{sailfishos_version} +%else +%define sailfish_version %( if [ -f /bin/awk ]; then awk -F= '$1=="VERSION_ID" { print $2 ;}' /etc/os-release \| cut -d'.' -f1-3 \| sed 's/\\./0/g'; fi ) +%endif Summary: Contrac -Version: 0.7.9 +Version: 0.7.10 Release: 1 Group: Qt/Qt License: GPLv2 @@ -16,6 +21,7 @@ Requires: protobuf-lite Requires: sailfishsecretsdaemon-secretsplugins-default Requires: qr-filter-qml-plugin +BuildRequires: make BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) @@ -25,7 +31,11 @@ BuildRequires: pkgconfig(protobuf-lite) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?sailfish_version} < 40500 BuildRequires: pkgconfig(quazip) +%else +BuildRequires: pkgconfig(quazip1-qt5) +%endif BuildRequires: pkgconfig(keepalive) BuildRequires: pkgconfig(nemonotifications-qt5) BuildRequires: pkgconfig(sailfishsecrets) @@ -66,6 +76,7 @@ DEFINES+='VERSION_MINOR=%{version_minor}' \ DEFINES+='VERSION_REVIS=%{version_revis}' \ DEFINES+='VERSION=\"\\\"\"%{version_major}.%{version_minor}.%{version_revis}\"\\\"\"' \ + SAILFISH_VERSION='%{sailfish_version}' \ %{name}.pro make %{?_smp_mflags}
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://github.com/llewelld/harbour-contrac.git</param> <param name="branch">master</param> - <param name="revision">0.7.9-1</param> + <param name="revision">0.7.10-1</param> </service> </services>
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/.github/workflows/build.yml ^
@@ -33,20 +33,20 @@ id: build_armv7hl uses: bionade24/github-sfos-build@master with: - release: 4.4.0.58 + release: 4.5.0.16 - name: Build aarch64 id: build_aarch64 uses: bionade24/github-sfos-build@master with: - release: 4.4.0.58 + release: 4.5.0.16 arch: aarch64 - name: Build i486 id: build_i486 uses: bionade24/github-sfos-build@master with: - release: 4.4.0.58 + release: 4.5.0.16 arch: i486 - name: Upload build result
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/config.pri ^
@@ -1,2 +1,3 @@ # Enable to force use of OpenSSL 1.1.1 or greater DEFINES += OPENSSL_GE_1_1_1 +DEFINES += "SAILFISH_VERSION=$$SAILFISH_VERSION"
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/contrac.pro ^
@@ -128,9 +128,14 @@ keepalive \ nemonotifications-qt5 \ protobuf-lite \ - quazip \ sailfishsecrets +lessThan(SAILFISH_VERSION, 40500) { + PKGCONFIG += quazip +} else { + PKGCONFIG += quazip1-qt5 +} + DEFINES += LINUX QT += dbus
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/contracd/contracd.pro ^
@@ -80,8 +80,13 @@ PKGCONFIG += \ openssl \ - protobuf-lite \ - quazip + protobuf-lite + +lessThan(SAILFISH_VERSION, 40500) { + PKGCONFIG += quazip +} else { + PKGCONFIG += quazip1-qt5 +} QT += dbus
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/contracd/src/zipistreambuffer.h ^
@@ -1,8 +1,14 @@ #ifndef ZIPISTREAMBUFFER_H #define ZIPISTREAMBUFFER_H -#include <quazip5/quazip.h> -#include <quazip5/quazipfile.h> +#if SAILFISH_VERSION < 40500 + #include <quazip5/quazip.h> + #include <quazip5/quazipfile.h> +#else + #include <quazip/quazip.h> + #include <quazip/quazipfile.h> +#endif + #include <iostream>
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/tests/tests.pro ^
@@ -26,8 +26,13 @@ mlite5 \ openssl \ nemonotifications-qt5 \ - protobuf-lite \ - quazip + protobuf-lite + +lessThan(SAILFISH_VERSION, 40500) { + PKGCONFIG += quazip +} else { + PKGCONFIG += quazip1-qt5 +} SOURCES += \ test_tracing.cpp
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/translations/harbour-contrac-de.ts ^
@@ -310,7 +310,7 @@ </message> <message id="contrac-settings_co_download-coverage"> <source>Download coverage</source> - <translation>Länderbereich</translation> + <translation>Länderabdeckung</translation> </message> <message id="contrac-settings_ts_perform-daily-update"> <source>Perform daily update</source> @@ -318,21 +318,21 @@ </message> <message id="contrac-settings_vb_approx_update-time"> <source>Approximate update time</source> - <translation>Vorrausichtliche Dauer des Updates</translation> + <translation>Voraussichtliche Update-Uhrzeit</translation> </message> <message id="contrac-settings_vb_approx_update-time-description"> <source>The app must be running for the update to trigger</source> <translation>Die App muss für die automatische Durchführung geöffnet sein</translation> </message> <message id="contrac-guid_invalid-guid"> - <source>Invalid QR-Code.</source> + <source>Invalid QR code.</source> <oldsource>Invalid GUID, please check your entry.</oldsource> <translation>Ungültiger QR-Code</translation> </message> <message id="contrac-main_bu_enter-guid"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <oldsource>Enter GUID</oldsource> - <translation>QR-Code Scannen</translation> + <translation>QR-Code scannen</translation> </message> <message id="contrac-main_la_test-result"> <source>Test result</source> @@ -380,7 +380,7 @@ <message id="contrac-main_nt_notification-upload-error-body"> <source>Diagnosis key upload failed</source> <extracomment>Upload error notification body</extracomment> - <translation>Hochladen de Diagnose-ID fehlgeschlagen</translation> + <translation>Hochladen der Diagnose-ID fehlgeschlagen</translation> </message> <message id="contrac-main_nt_notification-download-error-summary"> <source>Error</source> @@ -404,11 +404,11 @@ </message> <message id="contrac-main_nt_notification-app-name"> <source>Contrac</source> - <translation type="unfinished">Contrac</translation> + <translation>Contrac</translation> </message> <message id="contrac-main_nt_notification-sub-text"> <source>Exposure Notification App</source> - <translation type="unfinished">Kontakt-Verfolgungs-App</translation> + <translation>Kontaktverfolgungs-App</translation> </message> <message id="contrac-main_nt_notification-update-summary"> <source>Exposure level updated</source> @@ -424,15 +424,15 @@ </message> <message id="contrac-main_nt_notification-at-risk-summary"> <source>Consult your health service for appropriate action</source> - <translation>Berate dich beim Gesundheitsamt für eine angemessene Reaktion</translation> + <translation>Beraten Sie sich beim Gesundheitsamt bezüglich einer angemessenen Reaktion</translation> </message> <message id="contrac-main_la_status-unknown"> <source>Unknown</source> <translation>Unbekannt</translation> </message> <message id="contrac-qrscan_scan_qrcode"> - <source>Scan QR-Code</source> - <translation>QR-Code Scannen</translation> + <source>Scan QR code</source> + <translation>QR-Code scannen</translation> </message> </context> </TS>
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/translations/harbour-contrac-en.ts ^
@@ -327,12 +327,12 @@ <translation type="unfinished"></translation> </message> <message id="contrac-guid_invalid-guid"> - <source>Invalid QR-Code.</source> + <source>Invalid QR code.</source> <oldsource>Invalid GUID, please check your entry.</oldsource> <translation type="unfinished"></translation> </message> <message id="contrac-main_bu_enter-guid"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <oldsource>Enter GUID</oldsource> <translation type="unfinished"></translation> </message> @@ -433,7 +433,7 @@ <translation type="unfinished"></translation> </message> <message id="contrac-qrscan_scan_qrcode"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <translation type="unfinished"></translation> </message> </context>
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/translations/harbour-contrac-zh_CN.ts ^
@@ -327,12 +327,12 @@ <translation type="unfinished"></translation> </message> <message id="contrac-guid_invalid-guid"> - <source>Invalid QR-Code.</source> + <source>Invalid QR code.</source> <oldsource>Invalid GUID, please check your entry.</oldsource> <translation type="unfinished"></translation> </message> <message id="contrac-main_bu_enter-guid"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <oldsource>Enter GUID</oldsource> <translation type="unfinished"></translation> </message> @@ -433,7 +433,7 @@ <translation type="unfinished">未知</translation> </message> <message id="contrac-qrscan_scan_qrcode"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <translation type="unfinished"></translation> </message> </context>
[-] [+]	Changed	_service:tar_git:harbour-contrac-0.7.10.tar.bz2/translations/harbour-contrac.ts ^
@@ -327,12 +327,12 @@ <translation type="unfinished"></translation> </message> <message id="contrac-guid_invalid-guid"> - <source>Invalid QR-Code.</source> + <source>Invalid QR code.</source> <oldsource>Invalid GUID, please check your entry.</oldsource> <translation type="unfinished"></translation> </message> <message id="contrac-main_bu_enter-guid"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <oldsource>Enter GUID</oldsource> <translation type="unfinished"></translation> </message> @@ -433,7 +433,7 @@ <translation type="unfinished"></translation> </message> <message id="contrac-qrscan_scan_qrcode"> - <source>Scan QR-Code</source> + <source>Scan QR code</source> <translation type="unfinished"></translation> </message> </context>