From 2e4ec198ccceafca59b2e736aa48d52e636ea454 Mon Sep 17 00:00:00 2001 From: Mark Washeim Date: Sun, 8 Oct 2023 11:21:36 +0200 Subject: [PATCH] Fix: add backwards compatible compression for rpms, meta data --- harbour-tooterb.desktop | 9 +- harbour-tooterb.pro.user | 860 +-------------------------------------- rpm/harbour-tooterb.spec | 2 +- src/harbour-tooterb.cpp | 1 + 4 files changed, 21 insertions(+), 851 deletions(-) diff --git a/harbour-tooterb.desktop b/harbour-tooterb.desktop index 34fe20f..8d0ecd1 100644 --- a/harbour-tooterb.desktop +++ b/harbour-tooterb.desktop @@ -5,8 +5,7 @@ Icon=harbour-tooterb Exec=harbour-tooterb Name=Tooter β -#[X-Sailjail] -#OrganizationName=de.poetaster -#ApplicationName=harbour-tooterb -#Permissions=Compatibility;Internet;Camera;Audio;MediaIndexing;RemovableMedia;UserDirs - +[X-Sailjail] +OrganizationName=de.poetaster +ApplicationName=harbour-tooterb +Permissions=Compatibility;Internet;Audio;MediaIndexing;RemovableMedia;UserDirs diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user index c7e76d3..3913f6a 100644 --- a/harbour-tooterb.pro.user +++ b/harbour-tooterb.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,21 +89,21 @@ ProjectExplorer.Project.Target.0 Mer.Device.Type - SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-aarch64 (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-aarch64.default - 1 + SailfishOS-4.5.0.18-aarch64 (in Sailfish SDK Build Engine) + SailfishOS-4.5.0.18-aarch64 (in Sailfish SDK Build Engine) + SailfishOS-4.5.0.18-aarch64.default + 0 0 0 0 false - + mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Debug + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Debug + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Debug true @@ -156,11 +156,11 @@ false - + mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Release + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Release + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Release true @@ -214,11 +214,11 @@ 0 false - + mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931] - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_aarch64_in_Sailfish_SDK_Build_Engine-Profile + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Profile + /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_5_0_18_aarch64_in_Sailfish_SDK_Build_Engine-Profile true @@ -424,839 +424,9 @@ 1 - - ProjectExplorer.Project.Target.1 - - Mer.Device.Type - SailfishOS-4.4.0.58-armv7hl (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-armv7hl (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-armv7hl.default - 0 - 0 - 0 - - 0 - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Debug - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - - - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Release - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - - - 0 - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_armv7hl_in_Sailfish_SDK_Build_Engine-Profile - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - 0 - - 3 - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerRpmBuildStep - - - --sdk - true - QmakeProjectManager.MerRpmDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - QmakeProjectManager.MerRpmBuildStep - - - true - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerMakeInstallBuildStep - - - --rsync - true - QmakeProjectManager.MerRsyncDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - true - /home/mwa/src/sailfish/harbour-tooter - false - -1 - 3 - - 1 - - harbour-tooterb (on %{Device:Name}) - QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - 1 - false - true - false - true - :0.0 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - true - /home/mwa/src/sailfish/harbour-tooter - false - -1 - 3 - - 1 - - harbour-tooterb - QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - /home/mwa/src/sailfish/harbour-tooter/harbour-tooterb.pro - 1 - false - true - false - true - :0.0 - - 2 - - - - ProjectExplorer.Project.Target.2 - - Mer.Device.Type - SailfishOS-4.4.0.58-i486 (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-i486 (in Sailfish SDK Build Engine) - SailfishOS-4.4.0.58-i486.default - 0 - 0 - 0 - - 0 - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Debug - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - - - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Release - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - - - 0 - false - - - - - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile - /home/mwa/src/sailfish/build-harbour-tooterb-SailfishOS_4_4_0_58_i486_in_Sailfish_SDK_Build_Engine-Profile - - - true - Mer.MerSdkStartStep - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 3 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Mer.MerSdkStartStep - - - reset - true - Mer.MerClearBuildEnvironmentStep - - - true - Qt4ProjectManager.MakeStep - clean - - 3 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 1 - 0 - - 3 - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerRpmBuildStep - - - --sdk - true - QmakeProjectManager.MerRpmDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRpmDeployConfiguration - - - - - true - QmakeProjectManager.MerRpmBuildStep - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerMakeInstallBuildStep - - - --rsync - true - QmakeProjectManager.MerRsyncDeployStep - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerRSyncDeployConfiguration - - 3 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - true - /home/mwa/src/sailfish/harbour-tooter - false - -1 - 3 - - 2 - - ProjectExplorer.CustomExecutableRunConfiguration - - false - true - false - true - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - - 25 - - 1 - true - false - true - - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - true - /home/mwa/src/sailfish/harbour-tooter - false - -1 - 3 - - 1 - - QmakeProjectManager.MerCustomRunConfiguration: - - 1 - false - true - false - true - :0.0 - - 2 - - ProjectExplorer.Project.TargetCount - 3 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec index 4b54440..9be666d 100644 --- a/rpm/harbour-tooterb.spec +++ b/rpm/harbour-tooterb.spec @@ -6,6 +6,7 @@ Name: harbour-tooterb # >> macros +%define _binary_payload w2.xzdio # << macros %{!?qtc_qmake:%define qtc_qmake %qmake} @@ -21,7 +22,6 @@ URL: https://github.com/poetaster/harbour-tooter#readme Source0: %{name}-%{version}.tar.bz2 Requires: sailfishsilica-qt5 >= 0.10.9 Requires: nemo-qml-plugin-configuration-qt5 -Requires: nemo-qml-plugin-notifications-qt5 Requires: amber-web-authorization BuildRequires: qt5-qttools-linguist diff --git a/src/harbour-tooterb.cpp b/src/harbour-tooterb.cpp index 80c8a37..54b5cd0 100644 --- a/src/harbour-tooterb.cpp +++ b/src/harbour-tooterb.cpp @@ -18,6 +18,7 @@ #include "notifications.h" #include "dbus.h" + int main(int argc, char *argv[]) { QScopedPointer app(SailfishApp::application(argc, argv));