From bde421d6c854587bb897003d5df188ee6afc00c3 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 12 Sep 2023 02:49:35 +0200 Subject: [PATCH 01/25] [harbour-storeman.changes] Add second record --- rpm/harbour-storeman.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 32fc915f..c39cf4f7 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,5 +1,6 @@ * Mon Sep 18 2023 olf - 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) - * Mon Sep 11 2023 olf - 0.3.7 From 8154c5c6e125767f769298deb2f88109e64b1537 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 14 Sep 2023 23:51:50 +0200 Subject: [PATCH 02/25] [build-devel.yml] Beautify --- .github/workflows/build-devel.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml index 05d2a27b..0f75430c 100644 --- a/.github/workflows/build-devel.yml +++ b/.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 From 3e11ed47cee402693c2555bc9d43f1be9e40718b Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 14 Sep 2023 23:52:06 +0200 Subject: [PATCH 03/25] [build-sfos3.1.yml] Beautify --- .github/workflows/build-sfos3.1.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sfos3.1.yml b/.github/workflows/build-sfos3.1.yml index e2e095ee..ffeac511 100644 --- a/.github/workflows/build-sfos3.1.yml +++ b/.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 From 36a96868f6f370abc669294a7b7448f74cd7a66e Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 14 Sep 2023 23:52:23 +0200 Subject: [PATCH 04/25] [build-sfos3.3.yml] Beautify --- .github/workflows/build-sfos3.3.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sfos3.3.yml b/.github/workflows/build-sfos3.3.yml index bbfca767..5faa3a67 100644 --- a/.github/workflows/build-sfos3.3.yml +++ b/.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 From f8011942fc5435572f94fd827651c6e04617da1b Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 14 Sep 2023 23:52:38 +0200 Subject: [PATCH 05/25] [build-sfos4.2.yml] Beautify --- .github/workflows/build-sfos4.2.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sfos4.2.yml b/.github/workflows/build-sfos4.2.yml index 7bef6fec..62c7537f 100644 --- a/.github/workflows/build-sfos4.2.yml +++ b/.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 From 2bac97ec1ee7c0e275928ee731dba48d951688f3 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 14 Sep 2023 23:52:53 +0200 Subject: [PATCH 06/25] [build-sfos4.2_latest.yml] Beautify --- .github/workflows/build-sfos4.2_latest.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index a757d14f..9ce53bce 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.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://github.com/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 From 543ed3f48dd19b4f8b49f3d7cef8a45326bb015c Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 15 Sep 2023 00:10:23 +0200 Subject: [PATCH 07/25] [build-sfos4.2_latest.yml] Add "+" --- .github/workflows/build-sfos4.2_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index 9ce53bce..192a5ac4 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.github/workflows/build-sfos4.2_latest.yml @@ -75,7 +75,7 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results_SFOS${{ env.RELEASE }} + name: RPM-build-results_SFOS${{ env.RELEASE }}+ path: RPMS/ # Just for fun, see https://feathericons.com/ and From e960d728fc8e01d78befdc8b99f653a2f3ca0ba3 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 17 Sep 2023 16:50:31 +0200 Subject: [PATCH 08/25] [harbour-storeman.spec] Use `%{name}` even more --- rpm/harbour-storeman.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index 8ea265be..60a78f4c 100644 --- a/rpm/harbour-storeman.spec +++ b/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: From 5c06eb48a964dc14c80f5a0db7c27b73d419adf5 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 17 Sep 2023 23:03:51 +0200 Subject: [PATCH 09/25] [README.md] Enhance link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 231f10f1..c0af8a0f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The [Storeman Installer](https://github.com/storeman-developers/harbour-storeman ## 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://github.com/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](https:./translations#readme). ## Screenshots of Storeman From 57890954b91421f074281353fb9fbcb7df90c27b Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 17 Sep 2023 23:10:13 +0200 Subject: [PATCH 10/25] [README.md] Simplify --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0af8a0f..d4f108db 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The [Storeman Installer](https://github.com/storeman-developers/harbour-storeman ## 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:./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 From 3bb3c6150f08ea0a93f0ee84478d7e9089bd3029 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 27 Sep 2023 13:21:02 +0200 Subject: [PATCH 11/25] [translations/README.md] Remove stray space character --- translations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.md b/translations/README.md index 991bb725..a8cb0097 100644 --- a/translations/README.md +++ b/translations/README.md @@ -10,7 +10,7 @@ If you do not want to use Atlassian's Transifex, alternatives are [Qt Linguist]( ### Testing translations -Note that translations for Storeman are utilising *ID based* Qt `ts` files. Hence, to compile a translation file for testing, the `lrelease` command must be executed with the option `-idbased` to convert the translation files (`.ts` files) into Qt message files (`.qm` files) , either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html): +Note that translations for Storeman are utilising *ID based* Qt `ts` files. Hence, to compile a translation file for testing, the `lrelease` command must be executed with the option `-idbased` to convert the translation files (`.ts` files) into Qt message files (`.qm` files), either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html): ``` lrelease -idbased harbour-storeman.ts ``` From b22d1788f2f04c28b8a41d804c00333aea1d6093 Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 29 Sep 2023 04:41:43 +0200 Subject: [PATCH 12/25] [README.md] Enhance table of screenshots --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d4f108db..38f3bab2 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,16 @@ If you want to translate Storeman to a language it does not support yet or enhan ## Screenshots of Storeman -| | | | | -| --- | --- | --- | --- | +| | | | | +| :---: | :---: | :---: | :---: | +| | | | | | ![RecentAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.png) | +| Recently updated Apps | App details | Comments | Commenting | +| | | | | +| | | | | | ![RepositoriesPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) | +| Repositories | Installed Apps | Bookmarks | Repository | +| | | | | ## Credits From c944cbd1545c0159887bd7e691728e0be4fb9323 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 30 Sep 2023 02:11:25 +0200 Subject: [PATCH 13/25] [README.md] Improve picture descriptions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38f3bab2..33e815f1 100644 --- a/README.md +++ b/README.md @@ -49,11 +49,11 @@ If you want to translate Storeman to a language it does not support yet or enhan | :---: | :---: | :---: | :---: | | | | | | | ![RecentAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.png) | -| Recently updated Apps | App details | Comments | Commenting | +| Recently updated Apps | App details | App's comments | Commenting | | | | | | | | | | | | ![RepositoriesPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) | -| Repositories | Installed Apps | Bookmarks | Repository | +| Manage repositories | Installed Apps | Bookmarked Apps | Repository details | | | | | | ## Credits From a3b049686c8003647351e1e1339ac842e5785d53 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 30 Sep 2023 02:17:16 +0200 Subject: [PATCH 14/25] [README.md] Fix table rendering by inserting ` '`s --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 33e815f1..fa3f977b 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you want to translate Storeman to a language it does not support yet or enhan | :---: | :---: | :---: | :---: | | | | | | | ![RecentAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.png) | -| Recently updated Apps | App details | App's comments | Commenting | +| Recently updated Apps |         App details         | App's comments | Commenting | | | | | | | | | | | | ![RepositoriesPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) | From 0fa0359bddb87dcc940e28894992f8f65289967e Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 1 Oct 2023 01:57:02 +0200 Subject: [PATCH 15/25] =?UTF-8?q?[Update=20README.md]=20Final=20screenshot?= =?UTF-8?q?s-table=20formatting=20fix-up=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …, hopefully. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa3f977b..5643d5d2 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you want to translate Storeman to a language it does not support yet or enhan | :---: | :---: | :---: | :---: | | | | | | | ![RecentAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.png) | -| Recently updated Apps |         App details         | App's comments | Commenting | +| Recently updated Apps |          App details           |      App's comments      |         Commenting         | | | | | | | | | | | | ![RepositoriesPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) | From b671ecd11255222b17a6ec727e74d03c76b80774 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 1 Oct 2023 02:03:02 +0200 Subject: [PATCH 16/25] [README.md] Prefix latest release version image with `Current` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5643d5d2..2cf3d090 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ OpenRepos client application for SailfishOS -[![Release](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https://github.com/storeman-developers/harbour-storeman/releases) +`Current`[![Current relse](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https://github.com/storeman-developers/harbour-storeman/releases) ## Feature set From 3c5f2611fdc6937ebf2a9f2b8ec3be4ffb200734 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 5 Oct 2023 02:05:33 +0200 Subject: [PATCH 17/25] [README.md] Use relative image links --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2cf3d090..dd6a3251 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ -# ![Storeman icon 86x86](https://github.com/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 - -`Current`[![Current relse](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https://github.com/storeman-developers/harbour-storeman/releases) +`Current`[![Current release](https://img.shields.io/github/release/storeman-developers/harbour-storeman.svg)](https://github.com/storeman-developers/harbour-storeman/releases) ## Feature set @@ -48,11 +47,11 @@ If you want to translate Storeman to a language it does not support yet or enhan | | | | | | :---: | :---: | :---: | :---: | | | | | | -| ![RecentAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-01.png) | ![AppPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-02.png) | ![CommentsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-03.png) | ![Commenting](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-04.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) | | Recently updated Apps |          App details           |      App's comments      |         Commenting         | | | | | | | | | | | -| ![RepositoriesPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-06.png) | ![InstalledAppsPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-07.png) | ![BookmarksPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-08.png) | ![RepositoryPage](https://github.com/storeman-developers/harbour-storeman/raw/master/.xdata/screenshots/screenshot-screenshot-storeman-09.png) | +| ![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) | | Manage repositories | Installed Apps | Bookmarked Apps | Repository details | | | | | | @@ -67,4 +66,4 @@ If you want to translate Storeman to a language it does not support yet or enhan - [Christoph (inta)](https://github.com/inta) - [Miklós Márton (martonmiklos)](https://github.com/martonmiklos) - [OpenRepos service](https://openrepos.net/content/basil/about-openrepos) by [Basil Semuonov (custodian / thecust)](https://github.com/custodian) -- [Storeman icon](https://github.com/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) From f1d0ee1405c7247d2e88feb06a226c00426a698f Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 2 Nov 2023 04:10:58 +0100 Subject: [PATCH 18/25] [harbour-storeman.qml] Fix typo in comment --- qml/harbour-storeman.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/harbour-storeman.qml b/qml/harbour-storeman.qml index a37cbdbb..25e9c07d 100644 --- a/qml/harbour-storeman.qml +++ b/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() } From b5a4d10b6812bd5b5a7c08fb11d1e5e6fd7c4029 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 31 Jan 2024 03:55:01 +0100 Subject: [PATCH 19/25] [README.md] "e.g.", instead of "e.g.," --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd6a3251..2d5b5600 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The [Storeman Installer](https://github.com/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://github.com/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 `, 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://github.com/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://github.com/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 `, 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://github.com/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) From 4931682ca36e8a565f13858082424bdea3160799 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 28 Feb 2024 17:01:11 +0100 Subject: [PATCH 20/25] [README.md] Update to current version from FlowPlayer --- translations/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/README.md b/translations/README.md index a8cb0097..e55befef 100644 --- a/translations/README.md +++ b/translations/README.md @@ -2,7 +2,7 @@ You can help localising Storeman to your language using [Transifex](https://app.transifex.com/mentaljam/harbour-storeman) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html). -Note that for Storeman principally translations designated with a country code only (e.g., `pt`) shall be created and maintained. Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g., `nl_BE`). +Note that for Storeman principally translations designated with a country code only (e.g. `pt`) shall be created and maintained. Only if a complete and well maintained translation for the sole country code exists, a country specific variant with a locale will be accepted (e.g. `nl_BE`). [Transifex](https://app.transifex.com/mentaljam/harbour-storeman) is the preferred way of submitting translations. Please do not send pull requests (PRs) with translations directly to GitHub, if you have a Transifex account. @@ -10,11 +10,11 @@ If you do not want to use Atlassian's Transifex, alternatives are [Qt Linguist]( ### Testing translations -Note that translations for Storeman are utilising *ID based* Qt `ts` files. Hence, to compile a translation file for testing, the `lrelease` command must be executed with the option `-idbased` to convert the translation files (`.ts` files) into Qt message files (`.qm` files), either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html): +Note that translations for Storeman are utilising *ID based* Qt `.ts` files. Hence, to compile a translation file for testing, the `lrelease` command must be executed with the option `-idbased` to convert the translation files (`.ts` files) into Qt message files (`.qm` files), either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html): ``` lrelease -idbased harbour-storeman.ts ``` -If you want to test your translation before publishing, you should compile it and copy the resulting `qm` file(s) to (requires root privileges) +If you want to test your translation before publishing, you should compile it and copy the resulting `.qm` file(s) to (requires root privileges): ``` /usr/share/harbour-storeman/translations ``` @@ -25,7 +25,7 @@ export LANG=sv; harbour-storeman ### Updating the source `.ts` file with source strings from source code -Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g., by `lupdate qml/ src/ *.desktop -ts translations/harbour-storeman.ts`), or tediously perform this manually, which hence is only suitable for small changes. +Developers and release managers can use the `lupdate` process, either from [within Qt Linguist](https://doc.qt.io/qtcreator/creator-editor-external.html) or directly [at the command line](https://doc.qt.io/qt-5/linguist-manager.html) (mind to [include all files with translatable strings](https://github.com/storeman-developers/harbour-storeman/pull/431#issuecomment-1659024529), e.g. by `lupdate qml/ src/ *.desktop -ts translations/harbour-storeman.ts`), or tediously perform this manually, which hence is only suitable for small changes. --------------------------------------------- From fdd9c5bf9eba01e78ccc518328254b728528ae46 Mon Sep 17 00:00:00 2001 From: citronalco <2651739+citronalco@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:59:07 +0100 Subject: [PATCH 21/25] Local RPMs: Replace QTSparql with QtDocGallery (#462) Because libqtsparql's QML API was dropped from Sailfish OS 4.5.0. --- qml/pages/LocalRpmsPage.qml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qml/pages/LocalRpmsPage.qml b/qml/pages/LocalRpmsPage.qml index 09adb5cf..8a99b198 100644 --- a/qml/pages/LocalRpmsPage.qml +++ b/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" } + ] } } From e33feff5bc10c89598a4f0cc99ce1459bbfde3c7 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 18 Mar 2024 21:53:57 +0100 Subject: [PATCH 22/25] [harbour-storeman.changes] Update for v0.3.8 (#464) --- rpm/harbour-storeman.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index c39cf4f7..3f41568d 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,7 +1,7 @@ -* Mon Sep 18 2023 olf - 0.3.8 +* Mon Mar 18 2024 olf - 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 - 0.3.7 - [harbour-storeman.ts] PRs #428 & #429 missed to adapt the base .ts file (#442) From 0bf36537923a4b2d2a58047e2fc11448da0f536b Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 18 Mar 2024 22:23:30 +0100 Subject: [PATCH 23/25] Add citronalco to contributors (#466) * [README.md] Add citronalco to contributors * [LICENSE] Add citronalco to contributors * [DevelopersModel.qml] Add citronalco to contributors --- LICENSE | 3 ++- README.md | 1 + qml/models/DevelopersModel.qml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 8def5541..70a81ee0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,9 @@ MIT License -Copyright (c) 2022-2023 olf (Olf0) +Copyright (c) 2022-2024 olf (Olf0) 2017-2022 Petr Tsymbarovich (mentaljam / osetr) 2019-2022 Björn Bidar (Thaodan) + 2024 citronalco 2020 Dmitry Gerasimov (dseight) 2019 Matti Viljanen (direc85) 2019 Miklós Márton (martonmiklos) diff --git a/README.md b/README.md index 2d5b5600..430ca57d 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ If you want to translate Storeman to a language it does not support yet or enhan - [olf (Olf0)](https://github.com/Olf0) - [Matti Viljanen (direc85)](https://github.com/direc85) - [Björn Bidar (Thaodan)](https://github.com/Thaodan) +- [citronalco](https://github.com/citronalco) - [Dmitry Gerasimov (dseight)](https://github.com/dseight) - [elros34](https://github.com/elros34) - [Christoph (inta)](https://github.com/inta) diff --git a/qml/models/DevelopersModel.qml b/qml/models/DevelopersModel.qml index b4483daf..5b74c249 100644 --- a/qml/models/DevelopersModel.qml +++ b/qml/models/DevelopersModel.qml @@ -22,6 +22,10 @@ ListModel { name: "Björn Bidar (Thaodan)" link: "https://github.com/Thaodan" }, + ListElement { + name: "citronalco" + link: "https://github.com/citronalco" + }, ListElement { name: "Dmitry Gerasimov (dseight)" link: "https://github.com/dseight" From 56eabead3ec6264ba094577b5f7761563cece06c Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 19 Mar 2024 00:39:57 +0100 Subject: [PATCH 24/25] =?UTF-8?q?[LocalRpmsPage.qml]=20Filter=20for=20`mim?= =?UTF-8?q?eType`=20instead=20of=20`fileName`=20to=20select=20RPM=20files?= =?UTF-8?q?=20=E2=80=A6=20(#463)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [LocalRpmsPage.qml] Filter for `mimeType` instead of `fileName` as [suggested by @pvuorela](https://github.com/storeman-developers/harbour-storeman/issues/461#issuecomment-1999185613). Enhances PR #462, which closed issue #461. --- qml/pages/LocalRpmsPage.qml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/qml/pages/LocalRpmsPage.qml b/qml/pages/LocalRpmsPage.qml index 8a99b198..f9d940e7 100644 --- a/qml/pages/LocalRpmsPage.qml +++ b/qml/pages/LocalRpmsPage.qml @@ -19,12 +19,7 @@ Page { properties: ["fileName", "filePath"] sortProperties: ["+fileName"] rootType: DocumentGallery.File - filter: GalleryFilterUnion { - filters: [ - GalleryEqualsFilter { property: "fileExtension"; value: "rpm" }, - GalleryEqualsFilter { property: "fileExtension"; value: "RPM" } - ] - } + filter: GalleryEqualsFilter { property: "mimeType"; value: "application/x-rpm" } } SilicaListView { From c8b347746b3c80b0bfadb9b4cf855354fd5e0805 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 19 Mar 2024 01:09:12 +0100 Subject: [PATCH 25/25] [harbour-storeman.changes] Update with final PR for 0.3.8-release1 --- rpm/harbour-storeman.changes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 3f41568d..f94bfc66 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,7 +1,8 @@ -* Mon Mar 18 2024 olf - 0.3.8 -- Rename branch sfos3.2 to sfos3.1 to reflect reality and avoid confusion (#454, #455) +* Tue Mar 19 2024 olf - 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 +- [Local RPMs page] Replace `QtSparql` with `QtDocGallery` (#462) by @citronalco, closes issue #461 +- [Local RPMs page] Filter for `mimeType` instead of `fileName` to select RPM files (#463), enhances PR #462 * Mon Sep 11 2023 olf - 0.3.7 - [harbour-storeman.ts] PRs #428 & #429 missed to adapt the base .ts file (#442)