diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-support/atk | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-support/atk')
10 files changed, 173 insertions, 162 deletions
diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch new file mode 100644 index 00000000..f64e46ec --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include <stdio.h> + #include <unistd.h> ++#include <sys/time.h> + #include <glib.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb deleted file mode 100644 index 16d8e45e..00000000 --- a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -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" - -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase distro_features_check upstream-version-is-even - -# The at-spi2-core requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -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.*" diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb new file mode 100644 index 00000000..c2979125 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "AT-SPI 2 Toolkit Bridge" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" + +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase features_check upstream-version-is-even + +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + +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/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch b/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch new file mode 100644 index 00000000..7631969c --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch @@ -0,0 +1,32 @@ +From b7fa0aa00b07e03e338dd02af564431bf2f2b185 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <Joshua.Watt@garmin.com> +Date: Wed, 20 Nov 2019 15:24:02 -0600 +Subject: [PATCH] Fix source reproducibility + +The generated enum type files can be included in source packages meant +for debugging, and thus need to be reproducible. Replace the absolute +include of the header with the basename. This is sufficient because the +target include files are always in the include path anyway. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/at-spi2-core/merge_requests/25] +Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com> +--- + atspi/atspi-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atspi/atspi-enum-types.c.template b/atspi/atspi-enum-types.c.template +index 385d0ee..92e4937 100644 +--- a/atspi/atspi-enum-types.c.template ++++ b/atspi/atspi-enum-types.c.template +@@ -5,7 +5,7 @@ + + /*** BEGIN file-production ***/ + /* enumerations from "@basename@" */ +-#include "@filename@" ++#include "@basename@" + + /*** END file-production ***/ + +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb deleted file mode 100644 index 0bdb1e37..00000000 --- a/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -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" - -DEPENDS = "dbus glib-2.0 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" - -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" - -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)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " diff --git a/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb b/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb new file mode 100644 index 00000000..84e05e77 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://0001-Fix-source-reproducibility.patch" + +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" + +X11DEPENDS = "virtual/libx11 libxi libxtst" + +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}/dbus-daemon \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ +" + +GTKDOC_MESON_OPTION = "docs" + +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = 'yes' +GIR_MESON_DISABLE_FLAG = 'no' + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch deleted file mode 100644 index 047e81fb..00000000 --- a/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted - -From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <jpuhlman@mvista.com> -Date: Thu, 14 Jun 2018 17:21:49 +0000 -Subject: [PATCH] Switch from filename to basename - -When atk-enum-types.h is installed in to a system, the user likely has -no access to the location where the headers were built, especially if -the software was built in a sysroot environment. If the headers were -built for a mulitlib environment, the build pathing may be different. -Subsequently, if two mulitlib variants of atk are installed together the -headers conflict for no other reason then they were built in two -different locations. Switching from filename to basename, still should -provide sufficient information on the providence of the enums, while not -conflicting for really no good reason. - -Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> ---- - atk/atk-enum-types.h.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template -index 7b4cec4..8321c24 100644 ---- a/atk/atk-enum-types.h.template -+++ b/atk/atk-enum-types.h.template -@@ -14,7 +14,7 @@ G_BEGIN_DECLS - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ --- -2.14.1.459.g238e487 - diff --git a/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index c604a984..00000000 --- a/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3838757d29590cc1ef99c97f7268377322fc17e9 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 - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 7b5a683..855e28f 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, - - disable_introspection = get_option('disable_introspection') - --if not meson.is_cross_build() and not disable_introspection -+if not disable_introspection - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/external/poky/meta/recipes-support/atk/atk_2.28.1.bb b/external/poky/meta/recipes-support/atk/atk_2.28.1.bb deleted file mode 100644 index 26b13b69..00000000 --- a/external/poky/meta/recipes-support/atk/atk_2.28.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -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" - -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -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" - -BBCLASSEXTEND = "native" - diff --git a/external/poky/meta/recipes-support/atk/atk_2.34.1.bb b/external/poky/meta/recipes-support/atk/atk_2.34.1.bb new file mode 100644 index 00000000..277397c6 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/atk_2.34.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +# Need gettext-native as Meson can't turn off i18n +DEPENDS = "gettext-native glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" + +BBCLASSEXTEND = "native nativesdk" + |