CVS commit: pkgsrc/x11/xscreensaver

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Sep 26 09:24:42 UTC 2022

Modified Files:
        pkgsrc/x11/xscreensaver: Makefile PLIST distinfo
Removed Files:
        pkgsrc/x11/xscreensaver/patches: patch-driver_passwd-pwent.c

Log Message:
xscreensaver: update to 6.05.1.

6.05    * X11: Cope with dumb DPMS settings that existed pre-startup.
        * X11: Silence new Perl warnings from `xscreensaver-getimage-file'.
        * X11: Fix `sonar' pthreads crash on recent Pi systems.
        * X11: Removed dependence on `gdk-pixbuf-xlib-2.0'.
        * X11: GTK 3 is now required.
        * macOS: Fixed the "Run savers on screens" preference in Random mode
          on multi-screen M1 systems.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -u -r1.90 -r1.91 pkgsrc/x11/xscreensaver/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/xscreensaver/patches/patch-driver_passwd-pwent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xscreensaver/Makefile
diff -u pkgsrc/x11/xscreensaver/Makefile:1.143 pkgsrc/x11/xscreensaver/Makefile:1.144
--- pkgsrc/x11/xscreensaver/Makefile:1.143      Thu Jul 14 23:46:27 2022
+++ pkgsrc/x11/xscreensaver/Makefile    Mon Sep 26 09:24:42 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.143 2022/07/14 23:46:27 dholland Exp $
+# $NetBSD: Makefile,v 1.144 2022/09/26 09:24:42 wiz Exp $
 
-DISTNAME=              xscreensaver-6.04
-PKGREVISION=           2
+DISTNAME=              xscreensaver-6.05.1
 CATEGORIES=            x11
 MASTER_SITES=          https://www.jwz.org/xscreensaver/
 
@@ -21,26 +20,22 @@ CHECK_PORTABILITY_SKIP+=    android/Makefil
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
 CONFIGURE_ARGS+=       --with-gl
 CONFIGURE_ARGS+=       --with-gle
-CONFIGURE_ARGS+=       --with-gtk=${BUILDLINK_PREFIX.gtk2}
+CONFIGURE_ARGS+=       --with-gtk=${BUILDLINK_PREFIX.gtk3}
 CONFIGURE_ARGS+=       --with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=       --with-jpeg=${JPEGBASE}
 CONFIGURE_ARGS+=       --without-motif
 
 CONFIGURE_ARGS.NetBSD+=        --without-kerberos
 
-#CONFIGURE_ARGS+=      --with-pthread
+# remove on next update
+WRKSRC=                        ${WRKDIR}/${DISTNAME:R}
+
 CONFIGURE_ENV+=                ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
-#CONFIGURE_ENV+=       ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
-#CONFIGURE_ENV+=       INTLTOOL_PERL=${PERL5:Q}
-#.if defined(PKGREVISION)
-#CONFIGURE_ENV+=       X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
-#.endif
-#CONFIGURE_ARGS+=      ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
 
 CONFLICTS+=    xscreensaver-gnome<4.14 xscreensaver-demo-[0-9]*
 
 .include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc*)
+.if ${CC_VERSION:Mgcc*}
 CFLAGS+=               -fno-strict-aliasing
 .endif
 
@@ -60,14 +55,13 @@ post-install:
 .include "options.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"

Index: pkgsrc/x11/xscreensaver/PLIST
diff -u pkgsrc/x11/xscreensaver/PLIST:1.56 pkgsrc/x11/xscreensaver/PLIST:1.57
--- pkgsrc/x11/xscreensaver/PLIST:1.56  Mon Jun 13 09:46:47 2022
+++ pkgsrc/x11/xscreensaver/PLIST       Mon Sep 26 09:24:42 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2022/06/13 09:46:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.57 2022/09/26 09:24:42 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -765,20 +765,9 @@ man/man6/xscreensaver-systemd.6
 man/man6/xscreensaver-text.6
 man/man6/xspirograph.6
 man/man6/zoom.6
-share/applications/xscreensaver-settings.desktop
-share/applications/xscreensaver.desktop
 share/doc/xscreensaver/README.pkgsrc
 share/fonts/xscreensaver/OCRAStd.otf
 share/fonts/xscreensaver/SpecialElite.ttf
 share/fonts/xscreensaver/clacon.ttf
 share/fonts/xscreensaver/gallant12x22.ttf
 share/fonts/xscreensaver/luximr.ttf
-share/pixmaps/xscreensaver.png
-share/xscreensaver/ui/screensaver-cmndln.png
-share/xscreensaver/ui/screensaver-colorselector.png
-share/xscreensaver/ui/screensaver-diagnostic.png
-share/xscreensaver/ui/screensaver-locking.png
-share/xscreensaver/ui/screensaver-power.png
-share/xscreensaver/ui/screensaver-snap.png
-share/xscreensaver/ui/xscreensaver.ui
-share/xscreensaver/xscreensaver.service

Index: pkgsrc/x11/xscreensaver/distinfo
diff -u pkgsrc/x11/xscreensaver/distinfo:1.90 pkgsrc/x11/xscreensaver/distinfo:1.91
--- pkgsrc/x11/xscreensaver/distinfo:1.90       Mon Jun 13 09:46:47 2022
+++ pkgsrc/x11/xscreensaver/distinfo    Mon Sep 26 09:24:42 2022
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.90 2022/06/13 09:46:47 wiz Exp $
+$NetBSD: distinfo,v 1.91 2022/09/26 09:24:42 wiz Exp $
 
-BLAKE2s (xscreensaver-6.04.tar.gz) = 6b96ca53961edbd0c1ea97096920d769702a340d442b34f143182e3a2e25e7b8
-SHA512 (xscreensaver-6.04.tar.gz) = 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
-Size (xscreensaver-6.04.tar.gz) = 26112437 bytes
+BLAKE2s (xscreensaver-6.05.1.tar.gz) = 849a5731933a8f500abb84037746ec5397579ea40de29d735f42f11ec67a3a61
+SHA512 (xscreensaver-6.05.1.tar.gz) = c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
+Size (xscreensaver-6.05.1.tar.gz) = 26110057 bytes
 SHA1 (patch-configure) = 4821b6f4400976990b6042677960a53e25f03a24
-SHA1 (patch-driver_passwd-pwent.c) = 599a63eda4b890d4673b0e2763d980afb4d44a4e