From 3acfc50c9c05f8a528118d03357795956f1ec811 Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 9 Feb 2024 01:39:52 +0100 Subject: [PATCH 01/12] [flowplayer.spec] Post release version increase --- rpm/flowplayer.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec index e903646..4de9052 100644 --- a/rpm/flowplayer.spec +++ b/rpm/flowplayer.spec @@ -10,7 +10,7 @@ Name: flowplayer Summary: Music Player for SailfishOS # The tag must adhere to semantic versioning: Among multiple other # reasons due to its use for `qmake5` in line 104. See https://semver.org/ -Version: 0.3.2 +Version: 0.3.3 # The 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 @@ -21,7 +21,7 @@ Version: 0.3.2 # build at GitHub and OBS, when configured accordingly; mind the sorting # (`adud` < `alpha`). For details and reasons, see # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format -Release: rc4 +Release: 1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/Multimedia From 7b03591ce6183a6f6d4dc9442d7b264199c9d3e8 Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 9 Feb 2024 01:42:00 +0100 Subject: [PATCH 02/12] [flowplayer.changes] Add stub for 0.3.3 --- rpm/flowplayer.changes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes index 0161a5f..f8e444c 100644 --- a/rpm/flowplayer.changes +++ b/rpm/flowplayer.changes @@ -1,4 +1,7 @@ -* Wed Feb 08 2024 olf - 0.3.2 +* Sat Feb 10 2024 olf - 0.3.3 +- + +* Thu Feb 08 2024 olf - 0.3.2 - Use Sailfish.Pickers.FolderPickerPage to configure music directories (#33) by @smokku - Enhance AboutPage.qml (#37, #44) - Translation updates for DE & SV (#45, #46) From 15cd417cd7e108982121eb9fde114d6489bb32ed Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 12 Feb 2024 21:30:28 +0100 Subject: [PATCH 03/12] Rectify `AboutPage.qml` (#58) * [README.md] Add smokku to contributors * [AboutPage.qml] Fix path of Paypal icon Correct absolute path would have been `file:///usr/share/flowplayer/qml/paypal.png` (instead of `file:///usr/share/flowplayer/icon/paypal.png`), but reverting back to relative path `file://../paypal.png`. * [AboutPage.qml] Make icon path relative As a consequence of the preceding [commit f002ccb](https://github.com/sailfishos-applications/flowplayer/pull/58/commits/f002ccb12afbf4737bb3fc4ed2340390d8934971), the other icon path here should also be a relative one, due to [`rpm/flowplayer.spec` lines 116-118](https://github.com/sailfishos-applications/flowplayer/blob/master/rpm/flowplayer.spec#L116-L118): All these paths reside in `%{datadir}`. * [AboutPage.qml] Trying to enhance formatting * [flowplayer.ts] Adopt line numbers from `AboutPage.qml` * [AboutPage.qml] "at" --> @ --- README.md | 1 + qml/pages/AboutPage.qml | 27 ++++++++++++++++++--------- translations/flowplayer.ts | 6 +++--- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f4c4200..d7691ed 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, #### Contributors - [Damien Caliste (dcaliste)](https://github.com/dcaliste) - [olf (Olf0)](https://github.com/Olf0) +- [Tomasz Sterna (smokku)](https://github.com/smokku)
### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index a65765e..39054e5 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -34,7 +34,7 @@ Page { spacing: Theme.paddingLarge Image { - source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png" + source: "file://../../icons/hicolor/86x86/apps/flowplayer.png" } Column { @@ -49,7 +49,7 @@ Page { Label { color: Theme.secondaryHighlightColor - text: "version " + appVersion + text: "Version " + appVersion font.pixelSize: Theme.fontSizeSmall } } @@ -68,9 +68,10 @@ Page { font.pixelSize: Theme.fontSizeSmall } - Separator { - width: parent.width + Label { color: Theme.secondaryColor + text: " " + font.pixelSize: Theme.fontSizeSmall } Label { @@ -82,7 +83,8 @@ Page { Label { color: Theme.secondaryColor text: "(C) 2022-2024 olf (Olf0)" + "
" + - "(C) 2023-2024 Damien Caliste (dcaliste)" + "(C) 2023, 2024 Damien Caliste (dcaliste)" + "
" + + "(C) 2024 Tomasz Sterna (smokku)" font.pixelSize: Theme.fontSizeSmall } @@ -92,15 +94,22 @@ Page { } Label { - text: colored + qsTr("If you want to create a new translation or improve an extant one:") + "
" + - "" + "Transifex - FlowPlayer" - onLinkActivated: Qt.openUrlExternally(link) + text: colored + qsTr("If you want to create a new translation or improve an extant one:") font.pixelSize: Theme.fontSizeSmall textFormat: Text.RichText wrapMode: Text.WordWrap width: parent.width } + Label { + text: colored + "" + "FlowPlayer@Transifex" + onLinkActivated: Qt.openUrlExternally(link) + font.pixelSize: Theme.fontSizeLarge + textFormat: Text.RichText + wrapMode: Text.WordWrap + width: parent.width + } + Separator { width: parent.width color: Theme.secondaryColor @@ -115,7 +124,7 @@ Page { } Image { - source: "file:///usr/share/flowplayer/icons/paypal.png" + source: "file://../paypal.png" height: Theme.itemSizeMedium fillMode: Image.PreserveAspectFit smooth: true diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index 4fc4858..de81ea5 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -14,17 +14,17 @@ - + Contributors: - + If you want to create a new translation or improve an extant one: - + You can support the original author of FlowPlayer by donating: From 1ce36337093cafea104acb005a3cbb6c32e40248 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 12 Feb 2024 23:33:46 +0100 Subject: [PATCH 04/12] [AboutPage.qml] Back to absolute paths --- qml/pages/AboutPage.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 39054e5..2076381 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -34,7 +34,7 @@ Page { spacing: Theme.paddingLarge Image { - source: "file://../../icons/hicolor/86x86/apps/flowplayer.png" + source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png" } Column { @@ -71,6 +71,7 @@ Page { Label { color: Theme.secondaryColor text: " " + textFormat: Text.RichText font.pixelSize: Theme.fontSizeSmall } @@ -96,7 +97,6 @@ Page { Label { text: colored + qsTr("If you want to create a new translation or improve an extant one:") font.pixelSize: Theme.fontSizeSmall - textFormat: Text.RichText wrapMode: Text.WordWrap width: parent.width } @@ -124,7 +124,7 @@ Page { } Image { - source: "file://../paypal.png" + source: "file:///usr/share/flowplayer/qml/paypal.png" height: Theme.itemSizeMedium fillMode: Image.PreserveAspectFit smooth: true From cbd52da35b1c011293ed81a1433f5b411c6205ab Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 12 Feb 2024 23:36:28 +0100 Subject: [PATCH 05/12] [flowplayer.ts}] Adopt line numbers from `AboutPage.qml` --- translations/flowplayer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index de81ea5..e34c2d8 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -14,12 +14,12 @@ - + Contributors: - + If you want to create a new translation or improve an extant one: From a4a9c2caae8d77efc74ffe1493bff53ec979fe67 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 00:41:10 +0100 Subject: [PATCH 06/12] Manual CI runs (#60) * Create manual-armv7hl-302.yml * Create manual-aarch64-430.yml * [manual-armv7hl-302.yml] Add trailing newline * [manual-aarch64-430.yml] Add trailing newline --- .github/workflows/manual-aarch64-430.yml | 67 ++++++++++++++++++++++++ .github/workflows/manual-armv7hl-302.yml | 55 +++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 .github/workflows/manual-aarch64-430.yml create mode 100644 .github/workflows/manual-armv7hl-302.yml diff --git a/.github/workflows/manual-aarch64-430.yml b/.github/workflows/manual-aarch64-430.yml new file mode 100644 index 0000000..5f8ec9c --- /dev/null +++ b/.github/workflows/manual-aarch64-430.yml @@ -0,0 +1,67 @@ +name: Manual CI (aarch64@430) + +on: + # Allows to run this workflow manually from the Actions tab. + workflow_dispatch: + +defaults: + run: + # 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 + +# 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 }} + # '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: true + +jobs: + SDK-430: + runs-on: ubuntu-22.04 + env: + # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk + 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: + + - 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 aarch64 on ${{ env.RELEASE }} + uses: coderus/github-sfos-build@master + with: + release: ${{ env.RELEASE }} + arch: aarch64 + + #- name: Build armv7hl on ${{ env.RELEASE }} + # uses: coderus/github-sfos-build@master + # with: + # release: ${{ env.RELEASE }} + # arch: armv7hl + + #- name: Build i486 on ${{ env.RELEASE }} + # uses: coderus/github-sfos-build@master + # 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/ + diff --git a/.github/workflows/manual-armv7hl-302.yml b/.github/workflows/manual-armv7hl-302.yml new file mode 100644 index 0000000..d28f1d4 --- /dev/null +++ b/.github/workflows/manual-armv7hl-302.yml @@ -0,0 +1,55 @@ +name: Manual CI (armv7hl@3.0.2) + +on: + # Allows to run this workflow manually from the Actions tab. + workflow_dispatch: + +defaults: + run: + # 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 + +# 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 }} + # '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: true + +jobs: + SDK-302: + runs-on: ubuntu-22.04 + env: + # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk + 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: Upload build results + uses: actions/upload-artifact@v3 + with: + name: RPM-build-results_SFOS${{ env.RELEASE }}+ + path: RPMS/ + From 8ceeb4a454531d52404a1110368018ced3feffbf Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 00:43:32 +0100 Subject: [PATCH 07/12] [manual-aarch64-430.yml] Rectify version format in workflow name --- .github/workflows/manual-aarch64-430.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-aarch64-430.yml b/.github/workflows/manual-aarch64-430.yml index 5f8ec9c..f5cb09d 100644 --- a/.github/workflows/manual-aarch64-430.yml +++ b/.github/workflows/manual-aarch64-430.yml @@ -1,4 +1,4 @@ -name: Manual CI (aarch64@430) +name: Manual CI (aarch64@4.3.0) on: # Allows to run this workflow manually from the Actions tab. From e5fa89025374013f4c2ae6c720c68a77597ba9c2 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 04:08:43 +0100 Subject: [PATCH 08/12] [translations/README.md] Add missed "." --- translations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.md b/translations/README.md index 0efe014..356b91d 100644 --- a/translations/README.md +++ b/translations/README.md @@ -14,7 +14,7 @@ To compile a translation file for testing, use the `lrelease` command to convert ``` lrelease flowplayer.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/flowplayer/translations ``` From d6db75a32643e80af1936a2c2999a2b1a2b93f22 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 05:07:35 +0100 Subject: [PATCH 09/12] [AboutPage.qml] Another take at relative icon paths (#59) * [AboutPage.qml] Another take at relative icon paths * [AboutPage.qml] Enlarge PayPal image * [AboutPage.qml] Trying to optimise layout * [AboutPage.qml] Link to `translations/README.md` * [AboutPage.qml] Play with fonts * [flowplayer.ts] Adopt new line numbers from `AboutPage.qml` --- qml/pages/AboutPage.qml | 26 ++++++++++++-------------- translations/flowplayer.ts | 8 ++++---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 2076381..030efcb 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -34,7 +34,7 @@ Page { spacing: Theme.paddingLarge Image { - source: "file:///usr/share/icons/hicolor/86x86/apps/flowplayer.png" + source: "../../../icons/hicolor/86x86/apps/flowplayer.png" } Column { @@ -44,7 +44,9 @@ Page { Label { id: main color: Theme.highlightColor - text: "FlowPlayer" + text: "FlowPlayer" + font.pixelSize: Theme.fontSizeMedium + textFormat: Text.RichText } Label { @@ -68,13 +70,6 @@ Page { font.pixelSize: Theme.fontSizeSmall } - Label { - color: Theme.secondaryColor - text: " " - textFormat: Text.RichText - font.pixelSize: Theme.fontSizeSmall - } - Label { color: Theme.secondaryColor text: qsTr("Contributors:") @@ -97,17 +92,19 @@ Page { Label { text: colored + qsTr("If you want to create a new translation or improve an extant one:") font.pixelSize: Theme.fontSizeSmall + textFormat: Text.RichText wrapMode: Text.WordWrap width: parent.width } Label { - text: colored + "" + "FlowPlayer@Transifex" + text: colored + + "" + + "Translations README" onLinkActivated: Qt.openUrlExternally(link) font.pixelSize: Theme.fontSizeLarge textFormat: Text.RichText - wrapMode: Text.WordWrap - width: parent.width + anchors.horizontalCenter: parent.horizontalCenter } Separator { @@ -124,10 +121,11 @@ Page { } Image { - source: "file:///usr/share/flowplayer/qml/paypal.png" - height: Theme.itemSizeMedium + source: "../paypal.png" + height: Theme.itemSizeHuge fillMode: Image.PreserveAspectFit smooth: true + anchors.horizontalCenter: parent.horizontalCenter MouseArea { anchors.fill: parent diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index e34c2d8..f02e64e 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -9,22 +9,22 @@ - + Original author: - + Contributors: - + If you want to create a new translation or improve an extant one: - + You can support the original author of FlowPlayer by donating: From f65d220ff81ad1e9b051ec53526ef67552e9e41f Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 05:09:57 +0100 Subject: [PATCH 10/12] [README.md] Add missing colon (":") --- translations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.md b/translations/README.md index 356b91d..5e6cfa9 100644 --- a/translations/README.md +++ b/translations/README.md @@ -14,7 +14,7 @@ To compile a translation file for testing, use the `lrelease` command to convert ``` lrelease flowplayer.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/flowplayer/translations ``` From a2ee59633be5c34c54e4e7f66e4d0a479f24a153 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 05:12:03 +0100 Subject: [PATCH 11/12] [README.md] No comma after "e.g." in British English --- translations/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/README.md b/translations/README.md index 5e6cfa9..7301b0d 100644 --- a/translations/README.md +++ b/translations/README.md @@ -2,7 +2,7 @@ You can help localising FlowPlayer to your language using [Transifex](https://app.transifex.com/olf/flowplayer-1) or [Qt Linguist](https://doc.qt.io/qt-5/qtlinguist-index.html). -Note that for FlowPlayer 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 FlowPlayer 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/flowplayer-1) 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. @@ -25,5 +25,5 @@ export LANG=sv; flowplayer ### 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/flowplayer.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/flowplayer.ts`), or tediously perform this manually, which hence is only suitable for small changes. From ae7d46e6306e0d2b37b838da989285bcd17a5477 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 13 Feb 2024 14:31:36 +0100 Subject: [PATCH 12/12] [flowplayer.changes] Add recent PRs for 0.3.3 --- rpm/flowplayer.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes index f8e444c..9d3dcb0 100644 --- a/rpm/flowplayer.changes +++ b/rpm/flowplayer.changes @@ -1,4 +1,5 @@ * Sat Feb 10 2024 olf - 0.3.3 +- Slightly overhaul `AboutPage.qml` (#58, #59) - * Thu Feb 08 2024 olf - 0.3.2