From c45a6a13a9009dd99abc9b3145c3356fd1448748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 22 Mar 2020 19:29:10 +0100 Subject: [PATCH] xarcan: fix build The package won't build if glamor is enabled because of a conflicting declaration of GC thus disable glamor for now. --- srcpkgs/xarcan/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index 8ba1c53d4b..c20068b63d 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,7 +1,7 @@ # Template file for 'xarcan' pkgname=xarcan version=0.5.4 -revision=6 +revision=7 build_style=gnu-configure short_desc="Patched Xserver that bridges connections to Arcan" maintainer="Piraty " @@ -11,18 +11,21 @@ distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz" checksum=ea37709c56b4c649ea2263531a02d511ff44dcd842833be5f8db41641045d5a1 configure_args="--enable-kdrive --enable-xarcan --disable-xorg - --disable-xwayland --disable-xnest --disable-xvfb --enable-glamor --enable-glx + --disable-xwayland --disable-xnest --disable-xvfb --disable-glamor --enable-glx --disable-int10-module --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --enable-ipv6 --enable-record --with-fontrootdir=/usr/share/fonts/X11 --with-shared-memory-dir=/dev/shm --without-systemd-daemon --without-systemd-daemon --enable-xcsecurity --disable-static" -hostmakedepends="pkg-config autoconf automake libtool xorg-util-macros font-util xtrans" -makedepends=" - pixman-devel libdrm-devel libX11-devel MesaLib-devel libressl-devel - libXfont2-devel libxkbfile-devel libepoxy-devel arcan-devel xorgproto" +hostmakedepends="automake libtool pkg-config xorg-util-macros font-util xtrans" +makedepends="pixman-devel libdrm-devel libX11-devel + MesaLib-devel libressl-devel libXfont2-devel libxkbfile-devel + libepoxy-devel arcan-devel xorgproto" pre_configure() { + vsed -i configure.ac \ + -e "s;gl >= 7.1.0;gl >= 1.2;" \ + -e "s;gl >= 9.2.0;gl >= 1.2;" NOCONFIGURE=1 ./autogen.sh }