From 232e643c350b85a345d023b91e22a4f461ea542e Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 15 Sep 2022 15:42:33 +0000 Subject: [PATCH] xscreensaver: fix the path to /usr/local/share if gtk+2 is not present at configure time. (xscreensaver moved to gtk+3 but there is still a remnant of gtk+2 in the autoconf script). --- x11/xscreensaver/patches/patch-configure | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/x11/xscreensaver/patches/patch-configure b/x11/xscreensaver/patches/patch-configure index 46394a5f833..f15f462cd37 100644 --- a/x11/xscreensaver/patches/patch-configure +++ b/x11/xscreensaver/patches/patch-configure @@ -1,3 +1,5 @@ +- Fix path to /usr/local/share + - Don't fail if unrecognised autoconf command-line flags are present (avoid problem with --disable-gtk-doc) @@ -22,6 +24,15 @@ Index: configure ############################################################################### # # Autoheader stuff +@@ -15029,7 +15024,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; } + + GTK_DATADIR="" + if test "$have_gtk" = yes; then +- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` ++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` + GTK_DATADIR="$GTK_DATADIR/share" + fi + @@ -15060,9 +15055,9 @@ fi # Check for the various Gnome help and URL loading programs.