commit:     99d6f132fcfbe928dfa9f4a4562d95628a2735d6
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Dec 31 07:06:59 2023 +0000
Commit:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Sun Dec 31 07:07:46 2023 +0000
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 <pascal.jaeger <AT> leimstift.de>

 ...nsaver-fix-implicit-function-decl-when-JWXYZ.patch | 19 -------------------
 gui-apps/wscreensaver/wscreensaver-9999.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..0000000000
--- 
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 <[email protected]> (2023-12-13)
-
---- a/hacks/screenhackI.h
-+++ b/hacks/screenhackI.h
-@@ -71,6 +71,7 @@
- #ifdef HAVE_JWXYZ
- # include "jwxyz.h"
- # include <string.h> /* X11/Xos.h brings this in. */
-+# include <sys/time.h>
- #else  /* real X11 */
- # include <X11/Xlib.h>
- # include <X11/Xutil.h>

diff --git a/gui-apps/wscreensaver/wscreensaver-9999.ebuild 
b/gui-apps/wscreensaver/wscreensaver-9999.ebuild
index 13c748b32f..d7ea06207c 100644
--- a/gui-apps/wscreensaver/wscreensaver-9999.ebuild
+++ b/gui-apps/wscreensaver/wscreensaver-9999.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

Reply via email to