[arch-commits] Commit in xorg-xwayland/trunk (PKGBUILD)

[Andreas Radke]

    Date: Wednesday, February 3, 2021 @ 21:15:12
  Author: andyrtr
Revision: 407188

upgpkg: xorg-xwayland 1.20.0.r844.g1e72c3ce8-1: update to latest git commit - switch to 21.1 soon to be released branch; drop unsupported build options; use our full custom FLAGS to avoid lacking FULL RELRO

Modified:
  xorg-xwayland/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-03 21:02:44 UTC (rev 407187)
+++ PKGBUILD	2021-02-03 21:15:12 UTC (rev 407188)
@@ -1,8 +1,11 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgname=xorg-xwayland
-_commit=f08ab719df921e1269691553daf56853380fb241 # xserver-master-branch 2021-01-22
-pkgver=1.20.0.r811.gf08ab719d
+
+# https://gitlab.freedesktop.org/xorg/xserver/-/commits/xwayland-21.1
+_commit=1e72c3ce84e29d51d50f301b986a687e15679cf8 # xwayland 21.1 branch
+
+pkgver=1.20.0.r844.g1e72c3ce8
 pkgrel=1
 arch=('x86_64')
 license=('custom')
@@ -34,26 +37,16 @@
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
   # With them, module fail to load with undefined symbol.
   # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-  export CFLAGS=${CFLAGS/-fno-plt}
-  export CXXFLAGS=${CXXFLAGS/-fno-plt}
-  export LDFLAGS=${LDFLAGS/,-z,now}
+#  export CFLAGS=${CFLAGS/-fno-plt}
+#  export CXXFLAGS=${CXXFLAGS/-fno-plt}
+#  export LDFLAGS=${LDFLAGS/,-z,now}
 
   arch-meson xserver build \
-    -D os_vendor="Arch Linux" \
     -D ipv6=true \
     -D xvfb=false \
-    -D xnest=false \
     -D xcsecurity=true \
-    -D xorg=false \
-    -D xephyr=false \
-    -D xwayland=true \
     -D xwayland_eglstream=true \
-    -D xwin=false \
-    -D xquartz=false \
     -D glamor=true \
-    -D udev=true \
-    -D systemd_logind=true \
-    -D suid_wrapper=true \
     -D xkb_dir=/usr/share/X11/xkb \
     -D xkb_output_dir=/var/lib/xkb