From cddc20f9c653822ca90f2c44039908b3ecc98fa4 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 24 Sep 2023 09:01:59 +0200 Subject: gedit: Upgrade 44.2 -> 46.1 - add recipes for libedit-amtk and libgedit-gtksourceview - drop deprecated amtk recipe - update dependencies - fix reproducibility issue Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 22 --------- meta-gnome/recipes-gnome/gedit/gedit_44.2.bb | 46 ------------------- meta-gnome/recipes-gnome/gedit/gedit_46.1.bb | 53 ++++++++++++++++++++++ .../recipes-gnome/gedit/libgedit-amtk_5.8.0.bb | 17 +++++++ .../gedit/libgedit-gtksourceview_299.0.4.bb | 24 ++++++++++ 5 files changed, 94 insertions(+), 68 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb delete mode 100644 meta-gnome/recipes-gnome/gedit/gedit_44.2.bb create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_46.1.bb 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 (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb deleted file mode 100644 index fbc8f38454..0000000000 --- a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtk-doc-native \ - libxslt-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -GNOMEBASEBUILDCLASS = "meson" - -GIR_MESON_OPTION = "" - -inherit gnomebase gettext features_check gobject-introspection - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" diff --git a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb deleted file mode 100644 index 34c782297c..0000000000 --- a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - 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 - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES:${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb new file mode 100644 index 0000000000..01d7a072aa --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb @@ -0,0 +1,53 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-or-later" +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 \ + tepl \ +" + +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] = "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|${B}||g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c +} + +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" 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 0000000000..11da836ff4 --- /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/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = "glib-2.0 gtk+3" + +inherit meson pkgconfig gobject-introspection features_check 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 0000000000..3a655f6509 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb @@ -0,0 +1,24 @@ +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 features_check 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" + +do_install:prepend() { + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h +} + +FILES:${PN} += "${datadir}" -- cgit v1.2.3-54-g00ecf