From a7507f5f32537240aa21f6928999f4ff7a4aa0ca Mon Sep 17 00:00:00 2001 From: Mirian Margiani Date: Thu, 13 Apr 2023 13:01:04 +0200 Subject: [PATCH] update some patches --- .../CONFIG | 88 ++++++++----------- .../unified_diff.patch | 62 ++++++------- sfos-patch-notes-sections/CONFIG | 50 +++++++++-- sfos-patch-notes-sections/unified_diff.patch | 12 ++- sfos-patch-office-always-search/CONFIG | 42 ++++++--- .../unified_diff.patch | 10 +-- sfos-patch-office-favorites/CONFIG | 60 +++++++------ .../unified_diff.patch | 19 ++-- 8 files changed, 192 insertions(+), 151 deletions(-) diff --git a/sfos-patch-keyboard-swiss-german-layout/CONFIG b/sfos-patch-keyboard-swiss-german-layout/CONFIG index 68796e0..fc0ad53 100644 --- a/sfos-patch-keyboard-swiss-german-layout/CONFIG +++ b/sfos-patch-keyboard-swiss-german-layout/CONFIG @@ -5,17 +5,21 @@ # Fields: # - one line: Prefix, DisplayName, PackageName, Category, # Maintainer, Summary, DiscussionLink, DonationsLink, -# SourcesLink, Version +# SourcesLink, Version, Release, License # - multiple lines: Keywords, Description, Screenshots, # CompatibleVersions, Changelog, Requires, -# Obsoletes, Conflicts +# Obsoletes, Conflicts, TestCommands # (each line in a multiline field must start with '- ') # +# Required: +# DisplayName, PackageName, Category, Maintainer, Summary, Version, +# Release, License, Description, CompatibleVersions +# SourcePackages: - jolla-keyboard >= 0.7.1 -Prefix: /usr/share +Prefix: /usr/share/maliit/plugins/com/jolla DisplayName: Swiss German keyboard layout PackageName: sfos-patch-keyboard-swiss-german-layout Category: Keyboard @@ -27,7 +31,7 @@ Keywords: - Swiss German Maintainer: ichthyosaurus -Summary: Patch adding a new Swiss German keyboard layout. +Summary: Patch adding a new Swiss German keyboard layout Description: - This patch adds a new Swiss German keyboard layout. - @@ -38,28 +42,22 @@ Description: - which reduces the default height of the keyboard so it does not take as much - space on the screen. - -- Switching between keyboards may become slower because of the extra row. -- This cannot be changed unless the other keyboards add another row too. You -- can install the [improved emojis patch](https://openrepos.net/content/ichthyosaurus/patch-improved-stock-emoji-keyboard) -- to add an extra row to the stock emojis keyboard. +- Note: the keyboard has a special key on the symbols page for switching to the +- emoji keyboard. This key only works if the emoji keyboard is enabled in the +- system settings. You can use [color emoji patch](https://openrepos.net/content/ichthyosaurus/patch-stock-emoji-keyboard-colors) +- to be able to use all emojis with skin tone variations, etc. -DiscussionLink: https://openrepos.net/content/ichthyosaurus/patch-swiss-german-keyboard-layout -# DonationsLink: https://example.org/donations +DiscussionLink: https://forum.sailfishos.org/t/patches-by-ichthyosaurus +DonationsLink: https://liberapay.com/ichthyosaurus SourcesLink: https://github.com/ichthyosaurus/sailfish-public-patch-sources -Version: 1.0.5 +Version: 1.1.0 Release: 1 +License: GPL-3.0-or-later Requires: -- sailfish-version >= 3.0.0 -- jolla-keyboard >= 0.7.1 - -# Conflicts: -# - my-conflicting-package = 0.0.1 -# - the-old-name -# -# Obsoletes: -# - the-other-old-name +- sailfish-version >= 3.4.0 +- @sources Screenshots: - screenshot-1.png @@ -69,40 +67,30 @@ Screenshots: - screenshot-5.png CompatibleVersions: -- 2.1.0.11 -- 2.1.1.12 -- 2.1.1.23 -- 2.1.1.24 -- 2.1.1.26 -- 2.1.2.3 -- 2.1.3.3 -- 2.1.3.5 -- 2.1.3.7 -- 2.1.4.13 -- 2.1.4.14 -- 2.1.4.15 -- 2.2.0.29 -- 2.2.1.18 -- 2.2.1.19 -- 3.0.0.5 -- 3.0.0.8 -- 3.0.0.11 -- 3.0.1.11 -- 3.0.1.14 -- 3.0.2.8 -- 3.0.3.8 -- 3.0.3.9 -- 3.0.3.10 -- 3.1.0.11 -- 3.2.0.12 -- 3.2.1.20 -- 3.3.0.14 -- 3.3.0.16 - 3.4.0.22 - 3.4.0.24 - +- 4.0.1.45 +- 4.0.1.48 +- 4.1.0.23 +- 4.1.0.24 +- 4.2.0.19 +- 4.2.0.21 +- 4.3.0.12 +- 4.3.0.15 +- 4.4.0.58 +- 4.4.0.64 +- 4.4.0.68 +- 4.4.0.72 +- 4.5.0.16 +- 4.5.0.18 +- 4.5.0.19 Changelog: +- 1.1.0: +- - update compatibility info: the patch is compatible with all versions of SailfishOS up to 4.5.0.19 +- - you may have to install an older release for older SailfishOS versions +- - add donations link and feedback forum +- - 1.0.5: - - update compatibility info: the patch is compatible with all versions of SailfishOS up to 3.4.0.24 - diff --git a/sfos-patch-keyboard-swiss-german-layout/unified_diff.patch b/sfos-patch-keyboard-swiss-german-layout/unified_diff.patch index 8b54f4f..466d822 100644 --- a/sfos-patch-keyboard-swiss-german-layout/unified_diff.patch +++ b/sfos-patch-keyboard-swiss-german-layout/unified_diff.patch @@ -1,17 +1,17 @@ -diff --git a/usr/share/maliit/plugins/com/jolla/EmojiHybridKey.qml b/usr/share/maliit/plugins/com/jolla/EmojiHybridKey.qml +diff --git a/usr/share/maliit/plugins/com/jolla/ichthyo_swiss_german/EmojiHybridKey.qml b/usr/share/maliit/plugins/com/jolla/ichthyo_swiss_german/EmojiHybridKey.qml new file mode 100644 -index 0000000..9fe16b2 +index 0000000..3888567 --- /dev/null -+++ b/usr/share/maliit/plugins/com/jolla/EmojiHybridKey.qml -@@ -0,0 +1,39 @@ -+/* -+ * part of: Swiss German Keyboard Layout -+ * Copyright (c) 2019 Mirian Margiani -+*/ ++++ b/usr/share/maliit/plugins/com/jolla/ichthyo_swiss_german/EmojiHybridKey.qml +@@ -0,0 +1,58 @@ ++// This file is part of sfos-patch-keyboard-swiss-german-layout ++// SPDX-FileCopyrightText: 2019-2023 Mirian Margiani ++// SPDX-License-Identifier: GPL-3.0-or-later + +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import com.jolla.keyboard 1.0 ++import ".." + +CharacterKey { + id: characterKey @@ -39,54 +39,44 @@ index 0000000..9fe16b2 + anchors { fill: parent; topMargin: Theme.paddingMedium; bottomMargin: Theme.paddingMedium; } + } + -+ onClicked: { -+ if (_beSwitcher) canvas.switchToPreviousCharacterLayout(); -+ } -+} -diff --git a/usr/share/maliit/plugins/com/jolla/LayoutRow.qml b/usr/share/maliit/plugins/com/jolla/LayoutRow.qml -index 14d95b4..64b7b72 100644 ---- a/usr/share/maliit/plugins/com/jolla/LayoutRow.qml -+++ b/usr/share/maliit/plugins/com/jolla/LayoutRow.qml -@@ -324,6 +324,16 @@ Item { - updateLoaders([layoutIndex, left, right]) - } - + function switchToEmojisLayout() { + for (var index = 0; index < canvas.layoutModel.count; index++) { + var layout = canvas.layoutModel.get(index) + if (layout.name === "text_input_emojis") { + switchLayout(index) -+ return ++ return true + } + } ++ ++ return false + } + - function switchToPreviousCharacterLayout() { - if (previousLayout.length > 0) { - for (var index = 0; index < canvas.layoutModel.count; index++) { -@@ -337,7 +347,7 @@ Item { - - for (index = 0; index < canvas.layoutModel.count; index++) { - layout = canvas.layoutModel.get(index) -- if (layout.enabled && layout.type !== "emojis") { -+ if (layout.enabled && layout.name !== "text_input_emojis") { - switchLayout(index) - return - } ++ onClicked: { ++ if (_beSwitcher) { ++ if (switchToEmojisLayout()) { ++ captionEmoji = '☺' ++ } else { ++ captionEmoji = '↔' ++ canvas.switchToPreviousCharacterLayout() ++ } ++ } ++ } ++} diff --git a/usr/share/maliit/plugins/com/jolla/layouts/custom_de_ch.qml b/usr/share/maliit/plugins/com/jolla/layouts/custom_de_ch.qml new file mode 100644 -index 0000000..666fa98 +index 0000000..3913d00 --- /dev/null +++ b/usr/share/maliit/plugins/com/jolla/layouts/custom_de_ch.qml -@@ -0,0 +1,73 @@ +@@ -0,0 +1,74 @@ +/* + * Swiss German Keyboard Layout + * Copyright (c) 2018 Gabriel Margiani -+ * 2018-2019 Mirian Margiani ++ * 2018-2023 Mirian Margiani +*/ + +import QtQuick 2.0 +import ".." ++import "../ichthyo_swiss_german" + +KeyboardLayout { + splitSupported: true diff --git a/sfos-patch-notes-sections/CONFIG b/sfos-patch-notes-sections/CONFIG index 119e3cd..21fff87 100644 --- a/sfos-patch-notes-sections/CONFIG +++ b/sfos-patch-notes-sections/CONFIG @@ -5,16 +5,21 @@ # Fields: # - one line: Prefix, DisplayName, PackageName, Category, # Maintainer, Summary, DiscussionLink, DonationsLink, -# SourcesLink, Version -# - multiple lines: Description, Screenshots, CompatibleVersions, -# Changelog, Requires, Keywords +# SourcesLink, Version, Release, License +# - multiple lines: Keywords, Description, Screenshots, +# CompatibleVersions, Changelog, Requires, +# Obsoletes, Conflicts # (each line in a multiline field must start with '- ') # +# Required: +# DisplayName, PackageName, Category, Maintainer, Summary, Version, +# Release, License, Description, CompatibleVersions +# SourcePackages: -- jolla-notes +- jolla-notes >= 1.0.0 -Prefix: /usr/share +Prefix: /usr/share/jolla-notes DisplayName: Timestamped sections in stock Notes app PackageName: sfos-patch-notes-sections Category: Others @@ -28,15 +33,20 @@ Summary: Patch adding an option to the pulley menu for inserting timestamped sec Description: - Add an option to the stock Notes app pulley menu for inserting timestamped sections to keep order. -DiscussionLink: https://openrepos.net/content/ichthyosaurus/patch-timestamped-sections-stock-notes-app -# DonationsLink: https://example.org/donations +DiscussionLink: https://forum.sailfishos.org/t/patches-by-ichthyosaurus +DonationsLink: https://liberapay.com/ichthyosaurus SourcesLink: https://github.com/ichthyosaurus/sailfish-public-patch-sources -Version: 1.0.3 +Version: 1.1.0 Release: 1 +License: GPL-3.0-or-later Requires: - sailfish-version >= 3.0.0 +- @sources + +TestCommands: +- killall jolla-notes - jolla-notes Screenshots: @@ -60,9 +70,31 @@ CompatibleVersions: - 3.3.0.16 - 3.4.0.22 - 3.4.0.24 - +- 4.0.1.45 +- 4.0.1.48 +- 4.1.0.23 +- 4.1.0.24 +- 4.2.0.19 +- 4.2.0.21 +- 4.3.0.12 +- 4.3.0.15 +- 4.4.0.58 +- 4.4.0.64 +- 4.4.0.68 +- 4.4.0.72 +- 4.5.0.16 +- 4.5.0.18 +- 4.5.0.19 Changelog: +- 1.1.0: +- - update compatibility info: the patch is compatible with all versions of SailfishOS up to 4.5.0.19 +- - you may have to install an earlier version of this patch on older system versions +- - add donations link +- +- 1.0.4: +- - add Polish translation by atlochowski +- - 1.0.3: - - update compatibility info: the patch is compatible with all versions of SailfishOS up to 3.4.0.24 - diff --git a/sfos-patch-notes-sections/unified_diff.patch b/sfos-patch-notes-sections/unified_diff.patch index 62d8b25..c80894e 100644 --- a/sfos-patch-notes-sections/unified_diff.patch +++ b/sfos-patch-notes-sections/unified_diff.patch @@ -1,8 +1,8 @@ diff --git a/usr/share/jolla-notes/pages/NotePage.qml b/usr/share/jolla-notes/pages/NotePage.qml -index a054a77..9d69565 100644 +index 5c0cbd7..30a5f23 100644 --- a/usr/share/jolla-notes/pages/NotePage.qml +++ b/usr/share/jolla-notes/pages/NotePage.qml -@@ -274,6 +274,7 @@ Page { +@@ -284,6 +284,7 @@ Page { } } } @@ -12,10 +12,14 @@ index a054a77..9d69565 100644 Column { diff --git a/usr/share/jolla-notes/pages/NotePageTimestampedSectionMenuItem.qml b/usr/share/jolla-notes/pages/NotePageTimestampedSectionMenuItem.qml new file mode 100644 -index 0000000..1524411 +index 0000000..f4ab924 --- /dev/null +++ b/usr/share/jolla-notes/pages/NotePageTimestampedSectionMenuItem.qml -@@ -0,0 +1,67 @@ +@@ -0,0 +1,71 @@ ++// This file is part of sfos-patch-notes-sections ++// SPDX-FileCopyrightText: 2023 Mirian Margiani ++// SPDX-License-Identifier: GPL-3.0-or-later ++ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + diff --git a/sfos-patch-office-always-search/CONFIG b/sfos-patch-office-always-search/CONFIG index 64bf283..dc21ea5 100644 --- a/sfos-patch-office-always-search/CONFIG +++ b/sfos-patch-office-always-search/CONFIG @@ -5,17 +5,21 @@ # Fields: # - one line: Prefix, DisplayName, PackageName, Category, # Maintainer, Summary, DiscussionLink, DonationsLink, -# SourcesLink, Version, Release +# SourcesLink, Version, Release, License # - multiple lines: Keywords, Description, Screenshots, # CompatibleVersions, Changelog, Requires, # Obsoletes, Conflicts, TestCommands # (each line in a multiline field must start with '- ') # +# Required: +# DisplayName, PackageName, Category, Maintainer, Summary, Version, +# Release, License, Description, CompatibleVersions +# SourcePackages: - sailfish-office >= 1.5.36 -Prefix: /usr/share/ +Prefix: /usr/share/sailfish-office DisplayName: Always show search in Office PackageName: sfos-patch-office-always-search Category: Others @@ -42,21 +46,19 @@ Keywords: - Search Maintainer: ichthyosaurus -Summary: Always show search field in sailfish-office. +Summary: Always show search field in the documents app Description: - This patch makes the search field in Jolla's documents app always visible. - - The search field can be focussed using the pulley menu or by tapping on it. -- -- **Note**: this patch is not (yet) compatible with SFOS 4.0 because Patchmanager -- doesn't work for apps using sailjail. -DiscussionLink: https://openrepos.net/content/ichthyosaurus/patch-always-show-search-office -# DonationsLink: still missing +DiscussionLink: https://forum.sailfishos.org/t/patches-by-ichthyosaurus +DonationsLink: https://liberapay.com/ichthyosaurus SourcesLink: https://github.com/ichthyosaurus/sailfish-public-patch-sources -Version: 1.0.0 +Version: 1.0.1 Release: 1 +License: GPL-3.0-or-later Requires: - sailfish-version >= 3.0.0 @@ -87,10 +89,28 @@ CompatibleVersions: - 3.3.0.16 - 3.4.0.22 - 3.4.0.24 -# - 4.0.1.45 -# - 4.0.1.48 +- 4.0.1.45 +- 4.0.1.48 +- 4.1.0.23 +- 4.1.0.24 +- 4.2.0.19 +- 4.2.0.21 +- 4.3.0.12 +- 4.3.0.15 +- 4.4.0.58 +- 4.4.0.64 +- 4.4.0.68 +- 4.4.0.72 +- 4.5.0.16 +- 4.5.0.18 +- 4.5.0.19 + Changelog: +- 1.0.1: +- - update compatibility info: the patch is compatible with all versions of SailfishOS up to 4.5.0.19 +- - you may have to install an earlier version of this patch on older system versions +- - 1.0.0 (2021-05-08): - - initial public release diff --git a/sfos-patch-office-always-search/unified_diff.patch b/sfos-patch-office-always-search/unified_diff.patch index f3951e4..90d369e 100644 --- a/sfos-patch-office-always-search/unified_diff.patch +++ b/sfos-patch-office-always-search/unified_diff.patch @@ -1,8 +1,8 @@ diff --git a/usr/share/sailfish-office/FileListPage.qml b/usr/share/sailfish-office/FileListPage.qml -index 8d6bae7..16792bd 100644 +index 31d16c6..8fff649 100644 --- a/usr/share/sailfish-office/FileListPage.qml +++ b/usr/share/sailfish-office/FileListPage.qml -@@ -28,7 +28,7 @@ Page { +@@ -29,7 +29,7 @@ Page { property alias model: filteredModel.sourceModel property string title property string searchText: searchField.text @@ -11,7 +11,7 @@ index 8d6bae7..16792bd 100644 property QtObject provider property string deletingSource -@@ -155,6 +155,7 @@ Page { +@@ -156,6 +156,7 @@ Page { } } @@ -19,7 +19,7 @@ index 8d6bae7..16792bd 100644 MenuItem { text: !menu._searchEnabled ? //% "Show search" qsTrId("sailfish-office-me-show_search") -@@ -162,6 +163,7 @@ Page { +@@ -163,6 +164,7 @@ Page { : qsTrId("sailfish-office-me-hide_search") onClicked: page.searchEnabled = !page.searchEnabled } @@ -27,7 +27,7 @@ index 8d6bae7..16792bd 100644 MenuItem { //% "Sort by: %1" -@@ -176,6 +178,13 @@ Page { +@@ -177,6 +179,13 @@ Page { }) } } diff --git a/sfos-patch-office-favorites/CONFIG b/sfos-patch-office-favorites/CONFIG index c388ef1..2b318cc 100644 --- a/sfos-patch-office-favorites/CONFIG +++ b/sfos-patch-office-favorites/CONFIG @@ -5,36 +5,25 @@ # Fields: # - one line: Prefix, DisplayName, PackageName, Category, # Maintainer, Summary, DiscussionLink, DonationsLink, -# SourcesLink, Version, Release +# SourcesLink, Version, Release, License # - multiple lines: Keywords, Description, Screenshots, # CompatibleVersions, Changelog, Requires, # Obsoletes, Conflicts, TestCommands # (each line in a multiline field must start with '- ') # +# Required: +# DisplayName, PackageName, Category, Maintainer, Summary, Version, +# Release, License, Description, CompatibleVersions +# SourcePackages: - sailfish-office >= 1.5.36 -Prefix: /usr/share/ +Prefix: /usr/share/sailfish-office DisplayName: Favorites page for Office PackageName: sfos-patch-office-favorites Category: Others -# Category must be one of: -# Homescreen -# Browser -# Camera -# Calendar -# Clock -# Contacts -# Email -# Gallery -# Media -# Messages -# Phone -# Silica -# Settings -# Keyboard -# Others + Keywords: - Patch - Office @@ -43,23 +32,21 @@ Keywords: - Search Maintainer: ichthyosaurus -Summary: Patch adding a favorites page to sailfish-office. +Summary: Patch adding a favorites page to sailfish-office Description: - This patch adds support for bookmarks/favorites to Jolla's documents app. - - Save favorites from the context menu, and access the list by swiping right. - -- **Note**: this patch is not (yet) compatible with SFOS 4.0 because Patchmanager -- doesn't work for apps using sailjail. -- - The list of favorites is saved in dconf. -DiscussionLink: https://openrepos.net/content/ichthyosaurus/patch-favorites-page-office -# DonationsLink: still missing +DiscussionLink: https://forum.sailfishos.org/t/patches-by-ichthyosaurus +DonationsLink: https://liberapay.com/ichthyosaurus SourcesLink: https://github.com/ichthyosaurus/sailfish-public-patch-sources -Version: 1.0.0 +Version: 1.0.1 Release: 1 +License: GPL-3.0-or-later Requires: - sailfish-version >= 3.0.0 @@ -90,10 +77,29 @@ CompatibleVersions: - 3.3.0.16 - 3.4.0.22 - 3.4.0.24 -# - 4.0.1.45 -# - 4.0.1.48 +- 4.0.1.45 +- 4.0.1.48 +- 4.1.0.23 +- 4.1.0.24 +- 4.2.0.19 +- 4.2.0.21 +- 4.3.0.12 +- 4.3.0.15 +- 4.4.0.58 +- 4.4.0.64 +- 4.4.0.68 +- 4.4.0.72 +- 4.5.0.16 +- 4.5.0.18 +- 4.5.0.19 + Changelog: +- 1.0.1: +- - update compatibility info: the patch is compatible with all versions of SailfishOS up to 4.5.0.19 +- - you may have to install an earlier version of this patch on older system versions +- - add donations link and feedback forum +- - 1.0.0 (2021-05-08): - - initial public release diff --git a/sfos-patch-office-favorites/unified_diff.patch b/sfos-patch-office-favorites/unified_diff.patch index 757f57c..54bf849 100644 --- a/sfos-patch-office-favorites/unified_diff.patch +++ b/sfos-patch-office-favorites/unified_diff.patch @@ -1,8 +1,8 @@ diff --git a/usr/share/sailfish-office/FileListPage.qml b/usr/share/sailfish-office/FileListPage.qml -index 8d6bae7..3facd70 100644 +index 31d16c6..4d749e8 100644 --- a/usr/share/sailfish-office/FileListPage.qml +++ b/usr/share/sailfish-office/FileListPage.qml -@@ -48,6 +48,16 @@ Page { +@@ -49,6 +49,16 @@ Page { allowedOrientations: Orientation.All @@ -19,7 +19,7 @@ index 8d6bae7..3facd70 100644 onSearchEnabledChanged: { if (pageStack.currentPage.status == PageStatus.Active) { if (searchEnabled) { -@@ -76,6 +86,10 @@ Page { +@@ -77,6 +87,10 @@ Page { return "" } @@ -30,9 +30,9 @@ index 8d6bae7..3facd70 100644 FilterModel { id: filteredModel filterRegExp: RegExp(searchText, "i") -@@ -295,6 +309,10 @@ Page { - onClicked: pageStack.animatorPush("Sailfish.TransferEngine.SharePage", - { serviceFilter: ["e-mail"], mimeType: model.fileMimeType, source: model.filePath }) +@@ -302,6 +316,10 @@ Page { + mimeType: model.fileMimeType + } } + MenuItem { + text: "Add to favorites" @@ -43,13 +43,14 @@ index 8d6bae7..3facd70 100644 //% "Delete" diff --git a/usr/share/sailfish-office/PatchFavoritesConfig.qml b/usr/share/sailfish-office/PatchFavoritesConfig.qml new file mode 100644 -index 0000000..d1b41fa +index 0000000..80a0e20 --- /dev/null +++ b/usr/share/sailfish-office/PatchFavoritesConfig.qml -@@ -0,0 +1,71 @@ +@@ -0,0 +1,72 @@ +// This file is part of sfos-patch-office-favorites -+// SPDX-FileCopyrightText: 2021 Mirian Margiani ++// SPDX-FileCopyrightText: 2021-2023 Mirian Margiani +// SPDX-License-Identifier: GPL-3.0-or-later ++ +import Sailfish.Silica 1.0 +import Nemo.Configuration 1.0 +