4 files changed, 21 insertions, 36 deletions

diff --git a/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch b/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch
deleted file mode 100644
index 40fd93b984..0000000000
--- a/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-Upstream-Status: Inappropriate [https://gitlab.gnome.org/GNOME/gedit/-/issues/588]
-
-Temporary workaround to fix build:
-../plugins/quickhighlight/gedit-quick-highlight-plugin.c: In function ‘gedit_quick_highlight_plugin_load_style’:
-../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: error: implicit declaration of function ‘gtk_source_style_copy’; did you mean ‘gtk_source_style_apply’? [-Wimplicit-function-declaration]
-
-   96 |                         plugin->priv->style = gtk_source_style_copy (style);
-      |                                               ^~~~~~~~~~~~~~~~~~~~~
-      |                                               gtk_source_style_apply
-../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: warning: nested extern declaration of ‘gtk_source_style_copy’ [-Wnested-externs]
-../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:45: error: assignment to ‘GtkSourceStyle *’ {aka ‘struct _GtkSourceStyle *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
-   96 |                         plugin->priv->style = gtk_source_style_copy (style);
-      |                                             ^
-
---- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c     2024-02-20 08:11:47.925749255 +0100
-+++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c     2024-02-20 08:12:16.218594067 +0100
-@@ -90,11 +90,12 @@
-        if (style_scheme != NULL)
-        {
-                style = gtk_source_style_scheme_get_style (style_scheme, "quick-highlight-match");
--
-+#if 0
-                if (style != NULL)
-                {
-                        plugin->priv->style = gtk_source_style_copy (style);
-                }
-+#endif
-        }
- }
- 
-
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
index 91b2221d7a..d15ab8665d 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
@@ -23,8 +23,8 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI += "file://0001-fix-for-clang-18.patch"
-SRC_URI[archive.sha256sum] = "c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef"
+SRC_URI = "gitsm://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}"
+SRCREV = "25d0bf0c3c40b0866fc23ec875f0af6c67f728ef"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
new file mode 100644
index 0000000000..87006cc564
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Gedit Technology - File loading and saving"
+SECTION = "gnome"
+LICENSE = "LGPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117"
+
+DEPENDS = "glib-2.0 gtk+3"
+
+inherit gobject-introspection features_check gtk-doc gnomebase
+
+SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gfls.git;branch=main;protocol=https;tag=${PV}"
+SRCREV = "ce4b836dfda4ea3f594b9ded7b60c5cb51ccbc87"
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+GIR_MESON_OPTION = "gobject_introspection"
+GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.4.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb
index 0d67471280..4939f673bb 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.4.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.6.0.bb
@@ -1,13 +1,14 @@
 SUMMARY = "Gedit Technology - Source code editing widget"
 SECTION = "gnome"
 LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=310c7c93cf5181c6b0cc8229a1f3c6f6"
 
 DEPENDS = "glib-2.0 gtk+3 libxml2"
 
 inherit gobject-introspection features_check gtk-doc gnomebase
 
-SRC_URI[archive.sha256sum] = "20c17ff89e2031aed5dc1107fe9a93fd50f92b569be2954b119c86f9e2fd85d6"
+SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gtksourceview.git;protocol=https;branch=main;tag=${PV}"
+SRCREV = "a7bdc39f9fbc10c49ea7468ac1e5bf77385da0c0"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"