[arch-commits] Commit in xorg-server/trunk (0001-fix-libshadow-2.patch PKGBUILD)

[Laurent Carlier]

    Date: Sunday, June 3, 2018 @ 06:18:42
  Author: lcarlier
Revision: 325575

upgpkg: xorg-server 1.20.0-6

fix FS#58731

Added:
  xorg-server/trunk/0001-fix-libshadow-2.patch
Modified:
  xorg-server/trunk/PKGBUILD

----------------------------+
 0001-fix-libshadow-2.patch |   24 ++++++++++++++++++++++++
 PKGBUILD                   |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

Added: 0001-fix-libshadow-2.patch
===================================================================
--- 0001-fix-libshadow-2.patch	                        (rev 0)
+++ 0001-fix-libshadow-2.patch	2018-06-03 06:18:42 UTC (rev 325575)
@@ -0,0 +1,24 @@
+From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker at gmail.com>
+Date: Fri, 25 May 2018 20:17:35 +0200
+Subject: [PATCH] fix libshadow
+
+---
+ hw/xfree86/dixmods/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..6bd8029b6 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -38,6 +38,7 @@ shared_module(
+ 
+     install: true,
+     install_dir: module_dir,
++    install_rpath: '$ORIGIN/./',
+ )
+ 
+ if build_glx
+-- 
+2.17.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-03 06:10:47 UTC (rev 325574)
+++ PKGBUILD	2018-06-03 06:18:42 UTC (rev 325575)
@@ -6,7 +6,7 @@
 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.0
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -21,6 +21,7 @@
         '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
+        0001-fix-libshadow-2.patch
         xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
         xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
         xvfb-run # with updates from FC master
@@ -34,6 +35,7 @@
             'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
             'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
             '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
+            '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271'
             'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7'
             'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631'
             '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
@@ -56,6 +58,10 @@
   # https://patchwork.freedesktop.org/series/43618/
   patch -Np1 -i ../xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
   patch -Np1 -i ../xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+  
+  # Fix libshadow.so: libfb.so => not found - FS#58731
+  # https://bugs.freedesktop.org/show_bug.cgi?id=106656
+  patch -Np1 -i ../0001-fix-libshadow-2.patch
 }
 
 build() {