Merge remote-tracking branch 'origin/master'

.github/FUNDING.yml

@@ -0,0 +1 @@
+liberapay: ilpianista

.github/workflows/build.yml

@@ -0,0 +1,61 @@
+name: SailfishOS build
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Prepare
+      run: mkdir output
+
+    - name: Build armv7hl
+      id: build_armv7hl
+      uses: coderus/github-sfos-build@master
+      with:
+        release: 4.4.0.58
+
+    - name: Build i486
+      id: build_i486
+      uses: coderus/github-sfos-build@master
+      with:
+        release: 4.4.0.58
+        arch: i486
+
+    - name: Build i486
+      id: build_aarch64
+      uses: coderus/github-sfos-build@master
+      with:
+        release: 4.4.0.58
+        arch: aarch64
+
+    - name: Upload build result
+      uses: actions/upload-artifact@v2
+      with:
+        name: rpms
+        path: RPMS
+
+    - name: Create release
+      if: contains(github.ref, 'release')
+      run: |
+        set -x
+        assets=()
+        for asset in RPMS/*.rpm; do
+          assets+=("-a" "$asset")
+        done
+        tag_name="${GITHUB_REF##*/}"
+        hub release create "${assets[@]}" -m "$tag_name" "$tag_name"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.gitlab-ci.yml

@@ -1,64 +0,0 @@
-stages:
-  - build
-  - test
-  - publish
-
-.build:
-  stage: build
-  variables:
-    ARCH: armv7hl
-    SFOS_VERSION: "3.4.0.24"
-  image: coderus/sailfishos-platform-sdk:${SFOS_VERSION}
-  artifacts:
-    paths:
-      - "output/*"
-  script:
-    - mkdir output
-    - mkdir ~/build
-    - cp -r * ~/build
-    - pushd ~/build
-    - mb2 -t SailfishOS-$SFOS_VERSION-$ARCH build
-    - popd
-    - cp -v ~/build/RPMS/* output
-  only:
-    - merge_requests
-    - tags
-
-build_armv7hl:
-  extends: .build
-
-build_i486:
-  extends: .build
-  variables:
-    ARCH: i486
-
-build_aarch64:
-  extends: .build
-  variables:
-    ARCH: aarch64
-
-test:validate-rpms:
-  stage: test
-  image: registry.gitlab.com/whisperfish/sailo-rs/rpm-validator:latest
-  allow_failure: true
-  needs:
-    - build_armv7hl
-    - build_i486
-    - build_aarch64
-  script:
-    - rpmvalidation.sh output/*.rpm
-  only:
-    - merge_requests
-    - tags
-
-publish:
-  image: inetprocess/gitlab-release
-  stage: publish
-  needs:
-    - build_armv7hl
-    - build_i486
-    - build_aarch64
-  only:
-    - tags
-  script:
-    - gitlab-release --message 'Release $CI_COMMIT_TAG' output/*

Papocchio.pro

@@ -2,6 +2,8 @@ TARGET = harbour-papocchio
 
 CONFIG += sailfishapp
 
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
+
 SOURCES += \
     src/main.cpp
 

README.md

@@ -2,8 +2,6 @@
 
 A free-hand draw application for [Sailfish OS](https://sailfishos.org).
 
-[![Build Status](https://gitlab.com/ilpianista/harbour-Papocchio/badges/master/pipeline.svg)](https://gitlab.com/ilpianista/harbour-Papocchio/pipelines)
-
 ## Translations
 
 [![Translation status](https://hosted.weblate.org/widgets/harbour-papocchio/-/svg-badge.svg)](https://hosted.weblate.org/engage/harbour-papocchio/?utm_source=widget)
@@ -11,6 +9,7 @@ A free-hand draw application for [Sailfish OS](https://sailfishos.org).
 Translations via [Weblate](https://hosted.weblate.org/projects/harbour-papocchio/), thank you!
 
 ## Icon
+
 The icon has been taken from [ICONSDB](http://www.iconsdb.com/royal-blue-icons/edit-5-icon.html).
 
 ## Donate

harbour-papocchio.desktop

@@ -6,3 +6,8 @@ Icon=harbour-papocchio
 Exec=harbour-papocchio
 Name=Papocchio
 Comment=Draw using your finger!
+
+[X-Sailjail]
+Permissions=Pictures
+OrganizationName=it.andreascarpino
+ApplicationName=harbour-papocchio

rpm/harbour-papocchio.spec

@@ -37,14 +37,14 @@ DeveloperName: Andrea Scarpino
 Categories:
  - Graphics
 Custom:
-  Repo: https://gitlab.com/ilpianista/harbour-Papocchio
-Icon: https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg
+  Repo: https://github.com/ilpianista/harbour-Papocchio
+Icon: https://github.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg
 Screenshots:
- - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png
- - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png
+ - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png
+ - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png
 Url:
-  Homepage: https://gitlab.com/ilpianista/harbour-Papocchio
-  Bugtracker: https://gitlab.com/ilpianista/harbour-Papocchio/-/issues
+  Homepage: https://github.com/ilpianista/harbour-Papocchio
+  Bugtracker: https://github.com/ilpianista/harbour-Papocchio/-/issues
   Donation: https://paypal.me/andreascarpino
 %endif
 

rpm/harbour-papocchio.yaml

@@ -21,14 +21,14 @@ Description: |
   Categories:
    - Graphics
   Custom:
-    Repo: https://gitlab.com/ilpianista/harbour-Papocchio
-  Icon: https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg
+    Repo: https://github.com/ilpianista/harbour-Papocchio
+  Icon: https://github.com/ilpianista/harbour-Papocchio/-/raw/master/icons/harbour-papocchio.svg
   Screenshots:
-   - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png
-   - https://gitlab.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png
+   - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_1.png
+   - https://github.com/ilpianista/harbour-Papocchio/-/raw/master/screenshots/screenshot_2.png
   Url:
-    Homepage: https://gitlab.com/ilpianista/harbour-Papocchio
-    Bugtracker: https://gitlab.com/ilpianista/harbour-Papocchio/-/issues
+    Homepage: https://github.com/ilpianista/harbour-Papocchio
+    Bugtracker: https://github.com/ilpianista/harbour-Papocchio/-/issues
     Donation: https://paypal.me/andreascarpino
   %endif
 Configure: none