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 -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_49.0.bb similarity index 88% rename from meta-gnome/recipes-gnome/gedit/gedit_46.2.bb rename to meta-gnome/recipes-gnome/gedit/gedit_49.0.bb index 91b2221d7a..15b14b2c90 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_49.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 = "git://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}" +SRCREV = "684abd8299139e1a3b87446da501ad034e78c840" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"