[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Jeroen Roovers]

commit:     b10ff1009c8f019dfcd6230eacb645d723ecca8e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 15:49:13 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 15:49:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10ff100

x11-misc/xscreensaver: Remove unused patch.

Package-Manager: portage-2.3.1

 .../xscreensaver/files/xscreensaver-5.35-comments.patch  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
deleted file mode 100644
index 0794f4e..00000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/utils/grabclient.c
-+++ b/utils/grabclient.c
-@@ -127,11 +127,11 @@
-   XtInputId pipe_id;
-   FILE *pipe;
- 
--# if !defined(USE_IPHONE) && !defined(HAVE_COCOA)  // Real X11
-+# if !defined(USE_IPHONE) && !defined(HAVE_COCOA)  /* Real X11 */
-   pid_t pid;
- # endif
- 
--# if !defined(USE_IPHONE) && defined(HAVE_COCOA)   // Desktop OSX
-+# if !defined(USE_IPHONE) && defined(HAVE_COCOA)   /* Desktop OSX */
-   char *directory;
- # endif
- 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Jeroen Roovers]

commit:     c21708964da23ceea52ed49c9bd6c085f9db7a65
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 15:19:28 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 15:19:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2170896

x11-misc/xscreensaver: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/xscreensaver-5.33-gentoo.patch           | 106 ---------------------
 1 file changed, 106 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch
deleted file mode 100644
index e199c6d..00000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -63,7 +63,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		https://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -123,7 +123,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- a/hacks/barcode.c
-+++ a/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- a/hacks/glx/glsnake.c
-+++ a/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Sebastian Pipping]

commit:     170a0da988ad903d730ef5ca147570b9d096da90
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 00:48:43 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 00:50:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170a0da9

x11-misc/xscreensaver: Drop unused patch

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 .../xscreensaver-remove-libXxf86misc-dep.patch     | 49 ----------------------
 1 file changed, 49 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 79ffcd7098c..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-libXxf86misc is the client-side code of an X extension that has not been
-supported by the Xserver in more than 10 years. Since xscreensaver's dependency
-on it is automagic, we have to patch configure.in to safely remove it.
-
-https://bugs.gentoo.org/720158
-
-diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in
---- xscreensaver.orig/configure.in	2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.in	2020-05-02 18:09:52.578233240 -0700
-@@ -104,12 +104,6 @@
- 	    (It's available if the file /usr/include/X11/extensions/XInput.h
- 	    exists.)])
- 
--AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
--	    [Define this if you have the XF86MiscSetGrabKeysState function
--	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
--	    sequences to be temporarily disabled.  Sadly, it doesn't affect
--	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
--
- AH_TEMPLATE([HAVE_RANDR],
- 	    [Define this if you have the Resize and Rotate extension.
- 	    This is standard on sufficiently-recent XFree86 systems, and
-@@ -1888,25 +1882,6 @@
- fi
- 
- 
--###############################################################################
--#
--#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
--#	using other XF86 stuff.)
--#
--###############################################################################
--
--have_xf86miscsetgrabkeysstate=no
--if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
--  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
--                [have_xf86miscsetgrabkeysstate=yes],
--                [true], -lXext -lX11)
--  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
--    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
--    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
--  fi
--fi
--
--
- ###############################################################################
- #
- #       Check for HP XHPDisableReset and XHPEnableReset.
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Sam James]

commit:     4ee76047540b02174ea9e096e1aaded1d285e8cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 00:10:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 00:10:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee76047

x11-misc/xscreensaver: add USE=-opengl patch annotation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
index 9d741072f4e1..e1996291bd3a 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
@@ -1,4 +1,5 @@
-diff -urP xscreensaver-6.03.orig/configure.ac xscreensaver-6.03/configure.ac
+Upstream don't support this anymore (https://github.com/gentoo/gentoo/pull/24404#issuecomment-1061128526)
+but it's a trivial patch so let's keep it going for now.
 --- xscreensaver-6.03.orig/configure.ac	2022-03-04 11:23:24.415172769 -0700
 +++ xscreensaver-6.03/configure.ac	2022-03-04 11:27:40.419205257 -0700
 @@ -4737,7 +4737,6 @@

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Sam James]

commit:     012c205505f0ca5f5ba70149f71b3ab762b7f8b2
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Tue Nov  1 09:15:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 00:47:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012c2055

x11-misc/xscreensaver: get install dirs from GTK3 instead of GTK2 in configure.ac

Closes: https://bugs.gentoo.org/878979
Bug: https://bugs.gentoo.org/878875
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28068
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
index c624c8046026..4147540e1189 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
@@ -6,9 +6,9 @@ Bug: https://bugs.gentoo.org/878875
 
 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 
---- a/configure
-+++ b/configure
-@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; }
+--- a/configure.ac
++++ b/configure.ac
+@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
 
    GTK_DATADIR=""
    if test "$have_gtk" = yes; then
@@ -17,7 +17,7 @@ Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
      GTK_DATADIR="$GTK_DATADIR/share"
    fi
 
-@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; }
+@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
  if test -n "$GTK_DATADIR" ; then
    PO_DATADIR="$GTK_DATADIR"
  elif test "$have_gtk" = yes; then

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Conrad Kostecki]

commit:     f73e2ad77fa967a476736c8d42d0a71698ffe347
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 13 12:24:35 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 18:42:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73e2ad7

x11-misc/xscreensaver: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32754
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...saver-6.07-service-remove-Alias-org.jwz.xscreensav.patch | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch
deleted file mode 100644
index 988ab22bff78..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$ systemctl --user enable xscreensaver
-Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver.
-
-# Pascal Jäger <pascal.jaeger@leimstift.de>
-
---- a/driver/xscreensaver.service.in
-+++ b/driver/xscreensaver.service.in
-@@ -14,5 +14,4 @@ Restart=on-failure
- OOMScoreAdjust=-1000
- 
- [Install]
--Alias=org.jwz.xscreensaver.service
- WantedBy=graphical-session.target

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

[Conrad Kostecki]

commit:     c7fe6837c7b82a622816002ae1dd4e0ad514a014
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May  6 16:49:17 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May  6 18:30:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fe6837

x11-misc/xscreensaver: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../xscreensaver-6.05-configure-exit-codes.patch   | 29 ----------------------
 ...6-service-remove-Alias-org.jwz.xscreensav.patch | 18 --------------
 ...service-start-xscreensaver-with-no-splash.patch | 21 ----------------
 3 files changed, 68 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
deleted file mode 100644
index a8ef464d2db0..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.06-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
deleted file mode 100644
index 454a9a7dd6bf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sat, 29 Jul 2023 11:52:22 +0200
-Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver
-
-$ systemctl --user enable xscreensaver
-Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver.
---- a/driver/xscreensaver.service.in
-+++ b/driver/xscreensaver.service.in
-@@ -14,5 +14,4 @@ Restart=on-failure
- OOMScoreAdjust=-1000
- 
- [Install]
--Alias=org.jwz.xscreensaver
- WantedBy=default.target
--- 
-2.41.0
-

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
deleted file mode 100644
index ec4f85d373f9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sat, 29 Jul 2023 11:51:45 +0200
-Subject: xscreensaver.service: start xscreensaver with --no-splash
-
-Prevents the splash screen being shown when the user logs in.
-
---- a/driver/xscreensaver.service.in
-+++ b/driver/xscreensaver.service.in
-@@ -9,7 +9,7 @@ ConditionUser=!@system
- Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver org.xfce.ScreenSaver light-locker
- 
- [Service]
--ExecStart=/usr/bin/xscreensaver
-+ExecStart=/usr/bin/xscreensaver --no-splash
- Restart=on-failure
- OOMScoreAdjust=-1000
- 
--- 
-2.41.0
-