update some patches

ichthyosaurus · Apr 13, 2023 · a7507f5 · a7507f5
1 parent 3748234
commit a7507f5
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 151 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 +