devel→master: Commits for 0.3.8-release1

.github/workflows/build-devel.yml

@@ -1,4 +1,4 @@
-name: CI - devel branch on SFOS 3.3.0 (i486)
+name: CI - devel branch on SDK for 3.3.0 (i486)
 
 env:
  RELEASE: 3.3.0.14
@@ -12,15 +12,16 @@ on:
 
 defaults:
  run:
- # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+ # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
  # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
  shell: sh
 
+# Do not use concurrency in order to enforce checking every commit of a Pull Request.
 # See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
-concurrency:
- group: ci-${{ github.ref_name }}
+#concurrency:
+ #group: ci-${{ github.ref_name }}
  # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple.
- cancel-in-progress: false
+ #cancel-in-progress: false
 
 jobs:
  build:
@@ -29,6 +30,7 @@ jobs:
  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes.
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
  steps:
+
  - name: Checkout
  uses: actions/checkout@v3
 
@@ -54,7 +56,7 @@ jobs:
  - name: Upload build result
  uses: actions/upload-artifact@v3
  with:
- name: RPM-build-results_devel-i486-sfos3.3.0+
+ name: RPM-build-results_devel-i486-SFOS3.3.0+
  path: RPMS/
 
 # Just for fun, see https://feathericons.com/ and

.github/workflows/build-sfos3.1.yml

@@ -1,4 +1,4 @@
-name: CI - sfos3.1 branch on SFOS 3.1.0 (armv7hl,i486)
+name: CI - sfos3.1 branch on SDK for 3.1.0 (armv7hl,i486)
 
 env:
  RELEASE: 3.1.0.12
@@ -14,10 +14,13 @@ on:
  pull_request:
  branches:
  - sfos3.1
+ # Allows to run this workflow manually from the Actions tab.
+ #workflow_dispatch:
+ # Rather set a new release in the spec file and a new tag in the format N/X.Y.Z (e.g., release2_sfos3.1/0.6.3) to build a release version again.
 
 defaults:
  run:
- # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+ # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
  # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
  shell: sh
 
@@ -34,6 +37,7 @@ jobs:
  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 5 minutes.
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
  steps:
+
  - name: Checkout
  uses: actions/checkout@v3
 
@@ -64,7 +68,7 @@ jobs:
  - name: Upload build results
  uses: actions/upload-artifact@v3
  with:
- name: RPM-build-results_sfos3.1.0-3.2.1
+ name: RPM-build-results_SFOS3.1.0-3.2.1
  path: RPMS/
 
 # Just for fun, see https://feathericons.com/ and

.github/workflows/build-sfos3.3.yml

@@ -1,4 +1,4 @@
-name: CI - sfos3.3 branch on SFOS 3.3.0 (armv7hl,i486) & SFOS 4.0.1 (aarch64)
+name: CI - sfos3.3 branch on SDK for 3.3.0 (armv7hl,i486) & for 4.0.1 (aarch64)
 
 env:
  RELEASE: 3.3.0.14
@@ -14,10 +14,13 @@ on:
  pull_request:
  branches:
  - sfos3.3
+ # Allows to run this workflow manually from the Actions tab.
+ #workflow_dispatch:
+ # Rather set a new release in the spec file and a new tag in the format N/X.Y.Z (e.g., release2_sfos3.3/0.6.3) to build a release version again.
 
 defaults:
  run:
- # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+ # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
  # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
  shell: sh
 
@@ -34,6 +37,7 @@ jobs:
  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
  steps:
+
  - name: Checkout
  uses: actions/checkout@v3
 
@@ -70,7 +74,7 @@ jobs:
  - name: Upload build results
  uses: actions/upload-artifact@v3
  with:
- name: RPM-build-results_sfos3.3.0-4.1.0
+ name: RPM-build-results_SFOS3.3.0-4.1.0
  path: RPMS/
 
 # Just for fun, see https://feathericons.com/ and

.github/workflows/build-sfos4.2.yml

@@ -1,4 +1,4 @@
-name: CI - sfos4.2 branch on SFOS 4.2.0 (aarch64,armv7hl,i486)
+name: CI - sfos4.2 branch on SDK for 4.2.0 (aarch64,armv7hl,i486)
 
 env:
  RELEASE: 4.2.0.21
@@ -14,10 +14,13 @@ on:
  pull_request:
  branches:
  - sfos4.2
+ # Allows to run this workflow manually from the Actions tab.
+ #workflow_dispatch:
+ # Rather set a new release in the spec file and a new tag in the format N/X.Y.Z (e.g., release2_sfos4.2/0.6.3) to build a release version again.
 
 defaults:
  run:
- # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+ # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
  # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
  shell: sh
 
@@ -34,6 +37,7 @@ jobs:
  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
  steps:
+
  - name: Checkout
  uses: actions/checkout@v3
 
@@ -70,7 +74,7 @@ jobs:
  - name: Upload build results
  uses: actions/upload-artifact@v3
  with:
- name: RPM-build-results_sfos4.2.0+
+ name: RPM-build-results_SFOS4.2.0+
  path: RPMS/
 
 # Just for fun, see https://feathericons.com/ and

.github/workflows/build-sfos4.2_latest.yml

@@ -1,8 +1,8 @@
-name: CI - sfos4.2 branch on latest SFOS (aarch64,armv7hl,i486)
+name: CI - sfos4.2 branch on latest SDK (aarch64,armv7hl,i486)
 
 env:
+ # For the latest available docker image, see https:/CODeRUS/docker-sailfishos-platform-sdk
  RELEASE: 4.5.0.16
- # See https://hub.docker.com/r/coderus/sailfishos-platform-sdk/tags
 
 on:
  push:
@@ -15,10 +15,13 @@ on:
  pull_request:
  branches:
  - sfos4.2
+ # Allows to run this workflow manually from the Actions tab.
+ #workflow_dispatch:
+ # Rather set a new release in the spec file and a new tag in the format N/X.Y.Z (e.g., release2_sfos4.2/0.6.3) to build a release version again.
 
 defaults:
  run:
- # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
+ # Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
  # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
  shell: sh
 
@@ -35,6 +38,7 @@ jobs:
  # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
  steps:
+
  - name: Checkout
  uses: actions/checkout@v3
 
@@ -71,7 +75,7 @@ jobs:
  - name: Upload build results
  uses: actions/upload-artifact@v3
  with:
- name: RPM-build-results_sfos-latest
+ name: RPM-build-results_SFOS${{ env.RELEASE }}+
  path: RPMS/
 
 # Just for fun, see https://feathericons.com/ and

README.md

@@ -1,8 +1,7 @@
-# ![Storeman icon 86x86](https:/storeman-developers/harbour-storeman/raw/master/icons/86x86/harbour-storeman.png)   **Storeman**
+# ![Storeman icon 86x86](./icons/86x86/harbour-storeman.png?raw=true)   **Storeman**
+**OpenRepos client application for SailfishOS**
 
-OpenRepos client application for SailfishOS
-
-[![Release](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https:/storeman-developers/harbour-storeman/releases)
+<sup><sub>`Current`</sub></sup>[![Current release](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https:/storeman-developers/harbour-storeman/releases)
 
 ## Feature set
 
@@ -36,19 +35,25 @@ The [Storeman Installer](https:/storeman-developers/harbour-storeman
 
 * If you experience issues when installing, removing or updating packages after a SailfishOS upgrade, try running `devel-su pkcon refresh` in a terminal app.
 * Starting with version 0.2.9, Storeman is built by the help of the SailfishOS-OBS and initially installed by the Storeman Installer (or manually). To update from Storeman < 0.2.9 (needs SailfishOS ≥ 3.1.0), one should reinstall Storeman via the Storeman Installer (which installs the current Storeman release, and since Storeman Installer 1.3.0 automatically removes a Storeman < 0.3.0 before that) or manually remove Storeman < 0.2.9 and install Storeman ≥ 0.3.0. After an initial installation of Storeman ≥ 0.3.0, further updates of Storeman will be performed within Storeman, as usual.
-* Before software can be build for a SailfishOS release at the SailfishOS-OBS, Jolla must create a [corresponding "download on demand (DoD)" OBS-repository](https://build.merproject.org/project/subprojects/sailfishos). It may take a little time after a new SailfishOS release is published before the corresponding "DoD" repository is being made available, during which installing Storeman by the Storeman Installer or updating Storeman by itself on a device with the new SailfishOS release already installed does not work, because Storeman cannot be compiled for this new SailfishOS release at the Sailfish-OBS, yet; consequently this is always the case for "closed beta (cBeta)" releases of SailfishOS. In such a situation one has to manually download Storeman built for the last prior SailfishOS "general availability (GA)" release (e.g., from [its releases section at GitHub](https:/storeman-developers/harbour-storeman/releases) or [the SailfishOS-OBS](https://build.merproject.org/project/show/home:olf:harbour-storeman)), then install or update Storeman via `pkcon install-local <downloaded RPM file>`, and hope that there is no change in the new SailfishOS release which breaks Storeman; if there is, please report that soon at [Storeman's issue tracker](https:/storeman-developers/harbour-storeman/issues).
+* Before software can be build for a SailfishOS release at the SailfishOS-OBS, Jolla must create a [corresponding "download on demand (DoD)" OBS-repository](https://build.merproject.org/project/subprojects/sailfishos). It may take a little time after a new SailfishOS release is published before the corresponding "DoD" repository is being made available, during which installing Storeman by the Storeman Installer or updating Storeman by itself on a device with the new SailfishOS release already installed does not work, because Storeman cannot be compiled for this new SailfishOS release at the Sailfish-OBS, yet; consequently this is always the case for "closed beta (cBeta)" releases of SailfishOS. In such a situation one has to manually download Storeman built for the last prior SailfishOS "general availability (GA)" release (e.g. from [its releases section at GitHub](https:/storeman-developers/harbour-storeman/releases) or [the SailfishOS-OBS](https://build.merproject.org/project/show/home:olf:harbour-storeman)), then install or update Storeman via `pkcon install-local <downloaded RPM file>`, and hope that there is no change in the new SailfishOS release which breaks Storeman; if there is, please report that soon at [Storeman's issue tracker](https:/storeman-developers/harbour-storeman/issues).
 * Disclaimer: Storeman and its installer may still have flaws, kill your kittens or break your SailfishOS installation! Although this is very unlikely after years of testing by many users, new flaws may be introduced in any release (as for any software). Mind that the license you implicitly accept by using Storeman or Storeman Installer excludes any liability.
 
 ## Translating Storeman (l10n / i18n)
 
-If you want to translate Storeman to a language it does not support yet or enhance an existing translation, please [read the translations-README](https:/storeman-developers/harbour-storeman/tree/master/translations#readme).
+If you want to translate Storeman to a language it does not support yet or enhance an existing translation, please [read the translations-README](./translations#readme).
 
 ## Screenshots of Storeman
 
-| | | | |
-| --- | --- | --- | --- |
-| ![RecentAppsPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.png) |
-| ![RepositoriesPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https:/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) |
+| | | | |
+| :---: | :---: | :---: | :---: |
+| | | | |
+| ![RecentAppsPage](./.xdata/screenshots/screenshot-screenshot-storeman-01.png?raw=true) | ![AppPage](./.xdata/screenshots/screenshot-screenshot-storeman-02.png?raw=true) | ![CommentsPage](./.xdata/screenshots/screenshot-screenshot-storeman-03.png?raw=true) | ![Commenting](./.xdata/screenshots/screenshot-screenshot-storeman-04.png?raw=true) |
+| <sub>Recently&nbsp;updated&nbsp;Apps</sub> | <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;App&nbsp;details&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub> | <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;App's&nbsp;comments&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub> | <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Commenting&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub> |
+| | | | |
+| | | | |
+| ![RepositoriesPage](./.xdata/screenshots/screenshot-screenshot-storeman-06.png?raw=true) | ![InstalledAppsPage](./.xdata/screenshots/screenshot-screenshot-storeman-07.png?raw=true) | ![BookmarksPage](./.xdata/screenshots/screenshot-screenshot-storeman-08.png?raw=true) | ![RepositoryPage](./.xdata/screenshots/screenshot-screenshot-storeman-09.png?raw=true) |
+| <sub>Manage repositories</sub> | <sub>Installed Apps</sub> | <sub>Bookmarked Apps</sub> | <sub>Repository details</sub> |
+| | | | |
 
 ## Credits
 
@@ -61,4 +66,4 @@ If you want to translate Storeman to a language it does not support yet or enhan
 - [Christoph (inta)](https:/inta)
 - [Miklós Márton (martonmiklos)](https:/martonmiklos)
 - [OpenRepos service](https://openrepos.net/content/basil/about-openrepos) by [Basil Semuonov (custodian / thecust)](https:/custodian)
-- [Storeman icon](https:/storeman-developers/harbour-storeman/raw/master/icons/harbour-storeman.svg) by [Laurent Chambon (Laurent_C)](https://mastodon.social/@Laurent_C)
+- [Storeman icon](./icons/harbour-storeman.svg) by [Laurent Chambon (Laurent_C)](https://mastodon.social/@Laurent_C)

qml/harbour-storeman.qml

@@ -364,7 +364,7 @@ ApplicationWindow
  updatesNotification.replacesId = replaceId
  updatesNotification.close()
  } else if (_showUpdatesNotification) {
- // Don't show notification if the app was openned from notification
+ // Don't show notification if the app was opened from notification
  updatesNotification.replacesId = replaceId
  updatesNotification.publish()
  }

qml/pages/LocalRpmsPage.qml

@@ -1,24 +1,29 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import QtSparql 1.0
+import QtDocGallery 5.0
 import harbour.orn 1.0
 
 Page {
  // Duplicate count property because items are not really deleted from the model
  property int _count: 0
 
- readonly property bool _ready: page.status === PageStatus.Active && queryModel.status === SparqlListModel.Ready
+ readonly property bool _ready: page.status === PageStatus.Active && (queryModel.status === DocumentGalleryModel.Idle || queryModel.status === DocumentGalleryModel.Finished)
 
  on_ReadyChanged: _ready && (_count = queryModel.count)
 
  id: page
  allowedOrientations: defaultAllowedOrientations
 
- SparqlListModel {
+ DocumentGalleryModel {
  id: queryModel
- query: "SELECT strafter(nie:url(?r), 'file://') as ?filePath WHERE { ?r nie:mimeType 'application/x-rpm' }"
- connection: SparqlConnection {
- driver: "QTRACKER_DIRECT"
+ properties: ["fileName", "filePath"]
+ sortProperties: ["+fileName"]
+ rootType: DocumentGallery.File
+ filter: GalleryFilterUnion {
+ filters: [
+ GalleryEqualsFilter { property: "fileExtension"; value: "rpm" },
+ GalleryEqualsFilter { property: "fileExtension"; value: "RPM" }
+ ]
  }
  }
 

rpm/harbour-storeman.changes

@@ -1,6 +1,7 @@
-* Mon Sep 18 2023 olf <[email protected]> - 0.3.8
+* Mon Mar 18 2024 olf <[email protected]> - 0.3.8
 - Rename branch sfos3.2 to sfos3.1 to reflect reality and avoid confusion (#454, #455)
-- 
+- [Workflows] Add recent changes from Patchmanager (#457)
+- [Local RPMs page] Replace QtSparql with QtDocGallery (#462) by @citronalco, closes issue #461
 
 * Mon Sep 11 2023 olf <[email protected]> - 0.3.7
 - [harbour-storeman.ts] PRs #428 & #429 missed to adapt the base .ts file (#442)

rpm/harbour-storeman.spec

@@ -78,7 +78,7 @@ Categories:
 DeveloperName: Storeman developers (mentaljam)
 Custom:
  Repo: %{url}
-PackageIcon: %{url}/raw/master/icons/harbour-storeman.svg
+PackageIcon: %{url}/raw/master/icons/%{name}.svg
 Screenshots:
  - %{url}/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png
  - %{url}/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png
@@ -122,9 +122,9 @@ then
  rm -f /var/cache/ssu/features.ini
  ssu_ur=yes
 fi
-if ! echo "$ssu_lr" | grep -Fq harbour-storeman-obs
+if ! echo "$ssu_lr" | grep -Fq %{name}-obs
 then
- ssu ar harbour-storeman-obs 'https://repo.sailfishos.org/obs/home:/olf:/harbour-storeman/%%(release)_%%(arch)/'
+ ssu ar %{name}-obs 'https://repo.sailfishos.org/obs/home:/olf:/%{name}/%%(release)_%%(arch)/'
  ssu_ur=yes
 fi
 if [ $ssu_ur = yes ]
@@ -146,7 +146,7 @@ exit 0
 %postun
 if [ $1 = 0 ] # Removal
 then
- ssu rr harbour-storeman-obs
+ ssu rr %{name}-obs
  rm -f /var/cache/ssu/features.ini
  ssu ur
  # Remove a %%{name}-installer log-file, if extant: