main/xorg-server: underlink libfb.so as autotools does

fixes #11395

2 files changed, 35 insertions, 2 deletions

diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 6418687b26..20581cc853 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
 pkgver=1.20.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 url="https://www.x.org/wiki"
 arch="all"
@@ -52,6 +52,7 @@ makedepends="
         "
 source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.bz2
         xwayland-glx.patch
+        link-libshadow.patch
         "
 
 # secfixes:
@@ -166,4 +167,5 @@ xwayland() {
         mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
 }
 sha512sums="ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805  xorg-server-1.20.8.tar.bz2
-004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8  xwayland-glx.patch"
+004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8  xwayland-glx.patch
+d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0  link-libshadow.patch"
diff --git a/main/xorg-server/link-libshadow.patch b/main/xorg-server/link-libshadow.patch
new file mode 100644
index 0000000000..48f8cd1bc9
--- /dev/null
+++ b/main/xorg-server/link-libshadow.patch
@@ -0,0 +1,31 @@
+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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -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,
+-- 
+2.22.0
+
+