[neon/snap-packaging/kf6-core-sdk/work.core24] /: add marble patch, bump more versions

[Scarlett Moore]

Git commit d68679c227f30b1458b2c6793e5549f7d904e967 by Scarlett Moore.
Committed on 22/06/2026 at 09:59.
Pushed by scarlettmoore into branch 'work.core24'.

add marble patch, bump more versions

A  +13   -0    patches/marble/disable_broken_osm_plugin.patch
M  +3    -3    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/d68679c227f30b1458b2c6793e5549f7d904e967

diff --git a/patches/marble/disable_broken_osm_plugin.patch b/patches/marble/disable_broken_osm_plugin.patch
new file mode 100644
index 0000000..29dcdc7
--- /dev/null
+++ b/patches/marble/disable_broken_osm_plugin.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/runner/CMakeLists.txt b/src/plugins/runner/CMakeLists.txt
+index f27ee6f4a..1c479973b 100644
+--- src/plugins/runner/CMakeLists.txt
++++ src/plugins/runner/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_subdirectory(cache)
+ add_subdirectory(gpx)
+ add_subdirectory(json)
+ add_subdirectory(kml)
+-add_subdirectory(osm)
++#add_subdirectory(osm)
+ add_subdirectory(pn2)
+ add_subdirectory(pnt)
+ add_subdirectory(log)
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 57a44b4..49ff5a3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1958,7 +1958,7 @@ parts:
       - breeze-icons
       - qtkeychain
     source: https://invent.kde.org/libraries/ktextaddons.git
-    source-branch: 2.0
+    source-branch: 2.1
     source-depth: 1
     build-snaps:
       - kde-qt6-core24-sdk/latest/beta
@@ -2049,7 +2049,7 @@ parts:
     after:
       - extra-cmake-modules
     source: https://invent.kde.org/frameworks/oxygen-icons.git
-    source-tag: v6.0.0
+    source-tag: *kf6-version
     source-depth: 1
     build-snaps:
       - kde-qt6-core24-sdk/latest/beta
@@ -2539,7 +2539,7 @@ parts:
     build-environment: *buildenvironment
     override-pull: |
         craftctl default
-        patch -p0 < ${SNAPCRAFT_PROJECT_DIR}/project/bundles/snap/snap/local/disable_broken_osm_plugin.patch
+        patch -p0 < ${SNAPCRAFT_PROJECT_DIR}/patches/marble/disable_broken_osm_plugin.patch
     override-build: |
       craftctl default
       rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /