From patchwork Tue Feb 20 07:19:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 39778 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3B7DC48BC4 for ; Tue, 20 Feb 2024 07:19:32 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web10.8419.1708413565284881536 for ; Mon, 19 Feb 2024 23:19:25 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd84.aul.t-online.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout03.t-online.de (Postfix) with SMTP id 5158F5C6A; Tue, 20 Feb 2024 08:19:23 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.43.200]) by fwd84.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1rcKPS-1M1GV70; Tue, 20 Feb 2024 08:19:22 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCHv2] gedit: update 46.1 -> 46.2 Date: Tue, 20 Feb 2024 08:19:30 +0100 Message-ID: <20240220071934.10184-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1708413562-2E7FB9FB-EE0D0223/0/0 CLEAN NORMAL X-TOI-MSGID: 975d246d-e650-4465-9e7a-9e97f1bf9059 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 20 Feb 2024 07:19:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108917 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../gedit/gedit/0001-fix-for-clang-18.patch | 32 +++++++++++++++++++ .../gedit/{gedit_46.1.bb => gedit_46.2.bb} | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch rename meta-gnome/recipes-gnome/gedit/{gedit_46.1.bb => gedit_46.2.bb} (89%) 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 new file mode 100644 index 000000000..40fd93b98 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch @@ -0,0 +1,32 @@ +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.1.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb similarity index 89% rename from meta-gnome/recipes-gnome/gedit/gedit_46.1.bb rename to meta-gnome/recipes-gnome/gedit/gedit_46.2.bb index c0221b9a7..6cdc33c1c 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb @@ -23,7 +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[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 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"