From 91ee8cad9c8044ff8f3e6160d509d2dffe4f5d44 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sun, 24 Feb 2019 14:43:48 +0000 Subject: [PATCH] installdeps: check gtk3-classic on arch/manjaro Don't try to install gtk3 if the user has gtk3-classic installed on arch and manjaro. Signed-off-by: Rafael Kitover --- installdeps | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/installdeps b/installdeps index 27613d2c..68ca78b5 100755 --- a/installdeps +++ b/installdeps @@ -568,7 +568,11 @@ archlinux_installdeps() { # not using the base-devel group because it can break gcc-multilib check $pacman --noconfirm --needed -S binutils file grep gawk gzip libtool make patch sed util-linux nasm cmake ccache pkg-config git ccache zip - libs="zlib mesa gettext libpng sdl2 openal wxgtk3 gtk3 sfml ffmpeg" + gtk=gtk3 + + $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic + + libs="zlib mesa gettext libpng sdl2 openal wxgtk3 $gtk sfml ffmpeg" if [ -z "$target" -o "$target" = m32 ]; then if [ -z "$target" -o -z "$amd64" ]; then