From patchwork Sat Sep 23 14:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 31053 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 93754CE7A89 for ; Sat, 23 Sep 2023 14:56:30 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web11.22179.1695480987134309526 for ; Sat, 23 Sep 2023 07:56:27 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd80.aul.t-online.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout04.t-online.de (Postfix) with SMTP id A28381D73F for ; Sat, 23 Sep 2023 16:56:25 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.163.34.192]) by fwd80.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qk43Q-25qvuT0; Sat, 23 Sep 2023 16:56:21 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCHv2] gedit: Upgrade 44.2 -> 46.1 Date: Sat, 23 Sep 2023 16:56:11 +0200 Message-ID: <20230923145611.872926-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1695480981-967F6D42-055CEBC0/0/0 CLEAN NORMAL X-TOI-MSGID: c0457792-d5da-43f3-b1c9-6d1b68428e08 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 ; Sat, 23 Sep 2023 14:56:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105094 - add recipes for libedit-amtk and libgedit-gtksourceview - update dependencies - fix reproducibility issue Signed-off-by: Markus Volk --- .../gedit/{gedit_44.2.bb => gedit_46.1.bb} | 13 ++++++++++--- .../gedit/libgedit-amtk_5.8.0.bb | 17 +++++++++++++++++ .../gedit/libgedit-gtksourceview_299.0.4.bb | 19 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) rename meta-gnome/recipes-gnome/gedit/{gedit_44.2.bb => gedit_46.1.bb} (67%) create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb diff --git a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb similarity index 67% rename from meta-gnome/recipes-gnome/gedit/gedit_44.2.bb rename to meta-gnome/recipes-gnome/gedit/gedit_46.1.bb index 34c782297..0538221f4 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb @@ -6,27 +6,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" DEPENDS = " \ + appstream-glib-native \ + desktop-file-utils-native \ + libgedit-amtk \ + libgedit-gtksourceview \ gdk-pixbuf-native \ gtk+3 \ gsettings-desktop-schemas \ libpeas \ libsoup \ gspell \ - gtksourceview4 \ tepl \ " -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11" +SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +do_install:prepend() { + sed -i -e 's|${S}/src|/usr/src/debug/${PN}/${PV}-${PR}/src|g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c +} + GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb new file mode 100644 index 000000000..59ae16948 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications" +SECTION = "gnome" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES;md5=75859989545e37968a99b631ef42722e" + +DEPENDS = "amtk" + +inherit meson pkgconfig gobject-introspection gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4" + +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.0.4.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb new file mode 100644 index 000000000..3f7ac9623 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb @@ -0,0 +1,19 @@ +SUMMARY = "Gedit Technology - Source code editing widget" +SECTION = "gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "glib-2.0 gtk+3 libxml2" + +inherit meson pkgconfig gobject-introspection gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "7062264d635f6efe04d88217a893a97ff385b873" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "gobject_introspection" +GTKDOC_MESON_OPTION = "gtk_doc" + +FILES:${PN} += "${datadir}"