From 2a76b98d699f781b2042f9962feef4b0edb09e9e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 12 Aug 2018 16:13:39 +0200 Subject: [PATCH] xorg-server: make Xorg wrapper script executable --- .../xorg-server/patches/meson-install-xorg-wrap-script.patch | 3 ++- srcpkgs/xorg-server/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch index 87017df9b8f..2a23d5b8da9 100644 --- a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch +++ b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch @@ -1,6 +1,6 @@ --- hw/xfree86/meson.build.orig +++ hw/xfree86/meson.build -@@ -145,12 +145,14 @@ +@@ -145,12 +145,15 @@ install_dir: get_option('libexecdir'), # install_mode: ['r-sr-xr-x', 0, 0], ) @@ -14,6 +14,7 @@ + configuration: conf_data, + ), + rename: 'Xorg', ++ install_mode: 'rwxr-xr-x', install_dir: join_paths(get_option('prefix'), get_option('bindir')), - ) + ) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index bf814c65822..359aa02d693 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.1 -revision=3 +revision=4 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb