[neon/neon-packaging/kclock/Neon/unstable] debian/patches: Revert "backport patch as recommended on distro list"
Carlos De Maine
null at kde.org
Wed Apr 2 06:26:15 BST 2025
Git commit 96a172fdb196c8c755d77c0708f894b246d2584d by Carlos De Maine.
Committed on 02/04/2025 at 05:26.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "backport patch as recommended on distro list"
This reverts commit d9dda904792532a9f1e783e9d215a698a2000b64
D +0 -114 debian/patches/kiragami_fixes.patch
D +0 -1 debian/patches/series
https://invent.kde.org/neon/neon-packaging/kclock/-/commit/96a172fdb196c8c755d77c0708f894b246d2584d
diff --git a/debian/patches/kiragami_fixes.patch b/debian/patches/kiragami_fixes.patch
deleted file mode 100644
index 9983887..0000000
--- a/debian/patches/kiragami_fixes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 7926d90aa82875e5c7e87e8c41c766c1f1d156c0 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate at kde.org>
-Date: Mon, 24 Mar 2025 14:18:15 -0600
-Subject: [PATCH] AlarmForm: create duration and snooze models correctly
-
-Currently these are created imperatively to work around the fact that
-ListItem can't accept i18n() strings. This imperative assignment breaks
-implicitWidth bindings on the Repeater object, which bubbles up and
-eventually causes the dialog to have a content size of zero.
-
-Instead, create the data models as arrays of dictionaries, which
-preserves the bindings and is the recommended way to do this sort of
-lightweight custom model.
----
- src/kclock/qml/alarm/AlarmForm.qml | 64 ++++++++++++++----------------
- 1 file changed, 29 insertions(+), 35 deletions(-)
-
-diff --git a/src/kclock/qml/alarm/AlarmForm.qml b/src/kclock/qml/alarm/AlarmForm.qml
-index 29644d82..969ad47b 100644
---- a/src/kclock/qml/alarm/AlarmForm.qml
-+++ b/src/kclock/qml/alarm/AlarmForm.qml
-@@ -129,30 +129,27 @@ Kirigami.FormLayout {
- }
- }
- title: i18n("Select Ring Duration")
-- model: ListModel {
-- // we can't use i18n with ListElement
-- Component.onCompleted: {
-- append({"name": i18n("None"), "value": -1});
-- append({"name": i18n("1 minute"), "value": 1});
-- append({"name": i18n("2 minutes"), "value": 2});
-- append({"name": i18n("5 minutes"), "value": 5});
-- append({"name": i18n("10 minutes"), "value": 10});
-- append({"name": i18n("15 minutes"), "value": 15});
-- append({"name": i18n("30 minutes"), "value": 30});
-- append({"name": i18n("1 hour"), "value": 60});
-- }
-- }
--
-+ model: [
-+ {"name": i18n("None"), "value": -1},
-+ {"name": i18n("1 minute"), "value": 1},
-+ {"name": i18n("2 minutes"), "value": 2},
-+ {"name": i18n("5 minutes"), "value": 5},
-+ {"name": i18n("10 minutes"), "value": 10},
-+ {"name": i18n("15 minutes"), "value": 15},
-+ {"name": i18n("30 minutes"), "value": 30},
-+ {"name": i18n("1 hour"), "value": 60}
-+ ]
-+
- dialogDelegate: RadioDelegate {
- implicitWidth: Kirigami.Units.gridUnit * 16
- topPadding: Kirigami.Units.smallSpacing * 2
- bottomPadding: Kirigami.Units.smallSpacing * 2
--
-- text: name
-- checked: root.formRingDuration == value
-+
-+ text: modelData.name
-+ checked: root.formRingDuration == modelData.value
- onCheckedChanged: {
- if (checked) {
-- root.formRingDuration = value;
-+ root.formRingDuration = modelData.value;
- }
- }
- }
-@@ -167,29 +164,26 @@ Kirigami.FormLayout {
- Kirigami.FormData.label: i18n("Snooze Length:")
- title: i18n("Select Snooze Length")
- text: formSnoozeDuration === 1 ? i18n("1 minute") : i18n("%1 minutes", formSnoozeDuration)
-- model: ListModel {
-- // we can't use i18n with ListElement
-- Component.onCompleted: {
-- append({"name": i18n("1 minute"), "value": 1});
-- append({"name": i18n("2 minutes"), "value": 2});
-- append({"name": i18n("5 minutes"), "value": 5});
-- append({"name": i18n("10 minutes"), "value": 10});
-- append({"name": i18n("15 minutes"), "value": 15});
-- append({"name": i18n("30 minutes"), "value": 30});
-- append({"name": i18n("1 hour"), "value": 60});
-- }
-- }
--
-+ model: [
-+ {"name": i18n("1 minute"), "value": 1},
-+ {"name": i18n("2 minutes"), "value": 2},
-+ {"name": i18n("5 minutes"), "value": 5},
-+ {"name": i18n("10 minutes"), "value": 10},
-+ {"name": i18n("15 minutes"), "value": 15},
-+ {"name": i18n("30 minutes"), "value": 30},
-+ {"name": i18n("1 hour"), "value": 60},
-+ ]
-+
- dialogDelegate: RadioDelegate {
- implicitWidth: Kirigami.Units.gridUnit * 16
- topPadding: Kirigami.Units.smallSpacing * 2
- bottomPadding: Kirigami.Units.smallSpacing * 2
--
-- text: name
-- checked: root.formSnoozeDuration == value
-+
-+ text: modelData.name
-+ checked: root.formSnoozeDuration == modelData.value
- onCheckedChanged: {
- if (checked) {
-- root.formSnoozeDuration = value;
-+ root.formSnoozeDuration = modelData.value;
- }
- }
- }
---
-GitLab
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0c36346..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kiragami_fixes.patch
More information about the Neon-commits
mailing list