diff --git a/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch b/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch deleted file mode 100644 index 83ed7c94136..00000000000 --- a/srcpkgs/xscreensaver/patches/fix-cross-compile-ansi-c-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -The configure script is over cautious about ANSI C support when cross-compiling. -Simply workaround this by disabling the test code. - -diff -Naur configure.orig configure ---- configure.orig 2014-11-19 08:24:01.000000000 +0100 -+++ configure 2014-11-20 17:51:11.301074527 +0100 -@@ -4374,7 +4374,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler works on ANSI C" >&5 - $as_echo_n "checking whether the compiler works on ANSI C... " >&6; } - if test "$cross_compiling" = yes; then : -- as_fn_error $? "Couldn't build even a trivial ANSI C program: check CC." "$LINENO" 5 -+ : - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch b/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch deleted file mode 100644 index 51a62948a68..00000000000 --- a/srcpkgs/xscreensaver/patches/fix-iso-c90-style-comments.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- hacks/fontglide.c 2018-09-03 01:56:45.000000000 +0300 -+++ hacks/fontglide.c 2018-12-31 23:42:41.621417195 +0200 -@@ -2421,8 +2421,8 @@ fontglide_free (Display *dpy, Window win - - textclient_close (s->tc); - --// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); --// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); -+/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); -+ if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); */ - XFreeGC (dpy, s->bg_gc); - if (s->charset) free (s->charset); - if (s->font_override) free (s->font_override); diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template index 3ee64a50050..bee3164cde3 100644 --- a/srcpkgs/xscreensaver/template +++ b/srcpkgs/xscreensaver/template @@ -1,6 +1,6 @@ # Template file for 'xscreensaver' pkgname=xscreensaver -version=5.42 +version=5.43 revision=1 build_style=gnu-configure configure_args="--with-pam --with-login-manager @@ -17,7 +17,7 @@ license="MIT" homepage="https://www.jwz.org/xscreensaver/" changelog="https://www.jwz.org/xscreensaver/changelog.html" distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz" -checksum=441daa033b214bfdd82b1991fbf7dc9360466bff542ce0f6002d0071a4d5cbe1 +checksum=17eab67f3554e21c23b1526ec48a06a9ec8605baffee48f91f603f7599b383d4 do_install() { vmkdir etc/pam.d