From 44acebcec7c227740d4bffdc96ec908e34eeacb7 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 1 Nov 2021 12:49:21 +0100 Subject: gnome-shell: upgrade 3.34.5 -> 41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...ptions-gjs_path-to-optionally-set-path-to.patch | 112 +++++++++++++++++++++ .../gnome-shell/gnome-shell_3.34.5.bb | 66 ------------ .../recipes-gnome/gnome-shell/gnome-shell_41.0.bb | 70 +++++++++++++ 3 files changed, 182 insertions(+), 66 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.0.bb 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 new file mode 100644 index 0000000000..15e3c8c647 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch @@ -0,0 +1,112 @@ +From 3bf597b16e23cd2ce0ee3b05c23b46add5e26cd4 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 +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 +++++- + meson_options.txt | 6 ++++++ + subprojects/extensions-app/js/meson.build | 2 +- + subprojects/extensions-app/meson.build | 7 ++++++- + subprojects/extensions-app/meson_options.txt | 6 ++++++ + 6 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build +index 68e8bd12d..16efaebe5 100644 +--- a/js/dbusServices/meson.build ++++ b/js/dbusServices/meson.build +@@ -27,7 +27,7 @@ foreach service, dir : dbus_services + + serviceconf = configuration_data() + serviceconf.set('service', service) +- serviceconf.set('gjs', gjs.path()) ++ serviceconf.set('gjs', gjs) + serviceconf.set('pkgdatadir', pkgdatadir) + + configure_file( +diff --git a/meson.build b/meson.build +index d4583ecf2..3448c6312 100644 +--- a/meson.build ++++ b/meson.build +@@ -138,7 +138,11 @@ endif + + mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir') + python = find_program('python3') +-gjs = find_program('gjs') ++if get_option('gjs_path') == '' ++ gjs = find_program('gjs') ++else ++ gjs = get_option('gjs_path') ++endif + + cc = meson.get_compiler('c') + +diff --git a/meson_options.txt b/meson_options.txt +index f0f2ecf6c..a45f2e453 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,3 +45,9 @@ option('soup2', + value: true, + description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather' + ) ++ ++option('gjs_path', ++ type: 'string', ++ value: '', ++ description: 'Instead of searching gjs executable, configure path' ++) +diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build +index f311db6e0..8f7bba4e4 100644 +--- a/subprojects/extensions-app/js/meson.build ++++ b/subprojects/extensions-app/js/meson.build +@@ -9,7 +9,7 @@ endif + launcherconf.set('prefix', prefix) + launcherconf.set('libdir', libdir) + launcherconf.set('pkgdatadir', pkgdatadir) +-launcherconf.set('gjs', gjs.path()) ++launcherconf.set('gjs', gjs) + + configure_file( + input: prgname + '.in', +diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build +index f9ccfc24d..bdf118975 100644 +--- a/subprojects/extensions-app/meson.build ++++ b/subprojects/extensions-app/meson.build +@@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale') + metainfodir = join_paths(datadir, 'metainfo') + servicedir = join_paths(datadir, 'dbus-1', 'services') + +-gjs = find_program('gjs') ++if get_option('gjs_path') == '' ++ gjs = find_program('gjs') ++else ++ gjs = get_option('gjs_path') ++endif ++ + appstream_util = find_program('appstream-util', required: false) + desktop_file_validate = find_program('desktop-file-validate', required: false) + +diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt +index ca2eb4115..2787785bf 100644 +--- a/subprojects/extensions-app/meson_options.txt ++++ b/subprojects/extensions-app/meson_options.txt +@@ -10,3 +10,9 @@ option('profile', + ], + value: 'default' + ) ++ ++option('gjs_path', ++ type: 'string', ++ value: '', ++ description: 'Instead of searching gjs executable, configure path' ++) +-- +2.31.1 + diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb deleted file mode 100644 index b1aa519a05..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext gobject-introspection features_check upstream-version-is-even bash-completion - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" - -DEPENDS = " \ - libxml2-native \ - sassc-native \ - gtk+3 \ - mutter \ - evolution-data-server \ - gcr \ - gjs \ - gnome-autoar \ - polkit \ - libcroco \ - startup-notification \ - ibus \ - gsettings-desktop-schemas \ -" - -GTKDOC_MESON_OPTION = "gtk_doc" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" - -SRC_URI[archive.md5sum] = "4bd27c8a91d30fde78cb69b94677cf1f" -SRC_URI[archive.sha256sum] = "d296f318a74a6d7883358a6ce1c4d8808b7903dbbb4f9c61ab4230f18e6d7550" - -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 = " \ - -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}/dbus-1 \ - ${datadir}/gnome-control-center \ - ${datadir}/xdg-desktop-portal \ - ${systemd_user_unitdir} \ -" - -RDEPENDS:${PN} += "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_41.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.0.bb new file mode 100644 index 0000000000..6ac2973b9e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.0.bb @@ -0,0 +1,70 @@ +SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gettext gobject-introspection features_check bash-completion + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +DEPENDS = " \ + libxml2-native \ + sassc-native \ + gtk4 \ + mutter \ + evolution-data-server \ + gcr \ + gjs \ + gnome-autoar \ + polkit \ + libcroco \ + startup-notification \ + ibus \ + gsettings-desktop-schemas \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" + +SRC_URI[archive.sha256sum] = "52f971e85140e5de74b9369ef6656e49ce95af1f232fc1e0df1f046129ab4f65" +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} += "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