Thursday, March 31, 2022

Re: Trouble updating Xscreensaver to 6.03

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.108
diff -u -p -u -p -r1.108 Makefile
--- Makefile 10 Jan 2021 21:32:12 -0000 1.108
+++ Makefile 31 Mar 2022 23:56:16 -0000
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.108 2021/01/10 21:32:12 sthen Exp $
-
COMMENT= screen saver and locker for the X Window System

-DISTNAME= xscreensaver-5.45
+DISTNAME= xscreensaver-6.03

CATEGORIES= x11

@@ -11,9 +9,9 @@ HOMEPAGE= https://www.jwz.org/xscreensav
# BSD
PERMIT_PACKAGE= Yes

-WANTLIB += GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm atk-1.0
-WANTLIB += c cairo fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB = EGL GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB += Xft Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0 c cairo
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gdk_pixbuf_xlib-2.0 gio-2.0 gle glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz intl jpeg m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread util xml2 z
@@ -41,9 +39,8 @@ USE_GMAKE= Yes
NO_TEST= Yes

CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
- --with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \
- --without-pam
+CONFIGURE_ARGS= --prefix=/usr/local --without-pam \
+ --with-app-defaults="${PREFIX}/lib/X11/app-defaults"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/distinfo,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 distinfo
--- distinfo 10 Jan 2021 21:32:12 -0000 1.41
+++ distinfo 31 Mar 2022 23:56:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.45.tar.gz) = cBbfZza6ASamjB81q89BGmlf6TvAGhjr2d9Gyan01Q0=
-SIZE (xscreensaver-5.45.tar.gz) = 27729147
+SHA256 (xscreensaver-6.03.tar.gz) = Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo=
+SIZE (xscreensaver-6.03.tar.gz) = 25703584
Index: files/migrate-xscreensaver-config.sh
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/files/migrate-xscreensaver-config.sh,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 migrate-xscreensaver-config.sh
--- files/migrate-xscreensaver-config.sh 10 Jul 2014 07:40:36 -0000 1.2
+++ files/migrate-xscreensaver-config.sh 31 Mar 2022 23:56:16 -0000
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $OpenBSD: migrate-xscreensaver-config.sh,v 1.2 2014/07/10 07:40:36 ajacoutot Exp $
-#
# script originally from gnome-screensavers sources

DIST_BIN=`dirname "$0"`
Index: files/xscreensaver-config.xsl
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/files/xscreensaver-config.xsl,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 xscreensaver-config.xsl
--- files/xscreensaver-config.xsl 29 Nov 2008 11:29:07 -0000 1.1
+++ files/xscreensaver-config.xsl 31 Mar 2022 23:56:16 -0000
@@ -1,5 +1,4 @@
<?xml version='1.0'?>
-<!-- $OpenBSD: xscreensaver-config.xsl,v 1.1 2008/11/29 11:29:07 ajacoutot Exp $ -->
<!-- file originally from gnome-screensavers sources -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
Index: patches/patch-driver_XScreenSaver_ad_in
===================================================================
RCS file: patches/patch-driver_XScreenSaver_ad_in
diff -N patches/patch-driver_XScreenSaver_ad_in
--- patches/patch-driver_XScreenSaver_ad_in 3 Jul 2019 16:15:28 -0000 1.16
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.16 2019/07/03 16:15:28 sthen Exp $
-
-Don't hardcode gnome-terminal, fallback to xterm
-
-Index: driver/XScreenSaver.ad.in
---- driver/XScreenSaver.ad.in.orig
-+++ driver/XScreenSaver.ad.in
-@@ -101,8 +101,8 @@
- ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
- !
- @GNOME24@*loadURL: @WITH_BROWSER@ '%s'
--@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
--@GNOME24@ --command '/bin/sh -c "man %s; read foo"'
-+@GNOME24@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
-+@GNOME24@ -e /bin/sh -c 'man "%s" ; read foo'
- !
- ! Gnome 2.2:
- !
Index: patches/patch-driver_passwd-pwent_c
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/patches/patch-driver_passwd-pwent_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-driver_passwd-pwent_c
--- patches/patch-driver_passwd-pwent_c 13 Aug 2018 18:53:50 -0000 1.4
+++ patches/patch-driver_passwd-pwent_c 31 Mar 2022 23:56:16 -0000
@@ -1,9 +1,7 @@
-$OpenBSD: patch-driver_passwd-pwent_c,v 1.4 2018/08/13 18:53:50 sthen Exp $
-
Index: driver/passwd-pwent.c
--- driver/passwd-pwent.c.orig
+++ driver/passwd-pwent.c
-@@ -133,7 +133,7 @@ user_name (void)
+@@ -121,7 +121,7 @@ user_name (void)
still work. Right?) */
if (!u || !*u)
{
@@ -12,12 +10,12 @@ Index: driver/passwd-pwent.c
u = (p ? p->pw_name : 0);
}

-@@ -177,7 +177,7 @@ get_encrypted_passwd(const char *user)
+@@ -158,7 +158,7 @@ get_encrypted_passwd (const char *user)

if (user && *user && !result)
{ /* Check non-shadow passwords too. */
- struct passwd *p = getpwnam(user);
+ struct passwd *p = getpwnam_shadow(user);
if (p && passwd_known_p (p->pw_passwd))
- result = strdup(p->pw_passwd);
+ result = strdup(p->pw_passwd);
}
Index: patches/patch-hacks_glx_crumbler_c
===================================================================
RCS file: patches/patch-hacks_glx_crumbler_c
diff -N patches/patch-hacks_glx_crumbler_c
--- patches/patch-hacks_glx_crumbler_c 10 Jan 2021 21:32:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-hacks_glx_crumbler_c,v 1.2 2021/01/10 21:32:12 sthen Exp $
-
-Index: hacks/glx/crumbler.c
---- hacks/glx/crumbler.c.orig
-+++ hacks/glx/crumbler.c
-@@ -676,6 +676,9 @@ init_crumbler (ModeInfo *mi)
- # undef R
- }
-
-+# ifdef __OpenBSD__
-+ density *= 0.5;
-+#endif
- # ifdef HAVE_MOBILE
- # ifdef HAVE_IPHONE
- density *= 0.5; /* iPhone 6s runs out of memory at 4500 nverts. */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/pkg/PLIST,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 PLIST
--- pkg/PLIST 10 Jan 2021 21:32:12 -0000 1.50
+++ pkg/PLIST 31 Mar 2022 23:56:16 -0000
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.50 2021/01/10 21:32:12 sthen Exp $
@conflict xscreensaver-data-*
@conflict xscreensaver-gle-*
@conflict xscreensaver-<5.07p3-no_gle
@@ -10,12 +9,9 @@
@bin bin/xscreensaver
@mode
@bin bin/xscreensaver-command
-@bin bin/xscreensaver-demo
-@bin bin/xscreensaver-getimage
-bin/xscreensaver-getimage-file
-bin/xscreensaver-getimage-video
-@bin bin/xscreensaver-gl-helper
-bin/xscreensaver-text
+bin/xscreensaver-demo
+@bin bin/xscreensaver-settings
+lib/X11/app-defaults/XScreenSaver
libexec/xscreensaver/
@bin libexec/xscreensaver/abstractile
@bin libexec/xscreensaver/anemone
@@ -30,6 +26,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/atunnel
@bin libexec/xscreensaver/barcode
@bin libexec/xscreensaver/beats
+@bin libexec/xscreensaver/binaryhorizon
@bin libexec/xscreensaver/binaryring
@bin libexec/xscreensaver/blaster
@bin libexec/xscreensaver/blinkbox
@@ -150,10 +147,12 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/lament
@bin libexec/xscreensaver/lavalite
@bin libexec/xscreensaver/lcdscrub
-libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/lockward
@bin libexec/xscreensaver/loop
@bin libexec/xscreensaver/m6502
+@bin libexec/xscreensaver/mapscroller
+libexec/xscreensaver/mapscroller.pl
+@bin libexec/xscreensaver/marbling
@bin libexec/xscreensaver/maze
@bin libexec/xscreensaver/maze3d
@bin libexec/xscreensaver/memscroller
@@ -196,7 +195,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/queens
@bin libexec/xscreensaver/raverhoop
@bin libexec/xscreensaver/razzledazzle
-@bin libexec/xscreensaver/rd-bomb
+@bin libexec/xscreensaver/rdbomb
@bin libexec/xscreensaver/ripples
@bin libexec/xscreensaver/rocks
@bin libexec/xscreensaver/romanboy
@@ -221,6 +220,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/spotlight
@bin libexec/xscreensaver/sproingies
@bin libexec/xscreensaver/squiral
+@bin libexec/xscreensaver/squirtorus
@bin libexec/xscreensaver/stairs
@bin libexec/xscreensaver/starfish
@bin libexec/xscreensaver/starwars
@@ -258,15 +258,18 @@ libexec/xscreensaver/webcollage
@bin libexec/xscreensaver/xlyap
@bin libexec/xscreensaver/xmatrix
@bin libexec/xscreensaver/xrayswarm
+@bin libexec/xscreensaver/xscreensaver-auth
+@bin libexec/xscreensaver/xscreensaver-getimage
+libexec/xscreensaver/xscreensaver-getimage-file
+libexec/xscreensaver/xscreensaver-getimage-video
+@bin libexec/xscreensaver/xscreensaver-gfx
+@bin libexec/xscreensaver/xscreensaver-gl-visual
+libexec/xscreensaver/xscreensaver-text
@bin libexec/xscreensaver/xspirograph
@bin libexec/xscreensaver/zoom
@man man/man1/xscreensaver-command.1
@man man/man1/xscreensaver-demo.1
-@man man/man1/xscreensaver-getimage-file.1
-@man man/man1/xscreensaver-getimage-video.1
-@man man/man1/xscreensaver-getimage.1
-@man man/man1/xscreensaver-systemd.1
-@man man/man1/xscreensaver-text.1
+@man man/man1/xscreensaver-settings.1
@man man/man1/xscreensaver.1
@man man/man6/abstractile.6
@man man/man6/anemone.6
@@ -281,6 +284,7 @@ libexec/xscreensaver/webcollage
@man man/man6/atunnel.6
@man man/man6/barcode.6
@man man/man6/beats.6
+@man man/man6/binaryhorizon.6
@man man/man6/binaryring.6
@man man/man6/blaster.6
@man man/man6/blinkbox.6
@@ -399,9 +403,10 @@ libexec/xscreensaver/webcollage
@man man/man6/lament.6
@man man/man6/lavalite.6
@man man/man6/lcdscrub.6
-@man man/man6/ljlatest.6
@man man/man6/lockward.6
@man man/man6/loop.6
+@man man/man6/mapscroller.6
+@man man/man6/marbling.6
@man man/man6/maze.6
@man man/man6/maze3d.6
@man man/man6/memscroller.6
@@ -443,7 +448,7 @@ libexec/xscreensaver/webcollage
@man man/man6/queens.6
@man man/man6/raverhoop.6
@man man/man6/razzledazzle.6
-@man man/man6/rd-bomb.6
+@man man/man6/rdbomb.6
@man man/man6/ripples.6
@man man/man6/rocks.6
@man man/man6/romanboy.6
@@ -468,6 +473,7 @@ libexec/xscreensaver/webcollage
@man man/man6/spotlight.6
@man man/man6/sproingies.6
@man man/man6/squiral.6
+@man man/man6/squirtorus.6
@man man/man6/stairs.6
@man man/man6/starfish.6
@man man/man6/starwars.6
@@ -504,9 +510,16 @@ libexec/xscreensaver/webcollage
@man man/man6/xlyap.6
@man man/man6/xmatrix.6
@man man/man6/xrayswarm.6
+@man man/man6/xscreensaver-auth.6
@man man/man6/xscreensaver-circuit.6
@man man/man6/xscreensaver-deco.6
-@man man/man6/xscreensaver-gl-helper.6
+@man man/man6/xscreensaver-getimage-file.6
+@man man/man6/xscreensaver-getimage-video.6
+@man man/man6/xscreensaver-getimage.6
+@man man/man6/xscreensaver-gfx.6
+@man man/man6/xscreensaver-gl-visual.6
+@man man/man6/xscreensaver-systemd.6
+@man man/man6/xscreensaver-text.6
@man man/man6/xspirograph.6
@man man/man6/zoom.6
share/applications/screensavers/
@@ -524,6 +537,7 @@ share/applications/screensavers/attracti
share/applications/screensavers/atunnel.desktop
share/applications/screensavers/barcode.desktop
share/applications/screensavers/beats.desktop
+share/applications/screensavers/binaryhorizon.desktop
share/applications/screensavers/binaryring.desktop
share/applications/screensavers/blaster.desktop
share/applications/screensavers/blinkbox.desktop
@@ -662,6 +676,8 @@ share/applications/screensavers/lmorph.d
share/applications/screensavers/lockward.desktop
share/applications/screensavers/loop.desktop
share/applications/screensavers/m6502.desktop
+share/applications/screensavers/mapscroller.desktop
+share/applications/screensavers/marbling.desktop
share/applications/screensavers/maze.desktop
share/applications/screensavers/maze3d.desktop
share/applications/screensavers/memscroller.desktop
@@ -705,7 +721,6 @@ share/applications/screensavers/quasicry
share/applications/screensavers/queens.desktop
share/applications/screensavers/raverhoop.desktop
share/applications/screensavers/razzledazzle.desktop
-share/applications/screensavers/rd-bomb.desktop
share/applications/screensavers/rdbomb.desktop
share/applications/screensavers/ripples.desktop
share/applications/screensavers/rocks.desktop
@@ -734,6 +749,7 @@ share/applications/screensavers/splodesi
share/applications/screensavers/spotlight.desktop
share/applications/screensavers/sproingies.desktop
share/applications/screensavers/squiral.desktop
+share/applications/screensavers/squirtorus.desktop
share/applications/screensavers/stairs.desktop
share/applications/screensavers/starfish.desktop
share/applications/screensavers/starwars.desktop
@@ -778,28 +794,13 @@ share/applications/screensavers/xrayswar
share/applications/screensavers/xspirograph.desktop
share/applications/screensavers/zoom.desktop
share/applications/xscreensaver-properties.desktop
-share/locale/da/LC_MESSAGES/xscreensaver.mo
-share/locale/de/LC_MESSAGES/xscreensaver.mo
-share/locale/es/LC_MESSAGES/xscreensaver.mo
-share/locale/et/LC_MESSAGES/xscreensaver.mo
-share/locale/fi/LC_MESSAGES/xscreensaver.mo
-share/locale/fr/LC_MESSAGES/xscreensaver.mo
-share/locale/hu/LC_MESSAGES/xscreensaver.mo
-share/locale/it/LC_MESSAGES/xscreensaver.mo
-share/locale/ja/LC_MESSAGES/xscreensaver.mo
-share/locale/ko/LC_MESSAGES/xscreensaver.mo
-share/locale/nb/LC_MESSAGES/xscreensaver.mo
-share/locale/nl/LC_MESSAGES/xscreensaver.mo
-share/locale/pl/LC_MESSAGES/xscreensaver.mo
-share/locale/pt/LC_MESSAGES/xscreensaver.mo
-share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
-share/locale/sk/LC_MESSAGES/xscreensaver.mo
-share/locale/sv/LC_MESSAGES/xscreensaver.mo
-share/locale/vi/LC_MESSAGES/xscreensaver.mo
-share/locale/wa/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
+share/fonts/
+@fontdir share/fonts/xscreensaver/
+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/
share/pixmaps/xscreensaver.xpm
share/xscreensaver/
@@ -818,6 +819,7 @@ share/xscreensaver/config/attraction.xml
share/xscreensaver/config/atunnel.xml
share/xscreensaver/config/barcode.xml
share/xscreensaver/config/beats.xml
+share/xscreensaver/config/binaryhorizon.xml
share/xscreensaver/config/binaryring.xml
share/xscreensaver/config/blaster.xml
share/xscreensaver/config/blinkbox.xml
@@ -941,6 +943,8 @@ share/xscreensaver/config/lcdscrub.xml
share/xscreensaver/config/lockward.xml
share/xscreensaver/config/loop.xml
share/xscreensaver/config/m6502.xml
+share/xscreensaver/config/mapscroller.xml
+share/xscreensaver/config/marbling.xml
share/xscreensaver/config/maze.xml
share/xscreensaver/config/maze3d.xml
share/xscreensaver/config/memscroller.xml
@@ -983,7 +987,7 @@ share/xscreensaver/config/quasicrystal.x
share/xscreensaver/config/queens.xml
share/xscreensaver/config/raverhoop.xml
share/xscreensaver/config/razzledazzle.xml
-share/xscreensaver/config/rd-bomb.xml
+share/xscreensaver/config/rdbomb.xml
share/xscreensaver/config/ripples.xml
share/xscreensaver/config/rocks.xml
share/xscreensaver/config/romanboy.xml
@@ -1008,6 +1012,7 @@ share/xscreensaver/config/splodesic.xml
share/xscreensaver/config/spotlight.xml
share/xscreensaver/config/sproingies.xml
share/xscreensaver/config/squiral.xml
+share/xscreensaver/config/squirtorus.xml
share/xscreensaver/config/stairs.xml
share/xscreensaver/config/starfish.xml
share/xscreensaver/config/starwars.xml
@@ -1053,5 +1058,5 @@ share/xscreensaver/ui/screensaver-diagno
share/xscreensaver/ui/screensaver-locking.png
share/xscreensaver/ui/screensaver-power.png
share/xscreensaver/ui/screensaver-snap.png
-share/xscreensaver/ui/xscreensaver-demo.ui
@tag update-desktop-database
+share/xscreensaver/ui/xscreensaver.ui
On Thu Mar 31, 2022 at 6:21 PM EDT, Ariel Popper wrote:
> Hello ports,
>
> I am attempting to get Xscreensaver updated to 6.03, but as I am wholly
> inexperienced with this entire process, I have run into a snag.
>
> I am building on amd64, everything seems to build smoothly and install
> smoothly, screen blanking/unblanking, locking/unlocking is working as
> advertised. When trying to run any of the screensavers, the screen shows
> a message to not run Xscreensaver as root. As far as I know; I am not
> doing that.
>
> in my users ~/.xsession:
> /usr/local/bin/xscreensaver --no-splash &
>
> $ ls -l /usr/local/bin/xscreensaver
> -rwsr-xr-x 1 root bin 47216 Mar 4 21:29 /usr/local/bin/xscreensaver
>
> $ id
> uid=1000(ariel) gid=1000(ariel) groups=1000(ariel), 0(wheel),
> 5(operator), 9(wsrc), 20(staff), 21(wobj)
>
> Attached you should find the ports diff and a log from xscreensaver in verbose
> mode. Should you require any more info that I could not think of, please
> ask.
>
> Thank you,
>
> Ariel

I realize that I attached an older patch in my previous email. My
apologies. Here is a more up to date version.

--
Ariel

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)