diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb (renamed from meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-plugins-wacom-Fix-build-without-WAYLAND.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc | 4 |
7 files changed, 40 insertions, 10 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb index c470987b4f..9b405be0b3 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb @@ -10,6 +10,8 @@ inherit setuptools3 gnomebase gobject-introspection DEPENDS += "lcms" +CFLAGS_append_class-native = " -std=gnu99" + # https://bugs.llvm.org/show_bug.cgi?id=45555 CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb index 458eaeaa17..12ea5938c5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb @@ -9,8 +9,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc -SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419" -SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a" +SRC_URI[archive.md5sum] = "44a3cfeab1afd83a71e852835d24e656" +SRC_URI[archive.sha256sum] = "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" EXTRA_OEMESON = " \ -Dvapi=false \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-plugins-wacom-Fix-build-without-WAYLAND.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-plugins-wacom-Fix-build-without-WAYLAND.patch new file mode 100644 index 0000000000..d84fa984e5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-plugins-wacom-Fix-build-without-WAYLAND.patch @@ -0,0 +1,27 @@ +From ec6982cc8b3fccc35dbd5df3c4e22ab94709c66d Mon Sep 17 00:00:00 2001 +From: Vlad Banea <vlb@xiphos.ca> +Date: Tue, 31 Dec 2019 15:35:41 -0500 +Subject: plugins/wacom: Fix build without WAYLAND + +Upstream-Status: Backport +Signed-off-by: Adrian Bunk <bunk@stusta.de> +--- + plugins/wacom/gsd-wacom-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c +index e1c8eaa7..92fd96c3 100644 +--- a/plugins/wacom/gsd-wacom-manager.c ++++ b/plugins/wacom/gsd-wacom-manager.c +@@ -190,7 +190,7 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass) + static gchar * + get_device_path (GdkDevice *device) + { +-#ifdef HAVE_WAYLAND ++#if HAVE_WAYLAND + if (gnome_settings_is_wayland ()) + return g_strdup (gdk_wayland_device_get_node_path (device)); + else +-- +2.20.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb index 0b6865d293..cc801d189f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb @@ -6,9 +6,6 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7" -SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337" - DEPENDS = " \ colord \ geocode-glib \ @@ -31,6 +28,8 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" SRC_URI[archive.md5sum] = "493332fa0f36645188468fed41c0060b" SRC_URI[archive.sha256sum] = "9fbae67e217e53b99e4f9e7d392c91ffbe31253941c9b136ef09c2d9db7ad7ed" +SRC_URI += "file://0001-plugins-wacom-Fix-build-without-WAYLAND.patch" + # allow cross build mixed with build of native tools do_write_config_append() { cat >${WORKDIR}/meson.native <<EOF @@ -55,5 +54,3 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ ${libdir}/gnome-settings-daemon-3.0/libgsd.so \ " - -RDEPEND_${PN} += "gdbus" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb index f04246f168..4f5784f26d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb @@ -62,7 +62,7 @@ PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" # needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" # libcdio-paranoia recipe doesn't exist yet PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb index b40787f3c9..e2ced395c1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb @@ -60,6 +60,10 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp" # not yet in meta-gnome PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" +EXTRA_OEMESON += " \ + -Dsystemd_user_services=${systemd_user_unitdir} \ +" + FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/tracker \ diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 0f4ae7d04b..1bbeb2c481 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.21" +PV = "1.5.22" DEPENDS = "unicode-ucd" @@ -13,7 +13,7 @@ SRC_URI = " \ git://github.com/ibus/ibus.git \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " -SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" |