[neon/neon-packaging/plasma-welcome/Neon/release_jammy] debian/patches: remove patch now in branch

[Jonathan Riddell]

Git commit 58598ab0710facc337afb8b8d73a7e94556a5f9d by Jonathan Riddell.
Committed on 26/06/2024 at 11:10.
Pushed by jriddell into branch 'Neon/release_jammy'.

remove patch now in branch

D  +0    -1    debian/patches/series
D  +0    -63   debian/patches/snap_links.diff

https://invent.kde.org/neon/neon-packaging/plasma-welcome/-/commit/58598ab0710facc337afb8b8d73a7e94556a5f9d

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 37d618e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-snap_links.diff
diff --git a/debian/patches/snap_links.diff b/debian/patches/snap_links.diff
deleted file mode 100644
index 828089b..0000000
--- a/debian/patches/snap_links.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/controller.cpp b/src/controller.cpp
-index a6cd76c9c9c7818447bca700c22d6966388aef82..39e1cf0821540bea2fdc8845dda1f3fe27b0d688 100644
---- a/src/controller.cpp
-+++ b/src/controller.cpp
-@@ -243,6 +243,11 @@ QString Controller::distroBugReportUrl()
-     return KOSRelease().bugReportUrl();
- }
- 
-+bool Controller::isDistroSnapOnly()
-+{
-+    return KOSRelease().extraValue("UBUNTU_VARIANT") == QStringLiteral("core");
-+}
-+
- KAboutData Controller::aboutData() const
- {
-     return KAboutData::applicationData();
-diff --git a/src/controller.h b/src/controller.h
-index c42e4e270d941d77569e1c280c2b1b7cc55ecb33..4f43c138397fe3bf42d8be479cb1c368eba0b565 100644
---- a/src/controller.h
-+++ b/src/controller.h
-@@ -31,6 +31,7 @@ public:
-     Q_INVOKABLE QString distroName();
-     Q_INVOKABLE QString distroIcon();
-     Q_INVOKABLE QString distroUrl();
-+    Q_INVOKABLE bool isDistroSnapOnly();
-     Q_INVOKABLE QString distroBugReportUrl();
-     Q_INVOKABLE QString installPrefix();
- 
-diff --git a/src/qml/pages/Discover.qml b/src/qml/pages/Discover.qml
-index 427e3acc53b609f2f9b77ccaae53aa5459fbb3dd..fc50555a0a0b17f5e4d76e41e009298c4426845b 100644
---- a/src/qml/pages/Discover.qml
-+++ b/src/qml/pages/Discover.qml
-@@ -53,12 +53,12 @@ GenericPage {
-             Repeater {
-                 model: ListModel {
-                     id: appsModel
--                    ListElement { name: "Krita"; appstream: "org.kde.krita"; icon: "krita.png" }
--                    ListElement { name: "Blender"; appstream: "org.blender.Blender"; icon: "blender" }
--                    ListElement { name: "VLC"; appstream: "org.videolan.VLC"; icon: "vlc" }
--                    ListElement { name: "GIMP"; appstream: "org.gimp.GIMP"; icon: "gimp" }
--                    ListElement { name: "KStars"; appstream: "org.kde.kstars.desktop"; icon: "kstars" }
--                    ListElement { name: "Endless Sky"; appstream: "io.github.endless_sky.endless_sky"; icon: "endlesssky.png" }
-+                    ListElement { name: "Krita"; appstream: "org.kde.krita"; snap: "krita"; icon: "krita.png" }
-+                    ListElement { name: "Blender"; appstream: "org.blender.Blender"; snap: "blender"; icon: "blender" }
-+                    ListElement { name: "VLC"; appstream: "org.videolan.VLC"; snap: "vlc"; icon: "vlc" }
-+                    ListElement { name: "GIMP"; appstream: "org.gimp.GIMP"; snap: "gimp"; icon: "gimp" }
-+                    ListElement { name: "KStars"; appstream: "org.kde.kstars.desktop"; snap: "kstars"; icon: "kstars" }
-+                    ListElement { name: "Endless Sky"; appstream: "io.github.endless_sky.endless_sky"; snap: "endlesssky"; icon: "endlesssky.png" }
-                 }
-                 delegate: ColumnLayout {
-                     spacing: Kirigami.Units.smallSpacing
-@@ -94,7 +94,10 @@ GenericPage {
-                         cursorShape: Qt.PointingHandCursor
-                     }
-                     TapHandler {
--                        onTapped: Qt.openUrlExternally(`appstream://${model.appstream}`)
-+                        onTapped: {
-+                          let url = Controller.isDistroSnapOnly() ? `snap://${model.snap}` : `appstream://${model.appstream}`
-+                          Qt.openUrlExternally(url)
-+                        }
-                     }
- 
-                     QQC2.ToolTip {