MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-16 15:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gedit: update 46.1 -> 46.2

Browse Source 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk 2024-02-20 08:19:30 +01:00 committed by Khem Raj
parent e685a6049c
commit 67b383eee4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch Normal file
View File

@ -0,0 +1,32 @@
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
}
}

3
meta-gnome/recipes-gnome/gedit/gedit_46.1.bb → meta-gnome/recipes-gnome/gedit/gedit_46.2.bb
View File

@ -23,7 +23,8 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get
def gnome_verdir(v): def gnome_verdir(v):
return oe.utils.trim_version(v, 1) return oe.utils.trim_version(v, 1)
SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e" SRC_URI += "file://0001-fix-for-clang-18.patch"
SRC_URI[archive.sha256sum] = "c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef"
# gobject-introspection is mandatory and cannot be configured # gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"