From 8be49739f11f25e50762d4e9c899f1a93acf1cae Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 27 Nov 2022 13:28:39 +0100 Subject: gnome-shell: update 42.0 -> 43.1 - build with gtk4 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../gnome-shell/gnome-shell-extensions_42.0.bb | 29 --------- .../gnome-shell/gnome-shell-extensions_43.1.bb | 29 +++++++++ ...ptions-gjs_path-to-optionally-set-path-to.patch | 27 ++++---- .../recipes-gnome/gnome-shell/gnome-shell_42.0.bb | 71 --------------------- .../recipes-gnome/gnome-shell/gnome-shell_43.1.bb | 74 ++++++++++++++++++++++ 5 files changed, 118 insertions(+), 112 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb deleted file mode 100644 index e8c95d6fb2..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GNOME Shell Extensions" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext gsettings features_check - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" - -SRC_URI[archive.sha256sum] = "3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f" - -DEPENDS += " \ - sassc-native \ -" - -EXTRA_OEMESON += " \ - -Dextension_set=all \ - -Dclassic_mode=true \ -" - -RDEPENDS:${PN} += "gnome-shell" - -FILES:${PN} += " \ - ${datadir}/gnome-shell \ - ${datadir}/gnome-session \ - ${datadir}/wayland-sessions \ - ${datadir}/xsessions \ -" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb new file mode 100644 index 0000000000..e8c95d6fb2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "GNOME Shell Extensions" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext gsettings features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f" + +DEPENDS += " \ + sassc-native \ +" + +EXTRA_OEMESON += " \ + -Dextension_set=all \ + -Dclassic_mode=true \ +" + +RDEPENDS:${PN} += "gnome-shell" + +FILES:${PN} += " \ + ${datadir}/gnome-shell \ + ${datadir}/gnome-session \ + ${datadir}/wayland-sessions \ + ${datadir}/xsessions \ +" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch index 4a36625184..b583199e98 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch @@ -1,4 +1,4 @@ -From 3bf597b16e23cd2ce0ee3b05c23b46add5e26cd4 Mon Sep 17 00:00:00 2001 +From 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 28 Oct 2021 18:57:24 +0200 Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs @@ -6,9 +6,15 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Upstream-Status: Pending Signed-off-by: Andreas Müller + --- js/dbusServices/meson.build | 2 +- meson.build | 6 +++++- @@ -19,10 +25,10 @@ Signed-off-by: Andreas Müller 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index eb941ed..16efaeb 100644 +index 48b7f89..700b590 100644 --- a/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build -@@ -27,7 +27,7 @@ foreach service, dir : dbus_services +@@ -22,7 +22,7 @@ foreach service, dir : dbus_services serviceconf = configuration_data() serviceconf.set('service', service) @@ -32,10 +38,10 @@ index eb941ed..16efaeb 100644 configure_file( diff --git a/meson.build b/meson.build -index 8d7478f..7c9cc6a 100644 +index 252fb1e..250f722 100644 --- a/meson.build +++ b/meson.build -@@ -138,7 +138,11 @@ endif +@@ -125,7 +125,11 @@ endif mutter_typelibdir = mutter_dep.get_variable('typelibdir') python = find_program('python3') @@ -49,11 +55,11 @@ index 8d7478f..7c9cc6a 100644 cc = meson.get_compiler('c') diff --git a/meson_options.txt b/meson_options.txt -index f0f2ecf..a45f2e4 100644 +index 46ca8e7..3e9a31f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -45,3 +45,9 @@ option('soup2', - value: true, + value: false, description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather' ) + @@ -76,10 +82,10 @@ index ce2a776..8f7bba4 100644 configure_file( input: prgname + '.in', diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build -index c260d7a..c5b7554 100644 +index 66a39e9..331dc1d 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build -@@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale') +@@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale') metainfodir = join_paths(datadir, 'metainfo') servicedir = join_paths(datadir, 'dbus-1', 'services') @@ -107,6 +113,3 @@ index ca2eb41..2787785 100644 + value: '', + description: 'Instead of searching gjs executable, configure path' +) --- -2.34.1 - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb deleted file mode 100644 index f54d966c73..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - libxml2-native \ - sassc-native \ - gtk4 \ - mutter \ - evolution-data-server \ - gcr \ - gjs \ - gnome-autoar \ - polkit \ - libcroco \ - startup-notification \ - ibus \ - gsettings-desktop-schemas \ -" - -inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" - -GTKIC_VERSION = "4" -GTKDOC_MESON_OPTION = "gtk_doc" -GIR_MESON_OPTION = "" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" - -SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094" -SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" - -PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" -PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" - -EXTRA_OEMESON = " \ - -Dgjs_path=${bindir}/gjs \ - -Dextensions-app:gjs_path=${bindir}/gjs \ - -Dtests=false \ - -Dman=false \ -" - -do_install:append() { - # fix shebangs - for tool in `find ${D}${bindir} -name '*-tool'`; do - sed -i 's:#!${PYTHON}:#!${bindir}/${PYTHON_PN}:' $tool - done -} - -GSETTINGS_PACKAGE = "${PN}-gsettings" - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-control-center \ - ${datadir}/xdg-desktop-portal \ - ${systemd_user_unitdir} \ -" - -RDEPENDS:${PN} += "gnome-desktop gsettings-desktop-schemas gdm-base librsvg-gtk ${PN}-gsettings" - -PACKAGES =+ "${PN}-tools ${PN}-gsettings" -FILES:${PN}-tools = "${bindir}/*-tool" -RDEPENDS:${PN}-tools = "python3-core" - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb new file mode 100644 index 0000000000..6adbb0a292 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb @@ -0,0 +1,74 @@ +SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + libxml2-native \ + sassc-native \ + gtk4 \ + mutter \ + evolution-data-server \ + gcr \ + geocode-glib \ + gjs \ + gnome-autoar \ + polkit \ + libcroco \ + libsoup-3.0 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \ + ibus \ + gsettings-desktop-schemas \ +" + +inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +GTKIC_VERSION = "4" +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_OPTION = "" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc" +SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" + +PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" +PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +EXTRA_OEMESON = " \ + -Dgjs_path=${bindir}/gjs \ + -Dextensions-app:gjs_path=${bindir}/gjs \ + -Dtests=false \ + -Dman=false \ + -Dsoup2=false \ +" + +do_install:append() { + # fix shebangs + for tool in `find ${D}${bindir} -name '*-tool'`; do + sed -i 's:#!${PYTHON}:#!${bindir}/${PYTHON_PN}:' $tool + done +} + +GSETTINGS_PACKAGE = "${PN}-gsettings" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-control-center \ + ${datadir}/xdg-desktop-portal \ + ${systemd_user_unitdir} \ +" + +RDEPENDS:${PN} += "gnome-desktop gsettings-desktop-schemas gdm-base librsvg-gtk ${PN}-gsettings" + +PACKAGES =+ "${PN}-tools ${PN}-gsettings" +FILES:${PN}-tools = "${bindir}/*-tool" +RDEPENDS:${PN}-tools = "python3-core" + -- cgit v1.2.3-54-g00ecf