From d217ca41bf5503dc7b79cf1707ea4815c94142a7 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 10 Nov 2023 12:18:51 +0100 Subject: gnomebase.bbclass: Use meson as default buildsystem The vast majority of gnome recipes uses meson. Set it as default and override the few recipes that still use autotools. This way we can remove a lot of lines in meta-oe and more important it would not be needed to explicitly set GNOMEBASEBUILDCLASS = "meson" for newly created gnome recipe anymore. (From OE-Core rev: 8b061ea36f8b94b482c5867fe2ba7213288a5aa3) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-gnome/epiphany/epiphany_44.6.bb | 1 - meta/recipes-gnome/gcr/gcr_4.1.0.bb | 1 - meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb | 1 - meta/recipes-gnome/gnome/gconf_3.2.6.bb | 1 + .../gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb | 1 - meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 1 + meta/recipes-gnome/json-glib/json-glib_1.6.6.bb | 1 - meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb | 1 - meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb | 1 - meta/recipes-gnome/libgudev/libgudev_238.bb | 1 - meta/recipes-gnome/libnotify/libnotify_0.8.2.bb | 1 - meta/recipes-gnome/librsvg/librsvg_2.56.3.bb | 1 + meta/recipes-gnome/libsecret/libsecret_0.21.1.bb | 1 - 13 files changed, 3 insertions(+), 10 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/epiphany/epiphany_44.6.bb b/meta/recipes-gnome/epiphany/epiphany_44.6.bb index d8dd3d6dae..577eb43a80 100644 --- a/meta/recipes-gnome/epiphany/epiphany_44.6.bb +++ b/meta/recipes-gnome/epiphany/epiphany_44.6.bb @@ -23,7 +23,6 @@ DEPENDS = " \ desktop-file-utils-native \ " -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta/recipes-gnome/gcr/gcr_4.1.0.bb b/meta/recipes-gnome/gcr/gcr_4.1.0.bb index 239d9806cc..399f327e04 100644 --- a/meta/recipes-gnome/gcr/gcr_4.1.0.bb +++ b/meta/recipes-gnome/gcr/gcr_4.1.0.bb @@ -15,7 +15,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" CFLAGS += "-D_GNU_SOURCE" -GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspection gettext mime mime-xdg diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb index 4dbcced5c3..0bd98288f6 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase allarch gtk-icon-cache SRC_URI[archive.sha256sum] = "2442bfb06f4e6cc95bf6e2682fdff98fa5eddc688751b9d6215c623cb4e42ff1" diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb index 4930aeb9f0..1e29bd9bb0 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib libxml2 intltool-native" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb index 8e30d5e524..5ccc1a7dd4 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_44.0.bb @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 150eca9274..2e8ab1c771 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -5,6 +5,7 @@ HOMEPAGE = "https://www.gtk.org/docs/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase # Configure the scripts correctly (and build their dependencies) only if they are actually diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb index 9c34fb7f40..a9a71953c3 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "glib-2.0 glib-2.0-native" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gobject-introspection gi-docgen gettext ptest-gnome manpages upstream-version-is-even GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb index d8aa2cd697..cc05756805 100644 --- a/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb +++ b/meta/recipes-gnome/libadwaita/libadwaita_1.4.0.bb @@ -3,7 +3,6 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libadwaita" LICENSE="LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -GNOMEBASEBUILDCLASS = "meson" DEPENDS = " \ gtk4 \ diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb index 49ebc818b0..9bca7e9dce 100644 --- a/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb @@ -7,7 +7,6 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libdazzle" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libdazzle/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase upstream-version-is-even vala features_check gobject-introspection DEPENDS = "glib-2.0-native glib-2.0 gtk+3" diff --git a/meta/recipes-gnome/libgudev/libgudev_238.bb b/meta/recipes-gnome/libgudev/libgudev_238.bb index c71e4bda74..5923544eca 100644 --- a/meta/recipes-gnome/libgudev/libgudev_238.bb +++ b/meta/recipes-gnome/libgudev/libgudev_238.bb @@ -14,7 +14,6 @@ RCONFLICTS:${PN} = "systemd (<= 220)" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc GIR_MESON_ENABLE_FLAG = 'enabled' diff --git a/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb b/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb index 6888c33d14..1ca7ef8714 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.8.2.bb @@ -14,7 +14,6 @@ DEPENDS = "glib-2.0 glib-2.0-native gdk-pixbuf" PACKAGECONFIG ?= "" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gtk+3" -GNOMEBASEBUILDCLASS = "meson" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" inherit gnomebase gi-docgen features_check gobject-introspection diff --git a/meta/recipes-gnome/librsvg/librsvg_2.56.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.56.3.bb index 43d4059cf2..9824b8898d 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.56.3.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.56.3.bb @@ -14,6 +14,7 @@ SECTION = "x11/utils" DEPENDS = "cairo gdk-pixbuf glib-2.0 libxml2 pango python3-docutils-native" BBCLASSEXTEND = "native nativesdk" +GNOMEBASEBUILDCLASS = "autotools" inherit cargo_common gnomebase pixbufcache gobject-introspection rust vala gi-docgen cargo-update-recipe-crates require ${BPN}-crates.inc diff --git a/meta/recipes-gnome/libsecret/libsecret_0.21.1.bb b/meta/recipes-gnome/libsecret/libsecret_0.21.1.bb index 63102476cb..f762d7c343 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.21.1.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.21.1.bb @@ -8,7 +8,6 @@ HOMEPAGE = "https://github.com/GNOME/libsecret" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gi-docgen vala gobject-introspection manpages -- cgit v1.2.3-54-g00ecf