devel→master: Final round of commits for v1.9.95-beta1 (#42)

* [pre-commit] Fix RegEx and optimise a bit * [pre-commit] Fix quoting * Delete `plugins/donaldduck`, because … (#38) … it only extracts the first picture of 5 strips, which rotate daily since March 2022. Fixes issue #30. * Fix/settings page (#39) * fix: Settings page to use renamed component ReportNewComicRectangle introduced in 8eb2ba3 * fix: corrected spelling mistake * [AboutPage.qml] Fix spelling of "Hauke" * [FavoritesPage.qml] Fix spelling of "Hauke" * [LICENSE.txt] Fix spelling of "Hauke" * [LICENSE.txt] Fix spelling of "Hauke" at a different location * [ComicsSettingsPage.qml] Add copyright notice --------- Co-authored-by: olf <[email protected]> * update german translation texts (#40) * update german translation texts * [LICENSE.txt] Add year due to this PR #40 * [README.md] Add year due to this PR #40 --------- Co-authored-by: olf <[email protected]> * Re-add 256x256 icon removed by commit 99c1fdd (#41) * Create directory `256x256` * Add file via upload * Technically refresh logo SVG and PNGs * [README.md] Enhance slighty, in sync with FlowPlayer etc. * [build-on-tags.yml] Update to FlowPlayer's state * [build-on-pull_req.yml] Update to FlowPlayer's state * Update harbour-dailycomics.spec * [README.md] Add 2024 as year of my code contributions * [README.md] Add 2024 as year of cnlpete's code contribution --------- Co-authored-by: Hauke Schade <[email protected]>
sailfishos-applications · Mar 25, 2024 · 994cb26 · 994cb26
2 parents dd72640 + 12a9961
commit 994cb26
Show file tree

Hide file tree

Showing 28 changed files with 156 additions and 140 deletions.
diff --git a/.github/workflows/build-on-pull_req.yml b/.github/workflows/build-on-pull_req.yml
@@ -1,7 +1,7 @@
-name: CI on PRs with SDK for 2.2.0 (i486)
+name: CI on PRs with SDK for 3.0.2 (i486)
 
 env:
-  RELEASE: 2.2.0.29
+  RELEASE: 3.0.2.8
   ARCH: i486
   # 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

diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml
@@ -66,11 +66,54 @@ jobs:
         path: RPMS/
 
 
-  SDK-310:
+  SDK-302:
     runs-on: ubuntu-22.04
     env:
       # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
-      RELEASE: 3.1.0.12
+      RELEASE: 3.0.2.8
+      # 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
+
+    # Caching Docker images is not ready yet, see 
+    # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
+    #- name: Cache Docker images of the Sailfish-SDK
+    #  id: cache-sdk
+    #  uses: actions/cache@v3
+    #  with:
+    #    path: $GITHUB_WORKSPACE/…
+    #    key: cache
+
+    - name: Prepare
+      run: mkdir RPMS
+
+    - name: Build armv7hl on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@old-stable
+      with:
+        release: ${{ env.RELEASE }}
+        arch: armv7hl
+
+    - name: Build i486 on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@old-stable
+      with:
+        release: ${{ env.RELEASE }}
+        arch: i486
+
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
+      with:
+        name: RPM-build-results_SFOS${{ env.RELEASE }}+
+        path: RPMS/
+
+
+  SDK-320:
+    runs-on: ubuntu-22.04
+    env:
+      # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
+      RELEASE: 3.2.0.12
       # 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:
@@ -158,11 +201,11 @@ jobs:
         path: RPMS/
 
 
-  SDK-440:
+  SDK-430:
     runs-on: ubuntu-22.04
     env:
       # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
-      RELEASE: 4.4.0.68
+      RELEASE: 4.3.0.12
       # 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:

diff --git a/.logo/logo.108x108.png b/.logo/logo.108x108.png
@@ -0,0 +1 @@
+../icons/108x108/harbour-dailycomics.png
diff --git a/.logo/logo.128x128.png b/.logo/logo.128x128.png
@@ -0,0 +1 @@
+../icons/128x128/harbour-dailycomics.png
diff --git a/.logo/logo.172x172.png b/.logo/logo.172x172.png
@@ -0,0 +1 @@
+../icons/172x172/harbour-dailycomics.png
diff --git a/.logo/logo.256x256.png b/.logo/logo.256x256.png
diff --git a/.logo/logo.480x480.png b/.logo/logo.480x480.png
diff --git a/.logo/logo.560x560.png b/.logo/logo.560x560.png
diff --git a/.logo/logo.86x86.png b/.logo/logo.86x86.png
@@ -0,0 +1 @@
+../icons/86x86/harbour-dailycomics.png
diff --git a/.logo/logo.svg b/.logo/logo.svg
@@ -0,0 +1 @@
+../resources/logo.svg
diff --git a/.logo/social-media/logo.1280x640.png b/.logo/social-media/logo.1280x640.png
diff --git a/.logo/social-media/logo.1500x500.png b/.logo/social-media/logo.1500x500.png
diff --git a/.logo/social-media/logo.792x792.png b/.logo/social-media/logo.792x792.png
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -3,14 +3,14 @@ The MIT License (MIT)
 Source Code:
 Copyright (c) 2015-2019 Damien Tardy-Panis <[email protected]>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad
-Copyright (c) 2016,2019 Haucke Schade <[email protected]>,
+Copyright (c) 2016,2019,2024 Hauke Schade <[email protected]>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete
 Copyright (c) 2018-2020 Oleg Linkin <[email protected]>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=Maledictus
 and some commits just as "Oleg Linkin"
 Copyright (c) 2020 Mirian Margiani <[email protected]>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus
-Copyright (c) 2023 olf <[email protected]>,
+Copyright (c) 2023,2024 olf <[email protected]>,
 see https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0
 
 Plugins:
@@ -36,7 +36,7 @@ see https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0
 
 Translations
 - [de]:
-  Copyright (c) 2016,2019 Haucke Schade <[email protected]>, see
+  Copyright (c) 2016,2019,2024 Hauke Schade <[email protected]>, see
   https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete
   Copyright (c) 2020 Mirian Margiani <[email protected]>, see
   https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus

diff --git a/README.md b/README.md
@@ -53,10 +53,10 @@ If you want to translate Daily Comics to a language it does not support yet or i
 ## Contributors
 ### Source Code
 - [2015-2019](https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad) Damien Tardy-Panis ([tardypad](https://github.com/tardypad))
-- [2016,2019](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Haucke Schade ([cnlpete](https://github.com/cnlpete))
+- [2016,2019,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Hauke Schade ([cnlpete](https://github.com/cnlpete))
 - [2018-2020](https://github.com/sailfishos-applications/daily-comics/commits?author=Maledictus) Oleg Linkin ([Maledictus](https://github.com/Maledictus))
 - [2020](https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus) Mirian Margiani ([ichthyosaurus](https://github.com/ichthyosaurus))
-- [2023](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0))
+- [2023,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0))
 
 ### Plugins
 - [2015-2019](https://github.com/sailfishos-applications/daily-comics/commits?author=tardypad) Damien Tardy-Panis ([tardypad](https://github.com/tardypad))
@@ -71,7 +71,7 @@ If you want to translate Daily Comics to a language it does not support yet or i
 
 ### Translations
 - [`de`](https://app.transifex.com/olf/daily-comics/language/de/)
-  - [2016,2019](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Haucke Schade ([cnlpete](https://github.com/cnlpete))
+  - [2016,2019,2024](https://github.com/sailfishos-applications/daily-comics/commits?author=cnlpete) Hauke Schade ([cnlpete](https://github.com/cnlpete))
   - [2020](https://github.com/sailfishos-applications/daily-comics/commits?author=ichthyosaurus) Mirian Margiani ([ichthyosaurus](https://github.com/ichthyosaurus))
   - [2023](https://github.com/sailfishos-applications/daily-comics/commits?author=Olf0) olf ([Olf0](https://github.com/Olf0))
 - [`fr`](https://app.transifex.com/olf/daily-comics/language/fr/)

diff --git a/git/hooks/pre-commit b/git/hooks/pre-commit
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-duplicates=$(grep -h color plugins/*/info.json | cut -d: -f2 | sed -r 's/.*"(.*)".*/\1/' | sort | uniq -d)
+duplicates="$(grep -Fh color plugins/*/info.json | cut -d: -f2 | sed -E '^[^"]*"(.*)".*$/\1/' | sort | uniq -d)"
 
 if [ -n "$duplicates"  ]
 then
-  echo "There are multiple comics with the same color:"
+  echo "There are multiple comics with the same color(s):"
   echo "$duplicates"
   exit 1
 fi

diff --git a/icons/256x256/harbour-dailycomics.png b/icons/256x256/harbour-dailycomics.png
diff --git a/plugins/donaldduck/cover.jpg b/plugins/donaldduck/cover.jpg
diff --git a/plugins/donaldduck/cover_big.jpg b/plugins/donaldduck/cover_big.jpg
diff --git a/plugins/donaldduck/example.jpg b/plugins/donaldduck/example.jpg
diff --git a/plugins/donaldduck/extract.js b/plugins/donaldduck/extract.js
diff --git a/plugins/donaldduck/info.json b/plugins/donaldduck/info.json
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2015-2019 Damien Tardy-Panis <[email protected]>
- * Copyright (c) 2016 Haucke Schade <[email protected]>
+ * Copyright (c) 2016 Hauke Schade <[email protected]>
  * Copyright (c) 2019 Oleg Linkin <[email protected]>
  * Copyright (c) 2023 olf <[email protected]>
  *

diff --git a/qml/pages/ComicsSettingsPage.qml b/qml/pages/ComicsSettingsPage.qml
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2015 Damien Tardy-Panis <[email protected]>
+ * Copyright (c) 2024 Hauke Schade <[email protected]>
  *
  * This file is subject to the terms and conditions defined in
  * file `LICENSE.txt`, which is part of this source code package.
@@ -62,7 +63,7 @@ Dialog {
             }
         }
 
-        footer: RequestContactDevRectangle {
+        footer: ReportNewComicRectangle {
             flickable: gridView
         }
 

diff --git a/qml/pages/FavoritesPage.qml b/qml/pages/FavoritesPage.qml
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2015-2019 Damien Tardy-Panis <[email protected]>
- * Copyright (c) 2016 Haucke Schade <[email protected]>
+ * Copyright (c) 2016 Hauke Schade <[email protected]>
  * Copyright (c) 2019 Oleg Linkin <[email protected]>
  * Copyright (c) 2023 olf <[email protected]>
  *

diff --git a/rpm/harbour-dailycomics.spec b/rpm/harbour-dailycomics.spec
@@ -9,12 +9,12 @@ Name:       harbour-dailycomics
 
 Summary:    Daily comic strips reader
 # The <version> tag must adhere to semantic versioning: Among multiple other
-# reasons due to its use for `qmake5` in line 107.  See https://semver.org/
+# reasons due to its use for `qmake5` in line 90.  See https://semver.org/
 Version:    1.9.95
-# The <release> tag comprisees one of {alpha,beta,rc,release} postfixed with a
-# natural number greater or equal to 1 (e.g., "beta3") and may additionally be
+# The <release> tag comprises one of {alpha,beta,rc,release} postfixed with a
+# natural number greater or equal to 1 (e.g. "beta3") and may additionally be
 # postfixed with a plus character ("+"), the name of the packager and a release
-# number chosen by her (e.g., "rc2+jane4").  `{alpha|beta|rc|release}`
+# number chosen by her (e.g. "rc2+jane4").  `{alpha|beta|rc|release}`
 # indicates the expected status of the software.  No other identifiers shall be
 # used for any published version, but for the purpose of testing infrastructure
 # other nonsensual identifiers as `adud` may be used, which do *not* trigger a

diff --git a/translations/README.md b/translations/README.md
@@ -2,7 +2,7 @@
 
 You can help localising Daily Comics to your language using [Transifex](https://app.transifex.com/olf/daily-comics) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html).
 
-Note that for Daily Comics 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 Daily Comics 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/olf/daily-comics) 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.
 
@@ -14,9 +14,9 @@ To compile a translation file for testing, use the `lrelease` command to convert
 ```
 lrelease harbour-dailycomics.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-dailycomics/translations
+/usr/share/harbour-dailycomics/translations/
 ```
 Daily Comics tries to automatically load a translation file according to your system locale setting.  You can also run the application with a selected locale from the terminal.  For example, for the Swedish language the command is:
 ```
@@ -25,5 +25,5 @@ export LANG=sv; harbour-dailycomics
 
 ### 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-dailycomics.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-dailycomics.ts`), or tediously perform this manually, which hence is only suitable for small changes.