diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
11 files changed, 44 insertions, 43 deletions
diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index a11815fb1..1a9105000 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -13,6 +13,6 @@ revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch new file mode 100644 index 000000000..b2f13afd5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch @@ -0,0 +1,28 @@ +From 073d622fbf8564271cd9be87c2f619ea00498578 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 1 May 2021 08:25:24 -0700 +Subject: [PATCH] Fix build with OpenEXR 3 + +Add a header that is no longer transitively included + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/96] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + operations/external/exr-save.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc +index 1e8c09d..87abed5 100644 +--- a/operations/external/exr-save.cc ++++ b/operations/external/exr-save.cc +@@ -45,6 +45,7 @@ extern "C" { + #include <ImfChromaticities.h> + #include <ImfStandardAttributes.h> + #include <ImfArray.h> ++#include <ImfFrameBuffer.h> + #include "ImathRandom.h" + + +-- +2.31.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch deleted file mode 100644 index 6a49f1d7c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 8 Feb 2020 14:29:52 +0100 -Subject: [PATCH] meson.build: Give note if sdl2 was found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Configure output confused me a bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 9d5b484..296b5f3 100644 ---- a/meson.build -+++ b/meson.build -@@ -374,6 +374,7 @@ message('\n'.join(['', - ' OpenEXR: @0@'.format(openexr.found()), - ' rsvg: @0@'.format(librsvg.found()), - ' SDL: @0@'.format(sdl1.found()), -+' SDL2: @0@'.format(sdl2.found()), - ' libraw: @0@'.format(libraw.found()), - ' Jasper: @0@'.format(jasper.found()), - ' av libs: @0@'.format(avlibs_found), --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb index 810036162..d08a3a3c9 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb @@ -24,9 +24,9 @@ SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ - file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ + file://0001-Fix-build-with-OpenEXR-3.patch \ " -SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900" +SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb index aa5112add..717716e1f 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb @@ -53,8 +53,9 @@ EXTRA_OECONF = "--disable-python \ --disable-check-update \ --without-wmf" -EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons" +EXTRA_OECONF_append_mipsarch = " --disable-vector-icons" EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons" +EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons" EXTRA_OECONF_append_arm = " --disable-vector-icons" do_configure_append() { diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb index 08fd96472..1045dea25 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb @@ -18,7 +18,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -31,4 +31,3 @@ FILES_${PN} += " \ ${datadir}/metainfo \ ${datadir}/dbus-1 \ " - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb index ad5dab5ec..c8c16a3c5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb @@ -8,6 +8,8 @@ inherit gnomebase gsettings bash-completion gettext upstream-version-is-even fea DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ gsettings-desktop-schemas dbus" +RDEPENDS_${PN} += "gsettings-desktop-schemas" + SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb index 90e553301..24312c78a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -3,7 +3,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" -inherit meson gobject-introspection +inherit features_check gobject-introspection meson + +REQUIRED_DISTRO_FEATURES = "opengl" SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" SRC_URI = "git://github.com/gnome/libchamplain.git" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb index a3e479869..adbfcd6d7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb @@ -57,7 +57,7 @@ PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xserver-xorg-xwayland" +PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xwayland" PACKAGECONFIG[wayland-eglstream] = "-Dwayland_eglstream=true,-Dwayland_eglstream=false" # yes they changed from mutter-4 -> mutter-5 recently so be perpared diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb index 275fbaa69..e9fa25c63 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb @@ -21,7 +21,9 @@ SRC_URI += " \ file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ " -PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 1f450fd9d..593e5866d 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -14,11 +14,10 @@ RDEPENDS_${PN} = " \ ghex \ gnome-calculator \ gnome-calendar \ - gnome-disk-utility \ gnome-font-viewer \ gnome-photos \ gnome-terminal \ libwnck3 \ nautilus \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \ " |