upgpkg: 1.20.6-2

trunk/0002-fix-libshadow-2.patch

-From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Fri, 25 May 2018 20:17:35 +0200
-Subject: [PATCH] fix libshadow
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
 
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
 ---
- hw/xfree86/dixmods/meson.build | 1 +
- 1 file changed, 1 insertion(+)
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..6bd8029b6 100644
+index 835d23215..0562b630f 100644
 --- a/hw/xfree86/dixmods/meson.build
 +++ b/hw/xfree86/dixmods/meson.build
-@@ -38,6 +38,7 @@ shared_module(
+@@ -34,7 +34,7 @@ shared_module(
+     c_args: xorg_c_args,
+     dependencies: common_dep,
+     link_whole: libxserver_miext_shadow,
+-    link_with: [fb, e],
++    link_with: e,
  
      install: true,
      install_dir: module_dir,
-+    install_rpath: '$ORIGIN/./',
- )
- 
- if build_glx
 -- 
-2.17.0
+2.22.0

trunk/PKGBUILD

@@ -10,15 +10,15 @@
 #--------------------------------------------------------------------------------------
 
 pkgbase=xorg-server
+
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb'
          'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.20.5
-pkgrel=5
-arch=('x86_64')
-license=('CUSTOM')
+
+pkgver=1.20.6
+pkgrel=2
+
 url="https://xorg.freedesktop.org/releases/individual/xserver"
 source=("${url}/${pkgbase}-${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'
@@ -26,11 +26,8 @@ source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
     'xvfb-run.1'
     'Xwrapper.config')
 
-groups=(
-    'xorg')
+#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
 
-backup=(
-    'etc/X11/Xwrapper.config')
 
 makedepends=(
     'xorgproto'
@@ -65,7 +62,8 @@ makedepends=(
     'egl-wayland'
     'meson')
 
-#--------------------------------------------------------------------------------------
+#--------------------------------------| BUILD PREPARATION |------------------------------------
+
 prepare() {
     cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
 
@@ -78,10 +76,11 @@ prepare() {
     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
+	patch -Np1 -i ../0002-fix-libshadow-2.patch
 }
 
+#--------------------------------------------| BUILD |------------------------------------------
+
 build() {
 
     ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
@@ -118,6 +117,12 @@ build() {
     DESTDIR="${srcdir}/fakeinstall" ninja -C build install
 }
 
+#--------------------------------------------| CHECK |------------------------------------------
+
+
+
+#-------------------------------------------| PACKAGE |-----------------------------------------
+
 _install() {
     local src f dir
     for src; do
@@ -316,7 +321,21 @@ package_xorg-server-devel() {
     find fakeinstall -depth -print0 | xargs -0 rmdir
 }
 
-#--------------------------------------------------------------------------------------
+
+#------------------------------------| INSTALL CONFIGURATION |----------------------------------
+
+arch=('x86_64')
+
+groups=(
+    'xorg')
+
+backup=(
+    'etc/X11/Xwrapper.config')
+    
+#-------------------------------------| SECURITY AND LICENCE |----------------------------------
+
+license=('CUSTOM')
+
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'