[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wscreensaver/, gui-apps/wscreensaver/files/

2023-12-31 Thread David Roman
commit: 99d6f132fcfbe928dfa9f4a4562d95628a2735d6
Author: Pascal Jäger  leimstift  de>
AuthorDate: Sun Dec 31 07:06:59 2023 +
Commit: David Roman  gmail  com>
CommitDate: Sun Dec 31 07:07:46 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=99d6f132

gui-apps/wscreensaver: remove patch

Upstream has merged this patch, so patching in portage fails now

Signed-off-by: Pascal Jäger  leimstift.de>

 ...nsaver-fix-implicit-function-decl-when-JWXYZ.patch | 19 ---
 gui-apps/wscreensaver/wscreensaver-.ebuild|  1 -
 2 files changed, 20 deletions(-)

diff --git 
a/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
 
b/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
deleted file mode 100644
index 5f39a29dc0..00
--- 
a/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Clang 16 does not allow implicit function declarations by default.
-When xscreensaver is compiled normally for X11, the function gettimeofday()
-is included via the header file X11/Xos.h.
-However, if X11 is not used and HAVE_JXYZ is used instead, we end up with a 
missing
-declaration for that function. I think upstream forgot to include the file 
here, he
-has done it for string.h though, which is a similar case.
-
-Pascal Jäger  (2023-12-13)
-
 a/hacks/screenhackI.h
-+++ b/hacks/screenhackI.h
-@@ -71,6 +71,7 @@
- #ifdef HAVE_JWXYZ
- # include "jwxyz.h"
- # include  /* X11/Xos.h brings this in. */
-+# include 
- #else  /* real X11 */
- # include 
- # include 

diff --git a/gui-apps/wscreensaver/wscreensaver-.ebuild 
b/gui-apps/wscreensaver/wscreensaver-.ebuild
index 13c748b32f..d7ea06207c 100644
--- a/gui-apps/wscreensaver/wscreensaver-.ebuild
+++ b/gui-apps/wscreensaver/wscreensaver-.ebuild
@@ -36,7 +36,6 @@ PATCHES=(
"${FILESDIR}"/xscreensaver-5.31-pragma.patch
"${FILESDIR}"/xscreensaver-6.01-gentoo.patch
"${FILESDIR}"/xscreensaver-5.45-gcc.patch
-   "${FILESDIR}"/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
 )
 
 # see https://bugs.gentoo.org/898328



[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wscreensaver/, gui-apps/wscreensaver/files/

2023-12-13 Thread Viorel Munteanu
commit: e45f01c80cf9e0acf98ce3b4ae5a04bcf4c6f1f9
Author: Pascal Jäger  leimstift  de>
AuthorDate: Wed Dec 13 21:29:17 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Dec 13 21:38:23 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e45f01c8

gui-apps/wscreensaver: new package, add 

Signed-off-by: Pascal Jäger  leimstift.de>

 ...ver-fix-implicit-function-decl-when-JWXYZ.patch | 19 ++
 .../files/xscreensaver-5.31-pragma.patch   | 11 
 .../wscreensaver/files/xscreensaver-5.45-gcc.patch | 16 +
 .../files/xscreensaver-6.01-gentoo.patch   | 47 ++
 gui-apps/wscreensaver/metadata.xml | 22 +++
 gui-apps/wscreensaver/wscreensaver-.ebuild | 74 ++
 6 files changed, 189 insertions(+)

diff --git 
a/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
 
b/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
new file mode 100644
index 00..5f39a29dc0
--- /dev/null
+++ 
b/gui-apps/wscreensaver/files/wscreensaver-fix-implicit-function-decl-when-JWXYZ.patch
@@ -0,0 +1,19 @@
+Clang 16 does not allow implicit function declarations by default.
+When xscreensaver is compiled normally for X11, the function gettimeofday()
+is included via the header file X11/Xos.h.
+However, if X11 is not used and HAVE_JXYZ is used instead, we end up with a 
missing
+declaration for that function. I think upstream forgot to include the file 
here, he
+has done it for string.h though, which is a similar case.
+
+Pascal Jäger  (2023-12-13)
+
+--- a/hacks/screenhackI.h
 b/hacks/screenhackI.h
+@@ -71,6 +71,7 @@
+ #ifdef HAVE_JWXYZ
+ # include "jwxyz.h"
+ # include  /* X11/Xos.h brings this in. */
++# include 
+ #else  /* real X11 */
+ # include 
+ # include 

diff --git a/gui-apps/wscreensaver/files/xscreensaver-5.31-pragma.patch 
b/gui-apps/wscreensaver/files/xscreensaver-5.31-pragma.patch
new file mode 100644
index 00..97f4656344
--- /dev/null
+++ b/gui-apps/wscreensaver/files/xscreensaver-5.31-pragma.patch
@@ -0,0 +1,11 @@
+--- a/hacks/memscroller.c
 b/hacks/memscroller.c
+@@ -307,7 +307,7 @@
+   -- sbrk(2) man page on BSD systems, as of 1995 or so.
+  */
+ #ifdef HAVE_SBRK
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
++# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* gcc >= 4.6 */
+/* Don't print "warning: 'sbrk' is deprecated". */
+ #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ # endif

diff --git a/gui-apps/wscreensaver/files/xscreensaver-5.45-gcc.patch 
b/gui-apps/wscreensaver/files/xscreensaver-5.45-gcc.patch
new file mode 100644
index 00..b62fd1f309
--- /dev/null
+++ b/gui-apps/wscreensaver/files/xscreensaver-5.45-gcc.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
 b/configure.ac
+@@ -468,11 +468,11 @@
+ 
+ AC_DEFUN([AC_CHECK_GCC_ARG],
+  [if test -n "$GCC"; then
+-   AC_CACHE_CHECK([whether gcc accepts [$2]],
++   AC_CACHE_CHECK([whether [$CC] accepts [$2]],
+  ac_cv_gcc_accepts_[$1],
+ [rm -rf conftest.$ac_ext
+  touch conftest.$ac_ext
+- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
++ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
+   grep unrecognized >/dev/null ); then
+ac_cv_gcc_accepts_[$1]=no
+  else

diff --git a/gui-apps/wscreensaver/files/xscreensaver-6.01-gentoo.patch 
b/gui-apps/wscreensaver/files/xscreensaver-6.01-gentoo.patch
new file mode 100644
index 00..41f8d7b7d0
--- /dev/null
+++ b/gui-apps/wscreensaver/files/xscreensaver-6.01-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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
+ *fade:True
+ *unfade:  True
+@@ -62,7 +62,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
+ 
+ ! This is w