diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-support/atk | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/atk')
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb (renamed from poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/at-spi2-core_2.30.0.bb (renamed from poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb) | 16 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch | 14 | ||||
-rw-r--r-- | poky/meta/recipes-support/atk/atk_2.30.0.bb (renamed from poky/meta/recipes-support/atk/atk_2.28.1.bb) | 16 |
4 files changed, 29 insertions, 23 deletions
diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb index 16d8e45ee..224479707 100644 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" -SRC_URI[archive.md5sum] = "355c7916a69513490cb83ad34016b169" -SRC_URI[archive.sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e" +SRC_URI[archive.md5sum] = "1ad754b90bcb14244b73ca4d0c14d274" +SRC_URI[archive.sha256sum] = "e2e1571004ea7b105c969473ce455a95be4038fb2541471714aeb33a26da8a9a" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" @@ -18,3 +18,5 @@ PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.30.0.bb index 7975f58ba..d0b567a5e 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.30.0.bb @@ -8,17 +8,18 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e" -SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87" +SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" +SRC_URI[sha256sum] = "0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b" -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" +X11DEPENDS = "virtual/libx11 libxi libxtst" -inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" +DEPENDS = "dbus glib-2.0" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" + +inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ - -Ddbus_daemon=${bindir}" + -Ddbus_daemon=${bindir}/dbus-daemon" GTKDOC_ENABLE_FLAG = "-Denable_docs=true" GTKDOC_DISABLE_FLAG = "-Denable_docs=false" @@ -37,3 +38,4 @@ FILES_${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/defaults/at-spi2 \ ${systemd_user_unitdir}/at-spi-dbus-bus.serviceĀ \ " +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch index c604a984a..1d814ccdb 100644 --- a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -1,4 +1,4 @@ -From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 +From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <anuj.mittal@intel.com> Date: Fri, 6 Apr 2018 12:04:00 +0800 Subject: [PATCH] meson.build: enable introspection for cross-compile @@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atk/meson.build b/atk/meson.build -index 7b5a683..855e28f 100644 +index 616a3e6..941ded8 100644 --- a/atk/meson.build +++ b/atk/meson.build -@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, +@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, + dependencies: gobject_dep, + sources: atk_enum_h) - disable_introspection = get_option('disable_introspection') - --if not meson.is_cross_build() and not disable_introspection -+if not disable_introspection +-if not meson.is_cross_build() and get_option('introspection') ++if get_option('introspection') gnome.generate_gir(libatk, sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], namespace: 'Atk', diff --git a/poky/meta/recipes-support/atk/atk_2.28.1.bb b/poky/meta/recipes-support/atk/atk_2.30.0.bb index 26b13b69d..4e2dacbc4 100644 --- a/poky/meta/recipes-support/atk/atk_2.28.1.bb +++ b/poky/meta/recipes-support/atk/atk_2.30.0.bb @@ -14,11 +14,13 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -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 = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" +GI_ENABLE_FLAG = "-Dintrospection=true" +GI_DISABLE_FLAG = "-Dintrospection=false" + +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ '${GI_DISABLE_FLAG}', d)} " @@ -30,8 +32,8 @@ SRC_URI_append = " \ file://0001-meson.build-enable-introspection-for-cross-compile.patch \ file://0001-Switch-from-filename-to-basename.patch \ " -SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" -SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" +SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" +SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |