From 67f2251804f4faf7a85c09d1d7636cd88b452647 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Thu, 22 Aug 2019 00:32:02 -0400 Subject: [PATCH] changes for yocto upgrade --- meta-gnome/recipes-freedesktop/colord/colord_1.4.4.bb | 3 ++- meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb | 11 ++++------- meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb | 2 ++ .../recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb | 4 ++++ meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb | 2 ++ .../gnome-bluetooth/gnome-bluetooth_3.32.0.bb | 2 ++ .../gnome-desktop/gnome-desktop_3.32.0.bb | 2 ++ .../gnome-screenshot/gnome-screenshot_3.30.0.bb | 2 ++ .../gnome-session/gnome-session_3.31.4.bb | 2 ++ .../gnome-settings-daemon_3.32.0.bb | 2 ++ .../recipes-gnome/gnome-shell/gnome-shell_3.32.1.bb | 2 ++ .../recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb | 2 ++ .../recipes-gnome/libgweather/libgweather_3.32.0.bb | 2 ++ 13 files changed, 30 insertions(+), 8 deletions(-) diff --git a/meta-gnome/recipes-freedesktop/colord/colord_1.4.4.bb b/meta-gnome/recipes-freedesktop/colord/colord_1.4.4.bb index 5e05daf..775353b 100644 --- a/meta-gnome/recipes-freedesktop/colord/colord_1.4.4.bb +++ b/meta-gnome/recipes-freedesktop/colord/colord_1.4.4.bb @@ -8,9 +8,10 @@ SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-${PV}.tar SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" -#inherit meson meson-exe-wrapper pkgconfig systemd useradd gettext gobject-introspection inherit python3native meson meson-exe-wrapper pkgconfig systemd useradd gettext gobject-introspection +WARN_QA_remove = "unknown-configure-option" + DEPENDS = "glib-2.0-native lcms libgusb libgudev polkit" EXTRA_OEMESON = "-Dargyllcms_sensor=false -Dman=false -Ddocs=false -Ddaemon_user=colord -Dbash_completion=false -Dtests=false --buildtype=release" diff --git a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb index f9d7ee4..10a34a1 100644 --- a/meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb +++ b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb @@ -20,14 +20,11 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ -Ddbus_daemon=${bindir}/dbus-daemon" -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" +GTKDOC_ENABLE_FLAG = "-Ddocs=true" +GTKDOC_DISABLE_FLAG = "-Ddocs=false" -GI_ENABLE_FLAG = "-Denable-introspection=yes" -GI_DISABLE_FLAG = "-Denable-introspection=no" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " +GIR_MESON_ENABLE_FLAG = 'yes' +GIR_MESON_DISABLE_FLAG = 'no' EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ '${GTKDOC_DISABLE_FLAG}', d)} " diff --git a/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb b/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb index 5c64a7e..85747da 100644 --- a/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb +++ b/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb @@ -10,6 +10,8 @@ SRC_URI[sha256sum] = "9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c20 DEPENDS = "gtk+3 python3-pygobject intltool-native glib-2.0 clutter-1.0 libgee libxklavier glib-2.0-native xmlto-native python3-pygobject-native" +WARN_QA_remove = "unknown-configure-option" + PYTHON_CARIBOU = "${libdir}/python3.7/site-packages/caribou" FILES_${PN} += "\ ${datadir}/dbus-1/services \ diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb index 642e56b..759d22c 100644 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.0.bb @@ -12,6 +12,10 @@ SRC_URI[archive.sha256sum] = "ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaa FILES_${PN} += "${datadir}/icons/gnome" +GIR_MESON_OPTION = 'enable-introspection' +GIR_MESON_ENABLE_FLAG = 'true' +GIR_MESON_DISABLE_FLAG = 'false' + DEPENDS = "json-glib libsoup-2.4 glib-2.0 glib-2.0-native" EXTRA_OEMESON = "-Denable-installed-tests=false -Denable-gtk-doc=false --buildtype=release" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb index 32f8c80..33c0e18 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ inherit gnomebase gettext gobject-introspection +WARN_QA_remove = "unknown-configure-option" + export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0" DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb index 3ea5bcc..5888713 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb @@ -10,6 +10,8 @@ SRC_URI[archive.sha256sum] = "ab8fa07613aa6b92be6151b1e2063cad5349bc1a8314eb091a DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" +WARN_QA_remove = "unknown-configure-option" + GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext FILES_${PN} += "${datadir}/icons" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb index 8803332..53e72d0 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.32.0.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ GNOMEBASEBUILDCLASS = "meson" inherit gnome pkgconfig upstream-version-is-even gobject-introspection +WARN_QA_remove = "unknown-configure-option" + SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb index a3c265e..99eb20e 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext gobject-introspection +WARN_QA_remove = "unknown-configure-option" + DEPENDS += "libx11 libxext glib-2.0 gtk+3 libcanberra glib-2.0-native libxml2-native" SRC_URI += "file://0001-Don-t-process-or-install-appstream-file.patch" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb index fd9d3a8..41d4a9c 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.31.4.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase meson +WARN_QA_remove = "unknown-configure-option" + SRC_URI += " file://0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch" SRC_URI[archive.md5sum] = "f2d548a79732f0db9f6148de908c68ce" SRC_URI[archive.sha256sum] = "5279776b9f8b74e348507fedb062ef303172fbb1f3a16979a8cb9321c396878e" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb index 98b939a..aecd559 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.32.0.bb @@ -20,6 +20,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext meson-exe-wrapper +WARN_QA_remove = "unknown-configure-option" + SRC_URI += " file://0001-Disable-gsd-sharing-plugin.patch \ file://0001-don-t-run-power-module-tests.patch" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.1.bb index e3a5ec1..2ca20b2 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.1.bb @@ -5,6 +5,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext +WARN_QA_remove = "unknown-configure-option" + SRC_URI[archive.md5sum] = "059529c91a3d84e6542f662be47a657f" SRC_URI[archive.sha256sum] = "0874ded4498e960b264baa54b6407a5a75dac54fc5b7cd60db91133e9c0260dd" diff --git a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb index 76cbb9f..9c3dd1e 100644 --- a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb +++ b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext vala +WARN_QA_remove = "unknown-configure-option" + SRC_URI += "file://0001-Added-machine-tags.patch" DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gobject-introspection libgtop" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb index f844304..c5dab7e 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb @@ -8,6 +8,8 @@ SRC_URI[archive.sha256sum] = "de9a2b392a8b27e012ed80bb9c950085692cd8e898c367c092 DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 itstool-native geocode-glib glib-2.0-native" +WARN_QA_remove = "unknown-configure-option" + FILES_${PN} += "${datadir}/glib-2.0/schemas" GNOMEBASEBUILDCLASS = "meson"