From d1ad77948c9fc8f93e9a47292b4a0461cb192b77 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 20 Apr 2020 10:19:49 -0700 Subject: at-spi2-core: upgrade 2.34.0 -> 2.36.0 Signed-off-by: Tim Orling --- .../0001-Fix-source-reproducibility.patch | 32 ------------------- meta/recipes-support/atk/at-spi2-core_2.34.0.bb | 37 ---------------------- meta/recipes-support/atk/at-spi2-core_2.36.0.bb | 36 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch delete mode 100644 meta/recipes-support/atk/at-spi2-core_2.34.0.bb create mode 100644 meta/recipes-support/atk/at-spi2-core_2.36.0.bb (limited to 'meta') diff --git a/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch b/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch deleted file mode 100644 index 7631969cd6..0000000000 --- a/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7fa0aa00b07e03e338dd02af564431bf2f2b185 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -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 ---- - 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/meta/recipes-support/atk/at-spi2-core_2.34.0.bb b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb deleted file mode 100644 index 84e05e77fc..0000000000 --- a/meta/recipes-support/atk/at-spi2-core_2.34.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -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/meta/recipes-support/atk/at-spi2-core_2.36.0.bb b/meta/recipes-support/atk/at-spi2-core_2.36.0.bb new file mode 100644 index 0000000000..c5d01c9294 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core_2.36.0.bb @@ -0,0 +1,36 @@ +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" + +SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931" +SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a" + +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" -- cgit 1.2.3-korg