Commit 31725b45 authored by Eric Vidal's avatar Eric Vidal 💬
Browse files

upgpkg: 1.20.7-2

parent 49e87ff6
Pipeline #204784 failed with stages
in 2 minutes and 24 seconds
From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001 From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
From: fafryd <dz1125.bug.tracker@gmail.com> From: Adam Jackson <ajax@redhat.com>
Date: Fri, 25 May 2018 20:17:35 +0200 Date: Tue, 30 Apr 2019 18:01:27 -0400
Subject: [PATCH] fix libshadow 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 + hw/xfree86/dixmods/meson.build | 2 +-
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build 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 --- a/hw/xfree86/dixmods/meson.build
+++ b/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: true,
install_dir: module_dir, install_dir: module_dir,
+ install_rpath: '$ORIGIN/./',
)
if build_glx
-- --
2.17.0 2.22.0
...@@ -16,7 +16,7 @@ pkgname=( ...@@ -16,7 +16,7 @@ pkgname=(
'xorg-server-common-rootless' 'xorg-server-common-rootless'
'xorg-server-devel-rootless') 'xorg-server-devel-rootless')
pkgver=1.20.6 pkgver=1.20.7
pkgrel=2 pkgrel=2
track= track=
...@@ -25,7 +25,6 @@ url="http://xorg.freedesktop.org" ...@@ -25,7 +25,6 @@ url="http://xorg.freedesktop.org"
source=(https://xorg.freedesktop.org/releases/individual/xserver/${target} source=(https://xorg.freedesktop.org/releases/individual/xserver/${target}
'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 xserver-autobind-hotplug.patch
xvfb-run # with updates from FC master xvfb-run # with updates from FC master
xvfb-run.1 xvfb-run.1
...@@ -69,8 +68,6 @@ makedepends=( ...@@ -69,8 +68,6 @@ makedepends=(
#--------------------------------------| BUILD PREPARATION |------------------------------------ #--------------------------------------| BUILD PREPARATION |------------------------------------
prepare() { prepare() {
cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
#cd xserver #cd xserver
cd "${pkgbase}-${pkgver}" cd "${pkgbase}-${pkgver}"
......
...@@ -290,4 +290,3 @@ index e4bc2bf..e04c18f 100644 ...@@ -290,4 +290,3 @@ index e4bc2bf..e04c18f 100644
+} +}
-- --
2.16.2 2.16.2
...@@ -101,7 +101,7 @@ find_free_servernum() { ...@@ -101,7 +101,7 @@ find_free_servernum() {
# Parse the command line. # Parse the command line.
ARGS=$(getopt --options +ade:f:hn:lp:s:w: \ ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
--long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
--name "$PROGNAME" -- "$@") --name "$PROGNAME" -- "$@")
GETOPT_STATUS=$? GETOPT_STATUS=$?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment