Updated to version 1.20.3

1 files changed, 159 insertions, 180 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 537e1b655d0c..4f516a271378 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,255 +1,234 @@
-# Maintainer: Det <nimetonmaili g-mail>
+# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Contributor: Det <nimetonmaili g-mail>
 # Based on [testing]'s xorg-server
 
-_pkgbase=xorg-server
-pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev' 'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev')
-pkgver=1.19.99.901 # 1.20 RC1: http://lists.x.org/archives/xorg/2018-February/059152.html
+pkgbase=xorg-server-dev
+pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev'
+         'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev')
+pkgver=1.20.3
 pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
-url="https://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
-             'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
-             'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv'
-             'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
-             'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
-             'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
-             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols')
-source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
-        xvfb-run
+pkgdesc="Xorg X server - bleeding edge version"
+url="http://xorg.freedesktop.org"
+makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
+             'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
+             'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres'
+             'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
+             'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
+             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson') # 'git')
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase%-dev}-${pkgver}.tar.bz2{,.sig}
+        'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
+        xserver-autobind-hotplug.patch
+        0001-v2-FS-58644.patch
+        0002-fix-libshadow-2.patch
+        xvfb-run # with updates from FC master
         xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
               '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
-sha256sums=('3654e69e19426d9738381abbe0c325082be42971535eb791fb3604f60499a36e'
+sha512sums=('ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba'
             'SKIP'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
+            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
+            '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
+            '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271'
+            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
+            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
 prepare() {
-  cd "${_pkgbase}-${pkgver}"
+  # missing from tarball
+  cp xwayland-config.h.meson.in ${pkgbase%-dev}-${pkgver}/include/
 
-  msg2 "Starting autoreconf..."
-  autoreconf -vfi
+  cd "${pkgbase%-dev}-${pkgver}"
+
+  # patch from Fedora, not yet merged
+  patch -Np1 -i ../xserver-autobind-hotplug.patch
+
+  # Fix rootless xorg - FS#58644
+  # https://bugs.freedesktop.org/show_bug.cgi?id=106588
+  patch -Np1 -i ../0001-v2-FS-58644.patch
+
+  # Fix libshadow.so: libfb.so => not found - FS#58731
+  # https://bugs.freedesktop.org/show_bug.cgi?id=106656
+  patch -Np1 -i ../0002-fix-libshadow-2.patch
 }
 
 build() {
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-  # With them, modules fail to load with undefined symbol.
+  # 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}
 
-  cd "${_pkgbase}-${pkgver}"
-
-  msg2 "Starting ./configure..."
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-libunwind \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glamor \
-      --enable-xwayland \
-      --enable-kdrive \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-config-udev \
-      --enable-systemd-logind \
-      --enable-suid-wrapper \
-      --disable-install-setuid \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --libexecdir=/usr/lib/xorg-server \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts \
-      --with-sha1=libgcrypt
-      
-#      --without-dtrace \
-#      --disable-linux-acpi --disable-linux-apm \
-
-  msg2 "Starting make..."
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \
-      -i hw/Makefile
+  arch-meson ${pkgbase%-dev}-$pkgver build \
+    -D os_vendor="Arch Linux" \
+    -D ipv6=true \
+    -D dmx=true \
+    -D xvfb=true \
+    -D xnest=true \
+    -D xcsecurity=true \
+    -D xorg=true \
+    -D xephyr=true \
+    -D xwayland=true \
+    -D xwayland_eglstream=true \
+    -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
+
+  # Print config
+  meson configure build
+  ninja -C build
+
+  # fake installation to be seperated into packages
+  DESTDIR="${srcdir}/fakeinstall" ninja -C build install
+}
+
+_install() {
+  local src f dir
+  for src; do
+    f="${src#fakeinstall/}"
+    dir="${pkgdir}/${f%/*}"
+    install -m755 -d "${dir}"
+    mv -v "${src}" "${dir}/"
+  done
 }
 
 package_xorg-server-common-dev() {
-  pkgdesc="Xorg server common files - Bleeding edge version"
+  pkgdesc="Xorg server common files - bleeding edge version"
   depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
-  provides=(xorg-server-common=$pkgver-$pkgrel)
-  conflicts=(xorg-server-common)
-
-  cd "${_pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  msg2 "Starting make install-data..."
-  make -C xkb DESTDIR="${pkgdir}" install-data
+  provides=("xorg-server-common=${pkgver}")
+  conflicts=('xorg-server-common')
 
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+  _install fakeinstall/usr/lib/xorg/protocol.txt
+  _install fakeinstall/usr/share/man/man1/Xserver.1.gz
 
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
+  install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase%-dev}-${pkgver}"/xkb/README.compiled
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-dev() {
-  pkgdesc="Xorg X server - Bleeding edge version"
-  depends=(libepoxy libxfont2 pixman xorg-server-common-dev libunwind dbus libgl xf86-input-libinput
+  pkgdesc="Xorg X server - bleeding edge version"
+  depends=(libepoxy libxfont2 pixman xorg-server-common-dev libunwind
+           dbus libgl xf86-input-libinput nettle
            libpciaccess libdrm libxshmfence) # FS#52949
 
-  # see src/xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel-dev pkg
-  provides=("xorg-server=$pkgver" 'X-ABI-VIDEODRV_VERSION=24' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
-  conflicts=('xorg-server' 'nvidia-utils<375.26-3' 'glamor-egl' 'xf86-video-modesetting')
+  # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
+  # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
+  provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+  conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server-dev.install
 
-  cd "${_pkgbase}-${pkgver}"
+  _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
+  ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
+  _install fakeinstall/usr/lib/Xorg{,.wrap}
+  _install fakeinstall/usr/lib/xorg/modules/*
+  _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
+  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1.gz
+  _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4.gz
+  _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5.gz
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
-  
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
 
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-xephyr-dev() {
-  pkgdesc="A nested X server that runs as an X application - Bleeding edge version"
-  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common-dev xcb-util-image
-           xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
-  provides=(xorg-server-xephyr=$pkgver)
-  conflicts=(xorg-server-xephyr)
-
-  cd "${_pkgbase}-${pkgver}/hw/kdrive"
-
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
+  pkgdesc="A nested X server that runs as an X application - bleeding edge version"
+  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common-dev
+           xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
+           nettle libtirpc)
+  provides=("xorg-server-xephyr=${pkgver}")
+  conflicts=('xorg-server-xephyr')
+
+  _install fakeinstall/usr/bin/Xephyr
+  _install fakeinstall/usr/share/man/man1/Xephyr.1.gz
+
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-xvfb-dev() {
-  pkgdesc="Virtual framebuffer X server - Bleeding edge version"
-  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common-dev xorg-xauth libgl)
-  provides=(xorg-server-xvfb=$pkgver)
-  conflicts=(xorg-server-xvfb)
-
-  cd "${_pkgbase}-${pkgver}/hw/vfb"
+  pkgdesc="Virtual framebuffer X server - bleeding edge version"
+  depends=(libxfont2 libunwind pixman xorg-server-common-dev xorg-xauth libgl nettle)
+  provides=("xorg-server-xvfb=${pkgver}")
+  conflicts=('xorg-server-xvfb')
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
+  _install fakeinstall/usr/bin/Xvfb
+  _install fakeinstall/usr/share/man/man1/Xvfb.1.gz
 
   install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
+  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-xnest-dev() {
-  pkgdesc="A nested X server that runs as an X application - Bleeding edge version"
-  depends=(libxfont2 libxext libunwind pixman xorg-server-common-dev libsystemd)
-  provides=(xorg-server-xnest=$pkgver)
-  conflicts=(xorg-server-xnest)
+  pkgdesc="A nested X server that runs as an X application - bleeding edge version"
+  depends=(libxfont2 libxext pixman xorg-server-common-dev nettle libtirpc)
+  provides=("xorg-server-xnest=${pkgver}")
+  conflicts=('xorg-server-xnest')
 
-  cd "${_pkgbase}-${pkgver}/hw/xnest"
+  _install fakeinstall/usr/bin/Xnest
+  _install fakeinstall/usr/share/man/man1/Xnest.1.gz
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-xdmx-dev() {
-  pkgdesc="Distributed Multihead X Server and utilities - Bleeding edge version"
-  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common-dev)
-  provides=(xorg-server-xdmx=$pkgver)
-  conflicts=(xorg-server-xdmx)
-
-  cd "${_pkgbase}-${pkgver}/hw/dmx"
+  pkgdesc="Distributed Multihead X Server and utilities - bleeding edge version"
+  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
+           pixman xorg-server-common-dev nettle)
+  provides=("xorg-server-xdmx=${pkgver}")
+  conflicts=('xorg-server-xdmx')
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
+  _install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig}
+  _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1.gz
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-xwayland-dev() {
-  pkgdesc="Run X clients under Wayland - Bleeding edge version"
-  depends=(libxfont libepoxy libgl pixman xorg-server-common-dev)
-  provides=(xorg-server-xwayland=$pkgver)
-  conflicts=(xorg-server-xwayland)
+  pkgdesc="run X clients under wayland - bleeding edge version"
+  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common-dev
+           nettle libtirpc)
+  provides=("xorg-server-wayland=${pkgver}")
+  conflicts=('xorg-server-wayland')
 
-  cd "${_pkgbase}-${pkgver}/hw/xwayland"
+  _install fakeinstall/usr/bin/Xwayland
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 }
 
 package_xorg-server-devel-dev() {
-  pkgdesc="Development files for the X.Org X server - Bleeding edge version"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto dri3proto xineramaproto libpciaccess
-           resourceproto scrnsaverproto presentproto
+  pkgdesc="Development files for the X.Org X server - bleeding edge version"
+  depends=('xorgproto' 'mesa' 'libpciaccess'
            # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-  provides=(xorg-server-devel=$pkgver)
-  conflicts=(xorg-server-devel)
-
-  cd "${_pkgbase}-${pkgver}"
+           'xorg-util-macros')
+  provides=("xorg-server-devel=${pkgver}")
+  conflicts=('xorg-server-devel')
 
-  msg2 "Starting make install..."
-  make DESTDIR="${pkgdir}" install
+  _install fakeinstall/usr/include/xorg/*
+  _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
+  _install fakeinstall/usr/share/aclocal/xorg-server.m4
 
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/usr/lib/xorg-server"
-  rm -rf "${pkgdir}/var"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
+  # make sure there are no files left to install
+  find fakeinstall -depth -print0 | xargs -0 rmdir
 }