From ed38d8e22340934680e0a7829b4a68f397c47ff4 Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 24 Nov 2023 18:02:01 +0100 Subject: [PATCH 01/22] [filecase.changes] Avoid quoting in changelog files --- rpm/filecase.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/filecase.changes b/rpm/filecase.changes index ee34ddb..a77ed18 100644 --- a/rpm/filecase.changes +++ b/rpm/filecase.changes @@ -1,5 +1,5 @@ * Fri Nov 24 2023 olf - 0.4.3 -- Fix for issue #54 "Building on SFOS-OBS fails" by @nephros (#55) +- Fix for issue #54 (Building on SFOS-OBS fails) by @nephros (#55) - Set `Vendor:` to `meego` (#57) * Thu Nov 16 2023 olf - 0.4.2 From 87fc5e0587a00277d3ccfb8c302aa4f1c11d4eae Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 25 Nov 2023 02:02:43 +0100 Subject: [PATCH 02/22] [filecase.changes] Fix changelog's out-of-sync entries --- rpm/filecase.changes | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/rpm/filecase.changes b/rpm/filecase.changes index a77ed18..cf3e4c6 100644 --- a/rpm/filecase.changes +++ b/rpm/filecase.changes @@ -1,11 +1,18 @@ * Fri Nov 24 2023 olf - 0.4.3 -- Fix for issue #54 (Building on SFOS-OBS fails) by @nephros (#55) -- Set `Vendor:` to `meego` (#57) - -* Thu Nov 16 2023 olf - 0.4.2 - Update Swedish translation (PR #47) by @eson57 - Introduce a quick & dirty workaround for issue #15 (PR #46) by @simonschmeisser - Minor documentation improvements by @Olf0 +- Fix for issue #54 (Building on SFOS-OBS fails) by @nephros (#55) +- Set `Vendor:` to `meego` (#57) + +* Sun Oct 29 2023 olf - 0.4.2 +- Fully overhaul README +- Create Translations-README +- Add Transifex configuration +- Add three issue templates +- Implement and overhaul GitHub CI workflows +- Trivially bail out of SailJail +- Clean up and rectify some code changes made in 2022 * Sun Mar 06 2022 olf - 0.4.1 - Add checks for recent SD card paths: `/run/media/nemo` and `/run/media/defaultuser` From 3ec6e812ef571c194a41afc77276da251ee1ce9b Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 25 Nov 2023 02:39:15 +0100 Subject: [PATCH 03/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e44058..5d5e49a 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ The original [FileCase for SailfishOS (2015 - 2016)](https://openrepos.net/conte In 2021 [David Llewellyn-Jones (flypig)](https://github.com/llewelld) cleaned up [the source code repository and adapted FileCase](https://github.com/sailfishos-applications/filecase/compare/0.1-9...0.2.1) to run on recent releases of SailfishOS. -In 2022 and 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/filecase#content), the [Transifex integration](https://github.com/sailfishos-applications/filecase/pull/34), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://build.sailfishos.org/project/show/sailfishos:chum) etc. +In 2022 and 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/filecase#content), a [Transifex integration](https://github.com/sailfishos-applications/filecase/pull/34), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://build.sailfishos.org/project/show/sailfishos:chum) etc. ## Credits #### Original author From 46d74196019afc0d1b8209f3ee15a3306f5a97aa Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 31 Jan 2024 03:52:20 +0100 Subject: [PATCH 04/22] [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 5d5e49a..698e9fa 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Features: - View text files - Edit text files with a built-in, simple text editor - Create archives (`.zip`, `.tar`, `.tar.gz`, `.tar.bz2`) -- View archive content (aforementioned formats, plus more, e.g., `.apk`) +- View archive content (aforementioned formats, plus more, e.g. `.apk`) - Extraxt archives (aforementioned formats, `.apk` etc.) - Install packages (`.rpm`, `.apk`) - Share files (to Android programs, Bluetooth etc.) From 872e6d13b1598844611e00335cee684a3726ebac Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 3 Feb 2024 21:32:57 +0100 Subject: [PATCH 05/22] [AboutPage.qml] Rectify flypig's year of contributing --- qml/pages/AboutPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 556b18b..9a62730 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -80,7 +80,7 @@ Page { Label { color: Theme.secondaryColor - text: "(C) 2022 David Llewellyn-Jones (llewelld / flypig)" + "
" + + text: "(C) 2021 David Llewellyn-Jones (llewelld / flypig)" + "
" + "(C) 2022-2023 olf (Olf0)" font.pixelSize: Theme.fontSizeSmall } From 0f822a408eb6a15ba4602a5ce1c50172a162ba6b Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 3 Feb 2024 21:48:43 +0100 Subject: [PATCH 06/22] [LICENSE.txt] Rectify flypig's year of contributing --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index c12907b..ef32006 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -370,7 +370,7 @@ for such a notice. Additional, accurate notices of copyright ownership: - (C) 2015-2016 Matias Perez (CepiPerez) -- (C) 2022 David Llewellyn-Jones (llewelld / flypig) +- (C) 2021 David Llewellyn-Jones (llewelld / flypig) - (C) 2022-2023 olf (Olf0) Exhibit B - "Incompatible With Secondary Licenses" Notice From 4bcf9015d5fc3e466c46c4728be766b18ad87882 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 4 Feb 2024 16:50:43 +0100 Subject: [PATCH 07/22] [LICENSE.txt] Inrease year to 2024 --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index ef32006..456017d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -371,7 +371,7 @@ for such a notice. Additional, accurate notices of copyright ownership: - (C) 2015-2016 Matias Perez (CepiPerez) - (C) 2021 David Llewellyn-Jones (llewelld / flypig) -- (C) 2022-2023 olf (Olf0) +- (C) 2022-2024 olf (Olf0) Exhibit B - "Incompatible With Secondary Licenses" Notice --------------------------------------------------------- From 70cc9ec52269c1e228ad937d0e744e7a9c530e16 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 4 Feb 2024 16:51:59 +0100 Subject: [PATCH 08/22] [AboutPage.qml] Increase year to 2024 --- qml/pages/AboutPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 9a62730..3e87e7e 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -81,7 +81,7 @@ Page { Label { color: Theme.secondaryColor text: "(C) 2021 David Llewellyn-Jones (llewelld / flypig)" + "
" + - "(C) 2022-2023 olf (Olf0)" + "(C) 2022-2024 olf (Olf0)" font.pixelSize: Theme.fontSizeSmall } From 09716d56ad83f2bae4d0e8c17e4cdaf5a550c666 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 4 Feb 2024 17:31:09 +0100 Subject: [PATCH 09/22] Update LICENSE.txt --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 456017d..6ca0493 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -368,7 +368,7 @@ file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. -Additional, accurate notices of copyright ownership: +Accurate notices of copyright ownership: - (C) 2015-2016 Matias Perez (CepiPerez) - (C) 2021 David Llewellyn-Jones (llewelld / flypig) - (C) 2022-2024 olf (Olf0) From 365a40619fe28fb3f8283165c3e79c90842b04eb Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 5 Feb 2024 17:08:51 +0100 Subject: [PATCH 10/22] =?UTF-8?q?[AboutPage.qml]=20Use=20`file:///usr?= =?UTF-8?q?=E2=80=A6`=20instead=20of=20`file://usr=E2=80=A6`=20(#65)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/pages/AboutPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 3e87e7e..0966f5b 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -33,7 +33,7 @@ Page { spacing: Theme.paddingLarge Image { - source: "file://usr/share/icons/hicolor/86x86/apps/filecase.png" + source: "file:///usr/share/icons/hicolor/86x86/apps/filecase.png" } Column { From 5f178fd529a6859db95f7c61734a43c73004b5ad Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 6 Feb 2024 20:25:34 +0100 Subject: [PATCH 11/22] Setting `appVersion` for QML from `Version:` in spec-file (#66) * [filecase.pro] Set `VERSION` from `Version:` in spec-file * [filecase.cpp] Add setting `appVersion` for QML from `VERSION` * [filecase.qml] Omit setting `appVersion` here --- filecase.pro | 1 + qml/filecase.qml | 2 -- src/filecase.cpp | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filecase.pro b/filecase.pro index 56e1a9a..d52a1aa 100644 --- a/filecase.pro +++ b/filecase.pro @@ -17,6 +17,7 @@ CONFIG += sailfishapp QT += core xml DEFINES += QWEBDAVITEM_EXTENDED_PROPERTIES DEBUG_WEBDAV +DEFINES += VERSION=\\\"$${VERSION}\\\" SOURCES += src/filecase.cpp \ src/browser.cpp \ diff --git a/qml/filecase.qml b/qml/filecase.qml index f01fb18..b36e221 100644 --- a/qml/filecase.qml +++ b/qml/filecase.qml @@ -7,8 +7,6 @@ ApplicationWindow { id: appWindow - property string appVersion: "0.4.2" - property string savedorientation: config.readConfig("Orientation", "auto") property int pagesOrientations: savedorientation==="auto"? (Orientation.Portrait | Orientation.Landscape) : diff --git a/src/filecase.cpp b/src/filecase.cpp index 92d45d9..7024712 100644 --- a/src/filecase.cpp +++ b/src/filecase.cpp @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) //window->rootContext()->setContextProperty("view", window.data()); //window->rootContext()->setContextProperty("app", app.data()); + window->rootContext()->setContextProperty("appVersion", VERSION); window->engine()->addImportPath("/usr/share/filecase/qml"); qmlRegisterType("FileCase", 1, 0, "Config"); From 8720b6276e1321defa9c6c0875529d4c381d26b6 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 09:19:04 +0100 Subject: [PATCH 12/22] Add `simonschmeisser` as contributor (#71) * [README.md] Add `simonschmeisser` as contributor * [filecase.spec] Add `simonschmeisser` as contributor * [AboutPage.qml] Add `simonschmeisser` as contributor * [README.md] Add `llewelld` as David's nickname at GitHub --- README.md | 3 ++- qml/pages/AboutPage.qml | 3 ++- rpm/filecase.spec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 698e9fa..e25b818 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,9 @@ In 2022 and 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure #### Original author [Matias Perez (CepiPerez)](https://github.com/CepiPerez) #### Contributors -- [David Llewellyn-Jones (flypig)](https://github.com/llewelld) +- [David Llewellyn-Jones (llewelld / flypig)](https://github.com/llewelld) - [olf (Olf0)](https://github.com/Olf0) +- [Simon Schmeisser (simonschmeisser)](https://github.com/simonschmeisser)
### 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 0966f5b..11cda0a 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -81,7 +81,8 @@ Page { Label { color: Theme.secondaryColor text: "(C) 2021 David Llewellyn-Jones (llewelld / flypig)" + "
" + - "(C) 2022-2024 olf (Olf0)" + "(C) 2022-2024 olf (Olf0)" + "
" + + "(C) 2023 Simon Schmeisser (simonschmeisser)" font.pixelSize: Theme.fontSizeSmall } diff --git a/rpm/filecase.spec b/rpm/filecase.spec index 9d7938f..e10edb0 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -66,7 +66,7 @@ Categories: - Qt - TextEditor - Viewer -DeveloperName: Matias Perez (CepiPerez), olf (Olf0), David L.-J. (llewelld / flypig) +DeveloperName: CepiPerez, olf, flypig, simonschmeisser Custom: Repo: %{url} PackageIcon: %{url}/raw/master/icons/filecase3.png From 87f7d10ae2f38357265409074b44408afb7fdace Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 09:30:42 +0100 Subject: [PATCH 13/22] Pre-release version increase (#72) * [filecase.spec] Pre-release version increase * [filecase.changes] Add stub for v0.4.4 --- rpm/filecase.changes | 3 +++ rpm/filecase.spec | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm/filecase.changes b/rpm/filecase.changes index cf3e4c6..48ed4fd 100644 --- a/rpm/filecase.changes +++ b/rpm/filecase.changes @@ -1,3 +1,6 @@ +* Sat Feb 24 2024 olf - 0.4.4 +- Foo + * Fri Nov 24 2023 olf - 0.4.3 - Update Swedish translation (PR #47) by @eson57 - Introduce a quick & dirty workaround for issue #15 (PR #46) by @simonschmeisser diff --git a/rpm/filecase.spec b/rpm/filecase.spec index e10edb0..a1ecaf5 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -10,7 +10,7 @@ Name: filecase Summary: An advanced file-manager for SailfishOS # The tag must adhere to semantic versioning: Among multiple other # reasons due to its use for `qmake5` in line 107. See https://semver.org/ -Version: 0.4.3 +Version: 0.4.4 # 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.4.3 # 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: 0 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/File From 02708578875c632da759b1b6f3d600f92f98cc20 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 10:06:45 +0100 Subject: [PATCH 14/22] Add social media icons (#73) --- .xdata/icons/social-media/filecase3_122x122.png | Bin 0 -> 9305 bytes .xdata/icons/social-media/filecase3_216x108.png | Bin 0 -> 7744 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .xdata/icons/social-media/filecase3_122x122.png create mode 100644 .xdata/icons/social-media/filecase3_216x108.png diff --git a/.xdata/icons/social-media/filecase3_122x122.png b/.xdata/icons/social-media/filecase3_122x122.png new file mode 100644 index 0000000000000000000000000000000000000000..39491441e9cba2c16fc43ac86991258495da494d GIT binary patch literal 9305 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 literal 0 HcmV?d00001 From b1c94caa037c3c4ac51fc29119e61cb8441b1b68 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 12:03:00 +0100 Subject: [PATCH 15/22] [filecase.changes] Streamline entry for v0.4.3 a bit --- rpm/filecase.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/filecase.changes b/rpm/filecase.changes index 48ed4fd..b750823 100644 --- a/rpm/filecase.changes +++ b/rpm/filecase.changes @@ -2,10 +2,10 @@ - Foo * Fri Nov 24 2023 olf - 0.4.3 -- Update Swedish translation (PR #47) by @eson57 -- Introduce a quick & dirty workaround for issue #15 (PR #46) by @simonschmeisser +- Update Swedish translation (#47) by @eson57 +- Introduce a quick & dirty workaround for issue #15 (#46) by @simonschmeisser - Minor documentation improvements by @Olf0 -- Fix for issue #54 (Building on SFOS-OBS fails) by @nephros (#55) +- Fix for issue #54 "Building on SFOS-OBS fails" by @nephros (#55) - Set `Vendor:` to `meego` (#57) * Sun Oct 29 2023 olf - 0.4.2 From fcfd3156f86d60b088eda420b1440167fa60b058 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 12:04:15 +0100 Subject: [PATCH 16/22] [filecase.spec] Post-release release-version increase --- rpm/filecase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/filecase.spec b/rpm/filecase.spec index a1ecaf5..21a212e 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -21,7 +21,7 @@ Version: 0.4.4 # 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: 0 +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/File From 29b44dddc75a7302aaa0b8805b693bdc97757076 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 12:05:43 +0100 Subject: [PATCH 17/22] [filecase.spec] Stick to own versioning conventions --- rpm/filecase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/filecase.spec b/rpm/filecase.spec index 21a212e..300259b 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -21,7 +21,7 @@ Version: 0.4.4 # 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: 1 +Release: release1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/File From a0ef02ccb8fd1e22224ecea5463181fa48eb2979 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 12:34:28 +0100 Subject: [PATCH 18/22] [filecase.pro] Beautify and expand a comment (#70) --- filecase.pro | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/filecase.pro b/filecase.pro index d52a1aa..cc84125 100644 --- a/filecase.pro +++ b/filecase.pro @@ -1,15 +1,16 @@ # NOTICE: # # Application name defined in TARGET has a corresponding QML filename. -# If name defined in TARGET is changed, the following needs to be done -# to match new name: +# If the name defined in TARGET is changed, the following must be done +# to match the new name: # - corresponding QML filename must be changed # - desktop icon filename must be changed # - desktop filename must be changed # - icon definition filename in desktop file must be changed # - translation filenames have to be changed -# The name of your application +# The name of your application, defaults to the name of the project file, see +# https://doc.qt.io/qt-5/qmake-common-projects.html#building-an-application TARGET = filecase CONFIG += sailfishapp @@ -160,6 +161,6 @@ HEADERS += \ src/boxthumbnailer.h icons.files = icons -icons.path = /usr/share/filecase/ +icons.path = /usr/share/$$TARGET INSTALLS += icons From 2f3bb4f37e2bbedd353eec19b5c2e0dc3f3f243e Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 16:46:00 +0100 Subject: [PATCH 19/22] =?UTF-8?q?Fix=20issue=20#68:=20`TS`=E2=86=92`QM`=20?= =?UTF-8?q?files=20does=20not=20work=20on=20OBS=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rpm/filecase.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpm/filecase.spec b/rpm/filecase.spec index 300259b..38706c2 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -21,7 +21,7 @@ Version: 0.4.4 # 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: release1 +Release: check2 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/File @@ -44,6 +44,7 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: qt5-qttools-linguist BuildRequires: desktop-file-utils # This description section includes metadata for SailfishOS:Chum, see From 1840ffc7afd71f556a06e1892c66e7622f4daf9e Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 17:02:31 +0100 Subject: [PATCH 20/22] Update filecase.changes for v0.4.4 --- rpm/filecase.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpm/filecase.changes b/rpm/filecase.changes index b750823..fb93f33 100644 --- a/rpm/filecase.changes +++ b/rpm/filecase.changes @@ -1,11 +1,13 @@ * Sat Feb 24 2024 olf - 0.4.4 -- Foo +- Slightly enhance `About.qml` page (#65 etc.) +- Setting `appVersion` for QML from `Version:` in spec-file (#66) +- Fix issue #68: `TS`→`QM` files does not work on OBS (#74) * Fri Nov 24 2023 olf - 0.4.3 - Update Swedish translation (#47) by @eson57 - Introduce a quick & dirty workaround for issue #15 (#46) by @simonschmeisser - Minor documentation improvements by @Olf0 -- Fix for issue #54 "Building on SFOS-OBS fails" by @nephros (#55) +- Fix: Building on SFOS-OBS fails (#55) by @nephros, closes issue #54 - Set `Vendor:` to `meego` (#57) * Sun Oct 29 2023 olf - 0.4.2 From b0029da6d56a76f8498a51f79c2163873b81d43b Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 18:14:28 +0100 Subject: [PATCH 21/22] [filecase.spec] Fix `Release:` version --- rpm/filecase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/filecase.spec b/rpm/filecase.spec index 38706c2..2b47150 100644 --- a/rpm/filecase.spec +++ b/rpm/filecase.spec @@ -21,7 +21,7 @@ Version: 0.4.4 # 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: check2 +Release: release1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/File From 90c0c9edec3e24166f29d6c4ba818c571f7bc121 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 24 Feb 2024 21:24:55 +0100 Subject: [PATCH 22/22] [filecase.pro] Improve "adaption rules" comments --- filecase.pro | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/filecase.pro b/filecase.pro index cc84125..8c15a99 100644 --- a/filecase.pro +++ b/filecase.pro @@ -3,14 +3,14 @@ # Application name defined in TARGET has a corresponding QML filename. # If the name defined in TARGET is changed, the following must be done # to match the new name: -# - corresponding QML filename must be changed -# - desktop icon filename must be changed -# - desktop filename must be changed -# - icon definition filename in desktop file must be changed -# - translation filenames have to be changed +# - the corresponding QML filename must be adapted +# - the desktop icon filename must be adapted +# - the name of the `.desktop` file must be adapted +# - the icon definition filename in `.desktop` file must be adapted +# - the original translation strings `.ts` filename has to be adapted -# The name of your application, defaults to the name of the project file, see -# https://doc.qt.io/qt-5/qmake-common-projects.html#building-an-application +# The name of your application; should default to the name of the project file, +# see https://doc.qt.io/qt-5/qmake-common-projects.html#building-an-application TARGET = filecase CONFIG += sailfishapp