* [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0
@ 2020-05-03 9:01 Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 2/3] package/atk: " Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-05-03 9:01 UTC (permalink / raw)
To: buildroot
- 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)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...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
diff --git a/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch b/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
deleted file mode 100644
index 154d7010d3..0000000000
--- a/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-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 <tobias@stoeckmann.org>
-
-Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- 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
-
diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash
index 9c96da312b..e2cc403e71 100644
--- a/package/at-spi2-core/at-spi2-core.hash
+++ b/package/at-spi2-core/at-spi2-core.hash
@@ -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
diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk
index 3a5197eb03..cf7fdd297c 100644
--- a/package/at-spi2-core/at-spi2-core.mk
+++ b/package/at-spi2-core/at-spi2-core.mk
@@ -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 \
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/3] package/atk: bump to version 2.36.0
2020-05-03 9:01 [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Fabrice Fontaine
@ 2020-05-03 9:01 ` Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 3/3] package/at-spi2-atk: bump to version 2.34.2 Fabrice Fontaine
2020-05-09 21:35 ` [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-05-03 9:01 UTC (permalink / raw)
To: buildroot
Update indentation of hash file (two spaces)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/atk/atk.hash | 6 +++---
package/atk/atk.mk | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/atk/atk.hash b/package/atk/atk.hash
index 8c1bad5b1a..2e7c3b5fec 100644
--- a/package/atk/atk.hash
+++ b/package/atk/atk.hash
@@ -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
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index a16143d2c0..dfeb4de8b2 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -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+
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/at-spi2-atk: bump to version 2.34.2
2020-05-03 9:01 [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 2/3] package/atk: " Fabrice Fontaine
@ 2020-05-03 9:01 ` Fabrice Fontaine
2020-05-09 21:35 ` [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-05-03 9:01 UTC (permalink / raw)
To: buildroot
- 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)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../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
diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch
new file mode 100644
index 0000000000..3a2aefa090
--- /dev/null
+++ b/package/at-spi2-atk/0001-meson-add-tests-option.patch
@@ -0,0 +1,43 @@
+From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+[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
+
diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash
index 77c8f68e47..9c564c32af 100644
--- a/package/at-spi2-atk/at-spi2-atk.hash
+++ b/package/at-spi2-atk/at-spi2-atk.hash
@@ -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
diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk
index 4ef681b3b1..69d11f66bd 100644
--- a/package/at-spi2-atk/at-spi2-atk.mk
+++ b/package/at-spi2-atk/at-spi2-atk.mk
@@ -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))
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0
2020-05-03 9:01 [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 2/3] package/atk: " Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 3/3] package/at-spi2-atk: bump to version 2.34.2 Fabrice Fontaine
@ 2020-05-09 21:35 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2020-05-09 21:35 UTC (permalink / raw)
To: buildroot
On Sun, 3 May 2020 11:01:09 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> - 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)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-09 21:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-03 9:01 [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 2/3] package/atk: " Fabrice Fontaine
2020-05-03 9:01 ` [Buildroot] [PATCH 3/3] package/at-spi2-atk: bump to version 2.34.2 Fabrice Fontaine
2020-05-09 21:35 ` [Buildroot] [PATCH 1/3] package/at-spi2-core: bump to version 2.36.0 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.