[packages/at-spi2-core] - updated to 2.32.0 - added meson patch (fix for meson 0.50 taken from git)

qboosh qboosh at pld-linux.org
Sat Mar 23 10:42:12 CET 2019


commit fad88c4c42c8faa1022297365d3ab2b23d2f5327
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 23 10:48:05 2019 +0100

    - updated to 2.32.0
    - added meson patch (fix for meson 0.50 taken from git)

 at-spi2-core-meson.patch | 29 +++++++++++++++++++++++++++++
 at-spi2-core.spec        | 12 +++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/at-spi2-core.spec b/at-spi2-core.spec
index 748e8c3..81089c4 100644
--- a/at-spi2-core.spec
+++ b/at-spi2-core.spec
@@ -5,12 +5,13 @@
 Summary:	Protocol definitions and daemon for D-Bus at-spi
 Summary(pl-UTF-8):	Definicje protokołu oraz demon at-spi dla usługi D-Bus
 Name:		at-spi2-core
-Version:	2.30.0
+Version:	2.32.0
 Release:	1
 License:	LGPL v2+
 Group:		Daemons
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.30/%{name}-%{version}.tar.xz
-# Source0-md5:	d4f22c66b3210ffe6b10d01c04e008b5
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.32/%{name}-%{version}.tar.xz
+# Source0-md5:	57269004541646c4c5cf0bcb7c99bb5b
+Patch0:		%{name}-meson.patch
 URL:		https://wiki.linuxfoundation.org/accessibility/d-bus
 BuildRequires:	dbus-devel >= 1.5
 BuildRequires:	gettext-tools >= 0.19.8
@@ -107,12 +108,13 @@ Dokumentacja API biblioteki at-spi2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
 	%{!?with_static_libs:--default-library='shared'} \
-	-Denable_docs=true \
-	-Denable-x11=yes
+	-Ddocs=true \
+	-Dx11=yes
 
 %meson_build -C build
 
diff --git a/at-spi2-core-meson.patch b/at-spi2-core-meson.patch
new file mode 100644
index 0000000..b2c87ed
--- /dev/null
+++ b/at-spi2-core-meson.patch
@@ -0,0 +1,29 @@
+From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias at 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 at stoeckmann.org>
+---
+ atspi/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atspi/meson.build b/atspi/meson.build
+index b7a9357..2a6915d 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' ],
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/at-spi2-core.git/commitdiff/fad88c4c42c8faa1022297365d3ab2b23d2f5327



More information about the pld-cvs-commit mailing list