summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-03-12 20:03:46 +0000
committerEric Hameleers <alien@slackware.com>2019-03-13 08:59:42 +0100
commit73b3d9a124fdf75fddce655d2843b30019a1a9fb (patch)
treec48ae541e1ff07eac65b7c5f88eacc39c05fd88c /source/l
parentde75b378d611fd8b58543913a473ad9cac0a382b (diff)
downloadcurrent-73b3d9a124fdf75fddce655d2843b30019a1a9fb.tar.gz
Tue Mar 12 20:03:46 UTC 201920190312200346
a/kernel-firmware-20190312_b0d9583-noarch-1.txz: Upgraded. l/at-spi2-atk-2.32.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.32.0-x86_64-1.txz: Upgraded. l/atk-2.32.0-x86_64-1.txz: Upgraded. l/dconf-0.32.0-x86_64-1.txz: Upgraded. l/dconf-editor-3.32.0-x86_64-1.txz: Upgraded. l/glib-networking-2.60.0-x86_64-1.txz: Upgraded. l/gsettings-desktop-schemas-3.32.0-x86_64-1.txz: Upgraded. l/gvfs-1.40.0-x86_64-1.txz: Upgraded. l/libsoup-2.66.0-x86_64-1.txz: Upgraded. l/vte-0.56.0-x86_64-1.txz: Upgraded. n/mobile-broadband-provider-info-20190116-x86_64-1.txz: Upgraded. n/samba-4.9.5-x86_64-1.txz: Upgraded. x/liberation-fonts-ttf-2.00.5-noarch-1.txz: Upgraded. xap/gucharmap-12.0.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
-rw-r--r--source/l/at-spi2-core/at-spi2-core.44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch30
-rwxr-xr-xsource/l/at-spi2-core/at-spi2-core.SlackBuild2
-rwxr-xr-xsource/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild19
3 files changed, 42 insertions, 9 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
diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
index 6aea6555..2e71d8a7 100755
--- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
+++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
@@ -77,19 +77,20 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --build=$ARCH-slackware-linux || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+ .. || exit 1
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true