From e140ba816ccaf82b65b0a6a4a5747abe2176fdab Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 3 Sep 2022 09:34:05 +0000 Subject: [PATCH] installdeps: remove wxgtk2 for Arch on failure The wxgtk2 package being installed may prevent the installation of the newer wxwidgets-gtk3 package, remove it on pacman failure and try again. See: https://archlinux.org/news/wxwidgets-32-update-may-need-manual-intervention/ Signed-off-by: Rafael Kitover --- installdeps | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/installdeps b/installdeps index 85dbfd37..4a2f8c3f 100755 --- a/installdeps +++ b/installdeps @@ -882,8 +882,13 @@ archlinux_installdeps() { if [ -z "$target" -o "$target" = m32 ]; then if [ -z "$target" -o -z "$amd64" ]; then - # native build - check $pacman --noconfirm --needed -S "$gcc_pkg" $libs + # Native build. + # + # On newer versions wxgtk2 may have to be manually removed. + if ! $pacman --noconfirm --needed -S "$gcc_pkg" $libs; then + $pacman --noconfirm -R wxgtk2 + fi + $pacman --noconfirm --needed -S "$gcc_pkg" $libs else # try to build 32 bit binaries