upgpkg: 1.20.0-4

trunk/PKGBUILD

@@ -16,17 +16,16 @@ pkgname=(
     'xorg-server-xephyr'
     'xorg-server-xvfb'
     'xorg-server-xnest'
-    'xorg-server-xwayland'
     'xorg-server-common'
     'xorg-server-devel')
 
-pkgver=1.20.9.r21.g5c400cae1
-pkgrel=3
+pkgver=1.20.10
+pkgrel=4
 
 url="https://xorg.freedesktop.org/releases/individual/xserver"
 
 track=commit
-target=5c400cae1f9817045378966effa6bca91e45aead # server-1.20-branch 2020-11-09
+target=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
 source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
     'xserver-autobind-hotplug.patch'
     '0001-v2-FS-58644.patch'
@@ -66,10 +65,10 @@ makedepends=(
     'xcb-util-keysyms'
     'libxshmfence'
     'libunwind'
-    'wayland-protocols'
-    'egl-wayland'
     'meson'
-    'git')
+    'git'
+    'wayland-protocols'
+    'egl-wayland')
 
 #--------------------------------------| BUILD PREPARATION |------------------------------------
 
@@ -284,25 +283,6 @@ package_xorg-server-xnest() {
     install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
 }
 
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
 package_xorg-server-devel() {
     pkgdesc="Development files for the X.Org X server"
     depends=(
@@ -320,6 +300,7 @@ package_xorg-server-devel() {
     install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
 
     ## make sure there are no files left to install
+    rm fakeinstall/usr/bin/Xwayland
     find fakeinstall -depth -print0 | xargs -0 rmdir
 }