Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:harbour-simplemahjong.spec
@@ -9,23 +9,39 @@ # << macros Summary: Simple Mahjong -Version: 1.0 +Version: 1.1.0 Release: 1 Group: Qt/Qt -License: GPL v3 +License: GPLv3 +BuildArch: noarch URL: http://poetaster.de Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-simplemahjong.yaml -Requires: sailfishsilica-qt5 >= 0.10.9 +Requires: libsailfishapp-launcher BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: desktop-file-utils - %description -a simple mahjong tile solitaire +a simple mahjong tile solitaire, via guhoffman's fork of the original green mahjong +%if "%{?vendor}" == "chum" +PackageName: Simple Mahjong +Type: desktop-application +Categories: + - Game +DeveloperName: Mark Washeim (poetaster) +Custom: + - Repo: https://github.com/poetaster/harbour-simplemahjong +Icon: https://raw.githubusercontent.com/poetaster/harbour-simplemahjong/master/icons/172x172/harbour-moremahjong.png +Screenshots: + - https://raw.githubusercontent.com/poetaster/harbour-simplemahjong/main/screen-1.jpg + - https://raw.githubusercontent.com/poetaster/harbour-simplemahjong/main/screen-2.jpg + - https://raw.githubusercontent.com/poetaster/harbour-simplemahjong/main/screen-3.jpg +Url: + Homepage: https://github.com/poetaster/harbour-simplemahjong + Donation: https://www.paypal.me/poetasterFOSS +%endif %prep %setup -q -n %{name}-%{version} @@ -59,7 +75,6 @@ %files %defattr(-,root,root,-) -%{_bindir} %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/poetaster/harbour-greenmahjong.git</param> <param name="branch">main</param> - <param name="revision">1.0-1</param> + <param name="revision">1.1.0</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Added	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/_service ^
@@ -0,0 +1,14 @@ +<services> + <service name="webhook"> + <param name="repourl">https://github.com/poetaster/harbour-greenmahjong.git</param> + <param name="branch">master</param> + </service> + <service name="tar_git"> + <param name="url">https://github.com/poetaster/harbour-greenmahjong.git</param> + <param name="branch">main</param> + <param name="revision"/> + <param name="token"/> + <param name="debian">N</param> + <param name="dumb">N</param> +</service></services> +
[-] [+]	Changed	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/harbour-simplemahjong.desktop ^
@@ -2,11 +2,11 @@ Type=Application X-Nemo-Application-Type=silica-qt5 Icon=harbour-simplemahjong -Exec=harbour-simplemahjong +Exec=sailfish-qml harbour-simplemahjong Name=Simple Mahjong Solitaire -# translation example: -# your app name in German locale (de) -# -# Remember to comment out the following line, if you do not want to use -# a different app name in German locale (de). + #Name[de]=harbour-simplemahjong + +[X-Sailjail] +OrganizationName=de.poetaster +ApplicationName=harbour-simplemahjong
[-] [+]	Changed	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/harbour-simplemahjong.pro ^
@@ -12,10 +12,7 @@ # The name of your application TARGET = harbour-simplemahjong -CONFIG += sailfishapp - -SOURCES += \ - src/harbour-simplemahjong.cpp +CONFIG += sailfishapp_qml DISTFILES += \ qml/cover/CoverPage.qml \ @@ -31,7 +28,6 @@ rpm/harbour-simplemahjong.changes.in \ rpm/harbour-simplemahjong.changes.run.in \ rpm/harbour-simplemahjong.spec \ - rpm/harbour-simplemahjong.yaml \ translations/*.ts \ harbour-simplemahjong.png \ harbour-simplemahjong.desktop
[-] [+]	Changed	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/harbour-simplemahjong.pro.user ^
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.12.2, 2021-04-23T08:33:05. --> +<!-- Written by QtCreator 4.15.2, 2022-03-15T11:16:30. --> <qtcreator> <data> <variable>EnvironmentId</variable> @@ -8,7 +8,7 @@ </data> <data> <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> + <value type="int">2</value> </data> <data> <variable>ProjectExplorer.Project.EditorSettings</variable> @@ -37,6 +37,7 @@ <value type="bool" key="EditorConfiguration.MouseHiding">true</value> <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value> <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> <value type="bool" key="EditorConfiguration.ShowMargin">false</value> <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> @@ -45,20 +46,35 @@ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> <value type="int" key="EditorConfiguration.TabSize">8</value> <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="bool" key="EditorConfiguration.UseIndenter">false</value> <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="QString" key="EditorConfiguration.ignoreFileTypes">.md, .MD, Makefile</value> <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value> </valuemap> </data> <data> <variable>ProjectExplorer.Project.PluginSettings</variable> <valuemap type="QVariantMap"> + <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks"> + <value type="bool" key="AutoTest.Framework.Boost">true</value> + <value type="bool" key="AutoTest.Framework.CTest">false</value> + <value type="bool" key="AutoTest.Framework.Catch">true</value> + <value type="bool" key="AutoTest.Framework.GTest">true</value> + <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value> + <value type="bool" key="AutoTest.Framework.QtTest">true</value> + </valuemap> + <valuemap type="QVariantMap" key="AutoTest.CheckStates"/> + <value type="int" key="AutoTest.RunAfterBuild">0</value> + <value type="bool" key="AutoTest.UseGlobal">true</value> <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/> <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value> <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value> <valuemap type="QVariantMap" key="ClangTools"> + <value type="bool" key="ClangTools.AnalyzeOpenFiles">false</value> <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value> <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value> <value type="int" key="ClangTools.ParallelJobs">2</value> @@ -72,19 +88,22 @@ <data> <variable>ProjectExplorer.Project.Target.0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish OS Build Engine)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish OS Build Engine)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-3.4.0.24-armv7hl</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> + <value type="QString" key="DeviceType">Mer.Device.Type</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish SDK Build Engine)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-3.4.0.24-armv7hl (in Sailfish SDK Build Engine)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{a9cce1d4-aa72-4b1e-aa6b-ddf7cd4a6d9c}</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="bool">true</value> <value type="int" key="EnableQmlDebugging">0</value> + <value type="bool" key="MerBuildConfiguration.SignPackages">false</value> + <value type="QString" key="MerBuildConfiguration.SigningPassphraseFile"></value> + <value type="QString" key="MerBuildConfiguration.SigningUser">mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931]</value> <value type="QString" key="MerSfdkConfigurationAspect.Options"></value> <value type="QString" key="MerSpecFileAspect.Path"></value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_OS_Build_Engine-Debug</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_OS_Build_Engine-Debug</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_SDK_Build_Engine-Debug</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_SDK_Build_Engine-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -93,18 +112,12 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -117,35 +130,37 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> </valuemap> <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/> <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="int" key="QtQuickCompiler">2</value> - <value type="int" key="SeparateDebugInfo">2</value> + <value type="int" key="RunSystemFunction">1</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="bool">true</value> - <value type="int" key="EnableQmlDebugging">2</value> + <value type="bool" key="MerBuildConfiguration.SignPackages">false</value> + <value type="QString" key="MerBuildConfiguration.SigningPassphraseFile"></value> + <value type="QString" key="MerBuildConfiguration.SigningUser">mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931]</value> <value type="QString" key="MerSfdkConfigurationAspect.Options"></value> <value type="QString" key="MerSpecFileAspect.Path"></value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_OS_Build_Engine-Release</value> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_OS_Build_Engine-Release</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_SDK_Build_Engine-Release</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-simplemahjong-SailfishOS_3_4_0_24_armv7hl_in_Sailfish_SDK_Build_Engine-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -154,18 +169,12 @@ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> @@ -178,35 +187,38 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value> + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value> </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
	Added	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/screen-1.jpg ^
	Added	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/screen-2.jpg ^
	Added	_service:tar_git:harbour-simplemahjong-1.1.0.tar.bz2/screen-3.jpg ^
[-] [+]	Deleted	_service:tar_git:harbour-simplemahjong.yaml ^
@@ -1,42 +0,0 @@ -Name: harbour-simplemahjong -Summary: Simple Mahjong -Version: 1.0 -Release: 1 -# The contents of the Group field should be one of the groups listed here: -# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS -Group: Qt/Qt -URL: http://poetaster.de -License: GPL v3 -# This must be generated before uploading a package to a remote build service. -# Usually this line does not need to be modified. -Sources: -- '%{name}-%{version}.tar.bz2' -Description: \| - a simple mahjong tile solitaire -Builder: qmake5 - -# This section specifies build dependencies that are resolved using pkgconfig. -# This is the preferred way of specifying build dependencies for your package. -PkgConfigBR: - - sailfishapp >= 1.0.2 - - Qt5Core - - Qt5Qml - - Qt5Quick - -# Build dependencies without a pkgconfig setup can be listed here -# PkgBR: -# - package-needed-to-build - -# Runtime dependencies which are not automatically detected -Requires: - - sailfishsilica-qt5 >= 0.10.9 - -# All installed files -Files: - - '%{_bindir}' - - '%{_datadir}/%{name}' - - '%{_datadir}/applications/%{name}.desktop' - - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' - -# For more information about yaml and what's supported in Sailfish OS -# build system, please see https://wiki.merproject.org/wiki/Spectacle