package/at-spi2-core: bump to version 2.36.0
PATCH 1/3 package/at-spi2-core: bump to version 2.36.0
- Drop patch (already in version)
- Add upstream link on sha256
- License is LGPL-2.1+ since
https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/1256988c433cf8b9e0780c13d66374cb057f7329
- Update indentation of hash file (two spaces)
--- ...001-Fix-meson.build-for-meson-0.50.0.patch | 35 ------------------- package/at-spi2-core/at-spi2-core.hash | 6 ++-- package/at-spi2-core/at-spi2-core.mk | 4 +-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann <[email protected]> -Date: Tue, 12 Mar 2019 11:46:24 +0100 -Subject: [PATCH] Fix meson.build for meson 0.50.0. - -Since meson 0.50.0 it is not possible anymore to specify an -absolute directory for subdir. To keep current functionality, -use install_dir instead. - -atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. - -Signed-off-by: Tobias Stoeckmann <[email protected]> - -Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch -Signed-off-by: Peter Seiderer <[email protected]> ---- - atspi/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atspi/meson.build b/atspi/meson.build -index 17bfc45..2e44ffd 100644 ---- a/atspi/meson.build -+++ b/atspi/meson.build -@@ -57,7 +57,7 @@ atspi_headers = [ - - atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') - --install_headers(atspi_headers, subdir: atspi_includedir) -+install_headers(atspi_headers, install_dir: atspi_includedir) - - atspi_enums = gnome.mkenums('atspi-enum-types', - sources: [ 'atspi-constants.h', 'atspi-types.h' ], --- -2.21.0 -
package/at-spi2-core/at-spi2-core.hash +4 -2
@@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz + # locally calculated -sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/at-spi2-core/at-spi2-core.mk +2 -2
@@ -4,11 +4,11 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.28 +AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) -AT_SPI2_CORE_LICENSE = LGPL-2.0+ +AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \
Signature · 1 line
2.26.2
PATCH 2/3 package/atk: bump to version 2.36.0
Update indentation of hash file (two spaces)
--- package/atk/atk.hash | 6 +++--- package/atk/atk.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
package/atk/atk.hash +3 -3
@@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.33/atk-2.33.3.sha256sum -sha256 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe atk-2.33.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum +sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz # Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
package/atk/atk.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.33 -ATK_VERSION = $(ATK_VERSION_MAJOR).3 +ATK_VERSION_MAJOR = 2.36 +ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+
Signature · 1 line
2.26.2
PATCH 3/3 package/at-spi2-atk: bump to version 2.34.2
In reply to Fabrice Fontaine- Remove double space in AT_SPI2_ATK_SITE
- Add link to upstream sha256 file
- License is LPGL-2.1+ since
https://gitlab.gnome.org/GNOME/at-spi2-atk/-/commit/468b527d8ad73e934dd03a2de6745995d8304435
- Switch to meson-package
- Add a patch to disable tests to avoid adding libxml2 dependency
- Update indentation of hash file (two spaces)
--- .../0001-meson-add-tests-option.patch | 43 +++++++++++++++++++ package/at-spi2-atk/at-spi2-atk.hash | 6 ++- package/at-spi2-atk/at-spi2-atk.mk | 10 +++-- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch
package/at-spi2-atk/0001-meson-add-tests-option.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 3 May 2020 10:29:36 +0200 +Subject: [PATCH] meson: add tests option + +Add tests option to allow the user to build at-spi2-atk without tests, +it is especially useful as one of the test requires libxml-2.0 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: +https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] +--- + meson.build | 4 +++- + meson_options.txt | 4 ++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9fce5d6..61bc93d 100644 +--- a/meson.build ++++ b/meson.build +@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', + + subdir('droute') + subdir('atk-adaptor') +-subdir('tests') ++if get_option('tests') ++ subdir('tests') ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 24c9228..a4abdc2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('disable_p2p', + description: 'Disable peer-to-peer DBus connections', + type: 'boolean', + value: false) ++option('tests', ++ description: 'Whether to build tests', ++ type: 'boolean', ++ value: true) +-- +2.26.2 +
package/at-spi2-atk/at-spi2-atk.hash +4 -2
@@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum +sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz + # locally calculated -sha256 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e at-spi2-atk-2.26.2.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/at-spi2-atk/at-spi2-atk.mk +6 -4
@@ -4,13 +4,15 @@ # ################################################################################ -AT_SPI2_ATK_VERSION_MAJOR = 2.26 +AT_SPI2_ATK_VERSION_MAJOR = 2.34 AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.0+ +AT_SPI2_ATK_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) +AT_SPI2_ATK_LICENSE = LGPL-2.1+ AT_SPI2_ATK_LICENSE_FILES = COPYING AT_SPI2_ATK_INSTALL_STAGING = YES AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf +AT_SPI2_ATK_CONF_OPTS = -Dtests=false -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.26.2
PATCH 1/3 package/at-spi2-core: bump to version 2.36.0
In reply to Fabrice FontaineQuoted 6 lines · On Sun, 3 May 2020 11:01:09 +0200 Fabrice Fontaine…
- Drop patch (already in version)
- Add upstream link on sha256
- License is LGPL-2.1+ since
https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/1256988c433cf8b9e0780c13d66374cb057f7329
- Update indentation of hash file (two spaces)
Quoted 7 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- ...001-Fix-meson.build-for-meson-0.50.0.patch | 35 ------------------- package/at-spi2-core/at-spi2-core.hash | 6 ++-- package/at-spi2-core/at-spi2-core.mk | 4 +-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
Series applied to next. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com