1.20.7

1 files changed, 19 insertions, 13 deletions

diff --git a/0002-fix-libshadow-2.patch b/0002-fix-libshadow-2.patch
index 8f6834d62792..d98c6fd4beda 100644
--- a/0002-fix-libshadow-2.patch
+++ b/0002-fix-libshadow-2.patch
@@ -1,24 +1,30 @@
-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