summaryrefslogtreecommitdiff
path: root/source/l/at-spi2-core
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/at-spi2-core')
-rw-r--r--source/l/at-spi2-core/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch30
-rwxr-xr-xsource/l/at-spi2-core/at-spi2-core.SlackBuild2
2 files changed, 32 insertions, 0 deletions
diff --git a/source/l/at-spi2-core/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch b/source/l/at-spi2-core/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
new file mode 100644
index 00000000..8cd6b424
--- /dev/null
+++ b/source/l/at-spi2-core/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
@@ -0,0 +1,30 @@
+From 44a812ea51223d82f21a098a2d45fcc5c329ce7a 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>
+---
+ 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' ],
+
diff --git a/source/l/at-spi2-core/at-spi2-core.SlackBuild b/source/l/at-spi2-core/at-spi2-core.SlackBuild
index 83898d1b..7bcd04f1 100755
--- a/source/l/at-spi2-core/at-spi2-core.SlackBuild
+++ b/source/l/at-spi2-core/at-spi2-core.SlackBuild
@@ -77,6 +77,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+zcat $CWD/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch.gz | patch -p1 --verbose || exit 1
+
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
mkdir build