gentoo auto-resync : 30:10:2022 - 15:03:33

3 files changed, 84 insertions, 0 deletions

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
new file mode 100644
index 000000000000..a8ef464d2db0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
@@ -0,0 +1,29 @@
+The configure scripts exits on a non zero exit code even with a warning. Even
+though for upstream this is just a warning, for portage this means failure and 
+it will exit.
+We therefore alter the exit codes where neccesary.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+   else
+     warnL "The GTK libraries do not seem to be available; the"
+     warn2 "\`xscreensaver-settings' program requires them."
+-    CONF_STATUS=1
+ #   echo ''
+ #   warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ #   warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
+   warn  "GTK is being used, but the GDK-Pixbuf library and/or"
+   warn2 "headers were not found.  That can't be good.  Please"
+   warn2 "install the GDK-Pixbuf development kit and re-configure."
+-  CONF_STATUS=1
+ fi
+
+ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
+@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then
+
+   if test "$png_halfassed" = yes ; then halfassery ; fi
+   warn2 "Many things aren't going to work right."
+-  CONF_STATUS=1
+ fi
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch
new file mode 100644
index 000000000000..7d9ffdfae4d7
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch
@@ -0,0 +1,13 @@
+Remove update icon cache as it is a sandbox access violation.
+We do this in the ebuild by ourselves instead.
+
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -564,7 +564,6 @@ install-gnome:: $(LOGO)
+         fi
+
+ install-gnome:: uninstall-old-gnome-icons
+-install-gnome:: update-icon-caches
+
+ update-icon-caches::
+        @for f in /usr/share/icons/index.theme  
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch
new file mode 100644
index 000000000000..0f09d970a920
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch
@@ -0,0 +1,42 @@
+This is to teach handly some good manners and get his mind out of the gutter. He let himself go quite a bit lately.
+Fixes: https://bugs.gentoo.org/869218
+
+
+--- a/hacks/glx/handsy_anim.h
++++ b/hacks/glx/handsy_anim.h
+@@ -770,7 +770,6 @@ static const hand_anim goatse_anim[] = {
+ /**************************************************************************/
+
+ static const hand_anim_pair all_hand_anims[] = {
+-  {{ middle_anim,    middle_anim },    0.2 },
+   {{ tap_anim,       tap_anim },       0.7 },
+   {{ tap_anim,       tap_anim },       0.7 },
+   {{ tap_anim,       tap_anim },       0.7 },
+@@ -778,15 +777,12 @@ static const hand_anim_pair all_hand_anims[] = {
+   {{ spock_anim,     hidden_anim},     0 },
+   {{ horns_anim,     horns_anim},      0 },
+   {{ horns_anim,     horns_anim},      0 },
+-  {{ bs1_anim,       bs2_anim },       0 },
+-  {{ upyours_anim,   hidden_anim },    0 },
+   {{ peace_anim,     hidden_anim },    0 },
+   {{ scissor1_anim,  scissor2_anim },  0 },
+   {{ wave_anim,      hidden_anim },    0 },
+   {{ wave2_anim,     hidden_anim },    0 },
+   {{ jazzhands_anim, jazzhands_anim }, 0 },
+   {{ ok_anim,        ok_anim },        0 },
+-  {{ inout1_anim,    inout2_anim },    0 },
+   {{ clap_anim,      clap_anim },      0 },
+   {{ slow_clap_anim, slow_clap_anim }, 0 },
+   {{ pray_anim,      pray_anim },      0 },
+@@ -795,11 +791,9 @@ static const hand_anim_pair all_hand_anims[] = {
+   {{ thumbsup_anim,  thumbsup_anim },  0 },
+   {{ thumbsdn_anim,  thumbsdn_anim },  0 },
+   {{ thisguy_anim,   thisguy_anim },   0 },
+-  {{ outtahere_anim, hidden_anim },    0 },
+   {{ stahhhp_anim,   stahhhp_anim },   0 },
+   {{ gun_anim,       gun_anim },       0.25 },
+   {{ walk_anim,      walk_anim },      0.3 },
+-  {{ goatse_anim,    goatse_anim },    0 },
+   {{ 0, }}};
+
+ #endif /* __HANDSY_ANIM__ */