From 23bb5969a6997a093233fad09bacfa4780311c5b Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Mon, 7 Nov 2022 01:56:41 +0300 Subject: [PATCH 1/3] name fix --- harbour-tooterb.desktop | 8 +- harbour-tooterb.pro.user | 936 +++------------------------------------ 2 files changed, 54 insertions(+), 890 deletions(-) diff --git a/harbour-tooterb.desktop b/harbour-tooterb.desktop index 34fe20f..5a56e04 100644 --- a/harbour-tooterb.desktop +++ b/harbour-tooterb.desktop @@ -3,10 +3,4 @@ Type=Application X-Nemo-Application-Type=silica-qt5 Icon=harbour-tooterb Exec=harbour-tooterb -Name=Tooter β - -#[X-Sailjail] -#OrganizationName=de.poetaster -#ApplicationName=harbour-tooterb -#Permissions=Compatibility;Internet;Camera;Audio;MediaIndexing;RemovableMedia;UserDirs - +Name=Tooter beta diff --git a/harbour-tooterb.pro.user b/harbour-tooterb.pro.user index c7e76d3..00aeb0a 100644 --- a/harbour-tooterb.pro.user +++ b/harbour-tooterb.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {ddbad1fa-3e15-4c49-99dc-7ab87bce53d2} + {80c7e70b-2f75-4f6b-a23a-207b74b49c68} ProjectExplorer.Project.ActiveTarget @@ -77,7 +77,7 @@ true true Builtin.DefaultTidyAndClazy - 4 + 8 @@ -89,10 +89,10 @@ 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 + AuroraOS-4.0.2.175-base-armv7hl (in aurora-os-build-engine) + AuroraOS-4.0.2.175-base-armv7hl (in aurora-os-build-engine) + AuroraOS-4.0.2.175-base-armv7hl.default + 0 0 0 @@ -102,8 +102,8 @@ - /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/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Debug + /home/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Debug true @@ -130,16 +130,20 @@ Mer.MerSdkStartStep + true + Mer.MerRepositoryRefreshStep + + reset true Mer.MerClearBuildEnvironmentStep - + true Qt4ProjectManager.MakeStep clean - 3 + 4 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -159,8 +163,8 @@ - /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/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Release + /home/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Release true @@ -187,16 +191,20 @@ Mer.MerSdkStartStep + true + Mer.MerRepositoryRefreshStep + + reset true Mer.MerClearBuildEnvironmentStep - + true Qt4ProjectManager.MakeStep clean - 3 + 4 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -217,8 +225,8 @@ - /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/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Profile + /home/alpha6/projects/AuroraProjects/build-harbour-tooterb-AuroraOS_4_0_2_175_base_armv7hl_in_aurora_os_build_engine-Profile true @@ -245,16 +253,20 @@ Mer.MerSdkStartStep + true + Mer.MerRepositoryRefreshStep + + reset true Mer.MerClearBuildEnvironmentStep - + true Qt4ProjectManager.MakeStep clean - 3 + 4 Clean Clean ProjectExplorer.BuildSteps.Clean @@ -281,11 +293,17 @@ QmakeProjectManager.MerRpmBuildStep - --sdk + true + SignTools.RpmSignExternalStep + /home/alpha6/projects/AuroraProjects/regular_cert.pem + /home/alpha6/projects/AuroraProjects/regular_key.pem + + + --sdk --silent true QmakeProjectManager.MerRpmDeployStep - 3 + 4 Deploy Deploy ProjectExplorer.BuildSteps.Deploy @@ -302,33 +320,14 @@ QmakeProjectManager.MerRpmBuildStep - true - QmakeProjectManager.MerRpmValidationStep - - 2 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - QmakeProjectManager.MerMb2RpmBuildConfiguration - - - - - true - QmakeProjectManager.MerPrepareTargetStep - - - true - QmakeProjectManager.MerMakeInstallBuildStep + false + SignTools.RpmSignExternalStep + + - --rsync true - QmakeProjectManager.MerRsyncDeployStep + QmakeProjectManager.MerRpmValidationStep 3 Deploy @@ -338,9 +337,9 @@ 1 false - QmakeProjectManager.MerRSyncDeployConfiguration + QmakeProjectManager.MerMb2RpmBuildConfiguration - 3 + 2 dwarf @@ -404,859 +403,30 @@ true - /home/mwa/src/sailfish/harbour-tooter - true + /home/alpha6/projects/AuroraProjects/harbour-tooter + false -1 3 + false 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 + QmakeProjectManager.MerRunConfiguration:/home/alpha6/projects/AuroraProjects/harbour-tooter/harbour-tooterb.pro + /home/alpha6/projects/AuroraProjects/harbour-tooter/harbour-tooterb.pro 1 false true false true - :0.0 + :0 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 From 87709ad778952b599652bd369dea4863447db933 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Tue, 21 Mar 2023 20:18:46 +0300 Subject: [PATCH 2/3] fix display name and dependency --- harbour-tooterb.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harbour-tooterb.desktop b/harbour-tooterb.desktop index 5a56e04..01e6fa9 100644 --- a/harbour-tooterb.desktop +++ b/harbour-tooterb.desktop @@ -3,4 +3,4 @@ Type=Application X-Nemo-Application-Type=silica-qt5 Icon=harbour-tooterb Exec=harbour-tooterb -Name=Tooter beta +Name=Tooter From 36838e0b77b698aa9dc3b5300858d2b6fbf5b128 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Tue, 21 Mar 2023 20:20:03 +0300 Subject: [PATCH 3/3] name fix reverted --- harbour-tooterb.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harbour-tooterb.desktop b/harbour-tooterb.desktop index 01e6fa9..5a56e04 100644 --- a/harbour-tooterb.desktop +++ b/harbour-tooterb.desktop @@ -3,4 +3,4 @@ Type=Application X-Nemo-Application-Type=silica-qt5 Icon=harbour-tooterb Exec=harbour-tooterb -Name=Tooter +Name=Tooter beta