summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-05-22 18:57:13 +0000
committer Eric Hameleers <alien@slackware.com>2024-05-22 22:54:38 +0200
commit9e8b1d12ae3410e98b461b6bc71480a6fcd1bfc2 (patch)
treec5198cb0aa964c7c7e17ccaec1ef6dae0500de50 /source/x
parentdc0a887503961a26f2742f670af68d84958b6a8e (diff)
downloadcurrent-9e8b1d12ae3410e98b461b6bc71480a6fcd1bfc2.tar.gz
current-9e8b1d12ae3410e98b461b6bc71480a6fcd1bfc2.tar.xz
Wed May 22 18:57:13 UTC 202420240522185713
a/e2fsprogs-1.47.1-x86_64-1.txz: Upgraded. a/iniparser-4.2.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. a/ndctl-79-x86_64-2.txz: Rebuilt. Recompiled against iniparser-4.2.2. d/python-setuptools-70.0.0-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-39.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/cantor-23.08.5-x86_64-6.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/kfilemetadata-5.116.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/kile-2.9.93-x86_64-33.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/kitinerary-23.08.5-x86_64-4.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/krita-5.2.2-x86_64-9.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/okular-23.08.5-x86_64-4.txz: Rebuilt. Recompiled against poppler-24.05.0. kde/qqc2-desktop-style-5.116.1-x86_64-1.txz: Upgraded. l/hicolor-icon-theme-0.18-noarch-1.txz: Upgraded. l/libcupsfilters-2.0.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-24.05.0. l/lmdb-0.9.33-x86_64-1.txz: Upgraded. l/poppler-24.05.0-x86_64-1.txz: Upgraded. This seems to require C++20 now... Shared library .so-version bump. l/python-requests-2.32.1-x86_64-1.txz: Upgraded. l/qt6-6.7.1_20240516_6977d02f-x86_64-1.txz: Upgraded. n/curl-8.8.0-x86_64-1.txz: Upgraded. n/openldap-2.6.8-x86_64-1.txz: Upgraded. x/xorg-server-xwayland-24.1.0-x86_64-1.txz: Upgraded. Thanks to marav for the patch.
Diffstat (limited to '')
-rwxr-xr-xsource/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild4
-rw-r--r--source/x/xorg-server-xwayland/xwayland.CARD32.define.diff10
2 files changed, 13 insertions, 1 deletions
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
index 06948306c..749114169 100755
--- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -80,6 +80,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# This is needed to fix a missing define (at least on 32-bit):
+cat $CWD/xwayland.CARD32.define.diff | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -97,7 +100,6 @@ meson setup \
--sysconfdir=/etc \
--localstatedir=/var \
--buildtype=release \
- -Dxwayland_eglstream=true \
-Ddefault_font_path="${DEF_FONTPATH}" \
-Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \
-Dxkb_dir=/usr/share/X11/xkb \
diff --git a/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff
new file mode 100644
index 000000000..10b3df156
--- /dev/null
+++ b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff
@@ -0,0 +1,10 @@
+--- ./os/osdep.h.orig 2024-05-15 01:21:39.000000000 -0500
++++ ./os/osdep.h 2024-05-22 13:08:46.015040109 -0500
+@@ -52,6 +52,7 @@
+ #define _OSDEP_H_ 1
+
+ #include <X11/Xdefs.h>
++#include <X11/Xtrans/Xtrans.h>
+
+ #if defined(XDMCP) || defined(HASXDMAUTH)
+ #include <X11/Xdmcp.h>