Attachment 226958 Details for Bug 254178 – patch for 6.01

[patch] patch for 6.01

xscreensaver-6.01-rev0.diff (text/plain), 10.24 KB, created by Steve Wills on 2021-08-04 22:57:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2021-08-04 22:57:28 UTC

Size: 10.24 KB

patch

obsolete

>diff --git x11/xscreensaver/Makefile x11/xscreensaver/Makefile
>index 7e7b3957128e..901a0167f93d 100644
>--- x11/xscreensaver/Makefile
>+++ x11/xscreensaver/Makefile
>@@ -1,7 +1,7 @@
> # Created by: dom@myrddin.demon.co.uk
> 
> PORTNAME=	xscreensaver
>-PORTVERSION=	5.45
>+PORTVERSION=	6.01
> CATEGORIES=	x11
> MASTER_SITES=	http://www.jwz.org/xscreensaver/
> 
>@@ -14,7 +14,8 @@ RUN_DEPENDS=	giftopnm:graphics/netpbm \
> 		p5-libwww>0:www/p5-libwww
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
>-		libgle.so:graphics/gle
>+		libgle.so:graphics/gle \
>+		libharfbuzz.so:print/harfbuzz
> 
> USES=		autoreconf gettext gl gmake gnome jpeg localbase:ldflags perl5 \
> 		pkgconfig xorg
>@@ -23,6 +24,8 @@ USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2
> USE_PERL5=	run
> USE_XORG=	ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
> USE_CSTD=	gnu99
>+# ignore error from tar due to duplicate driver/xscreensaver-command.man
>+EXTRACT_AFTER_ARGS+=	|| :
> 
> CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
> 
>diff --git x11/xscreensaver/distinfo x11/xscreensaver/distinfo
>index 8a09a24f56d8..d063f4afdc4c 100644
>--- x11/xscreensaver/distinfo
>+++ x11/xscreensaver/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1615330387
>-SHA256 (xscreensaver-5.45.tar.gz) = 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d
>-SIZE (xscreensaver-5.45.tar.gz) = 27729147
>+TIMESTAMP = 1628111167
>+SHA256 (xscreensaver-6.01.tar.gz) = 085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b
>+SIZE (xscreensaver-6.01.tar.gz) = 27820165
>diff --git x11/xscreensaver/files/patch-config.h.in x11/xscreensaver/files/patch-config.h.in
>index 33809541adb1..d0198a01b3b9 100644
>--- x11/xscreensaver/files/patch-config.h.in
>+++ x11/xscreensaver/files/patch-config.h.in
>@@ -1,12 +1,12 @@
>---- config.h.in.orig	2016-04-03 20:07:59 UTC
>+--- config.h.in.orig	2021-05-08 15:22:06 UTC
> +++ config.h.in
>-@@ -307,6 +307,9 @@
>+@@ -315,6 +315,9 @@
>  /* Define to 1 if you have the <util.h> header file. */
>  #undef HAVE_UTIL_H
>  
> +/* Define to 1 if you have the <libutil.h> header file. */
> +#undef HAVE_LIBUTIL_H
> +
>- /* Define this if you have the XF86MiscSetGrabKeysState function (which allows
>-    the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily
>-    disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) */
>+ /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */
>+ #undef HAVE_XF86VMODE
>+ 
>diff --git x11/xscreensaver/files/patch-configure.ac x11/xscreensaver/files/patch-configure.ac
>index 266d216921c5..e1ae51fa36d4 100644
>--- x11/xscreensaver/files/patch-configure.ac
>+++ x11/xscreensaver/files/patch-configure.ac
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2020-12-06 15:54:46 UTC
>+--- configure.ac.orig	2021-05-20 16:46:35 UTC
> +++ configure.ac
>-@@ -3971,7 +3971,7 @@ fi
>+@@ -4010,7 +4010,7 @@ fi
>  ###############################################################################
>  
>  PTY_LIBS=
>diff --git x11/xscreensaver/files/patch-driver_Makefile.in x11/xscreensaver/files/patch-driver_Makefile.in
>index dfa6c6bfe195..fdebb600355a 100644
>--- x11/xscreensaver/files/patch-driver_Makefile.in
>+++ x11/xscreensaver/files/patch-driver_Makefile.in
>@@ -1,22 +1,20 @@
>---- driver/Makefile.in.orig	2016-05-24 18:02:30 UTC
>+--- driver/Makefile.in.orig	2021-06-09 15:47:14 UTC
> +++ driver/Makefile.in
>-@@ -51,7 +51,7 @@ DEPEND_DEFINES	= @DEPEND_DEFINES@
>+@@ -46,7 +46,7 @@ DEPEND_FLAGS	= @DEPEND_FLAGS@
>+ DEPEND_DEFINES	= @DEPEND_DEFINES@
>  
>- SHELL		= /bin/sh
>  INSTALL		= @INSTALL@
> -SUID_FLAGS      = -o root -m 4755
> +SUID_FLAGS      = -m 755
>  INSTALL_PROGRAM = @INSTALL_PROGRAM@
>- INSTALL_SCRIPT  = @INSTALL_SCRIPT@
>- INSTALL_SETUID  = @INSTALL_SETUID@
>-@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
>- 
>- 
>+ INSTALL_SETUID	= $(INSTALL_PROGRAM) $(SUID_FLAGS)
>+ INSTALL_DATA	= @INSTALL_DATA@
>+@@ -76,7 +76,7 @@ INTL_LIBS	= @INTLLIBS@
>  AD_DIR		= @APPDEFAULTS@
>--PAM_DIR		= /etc/pam.d
>--PAM_CONF	= /etc/pam.conf
>-+PAM_DIR		= ${prefix}/etc/pam.d
>-+PAM_CONF	= ${prefix}/etc/pam.conf
>  
>- UTILS_SRC	= $(srcdir)/../utils
>- UTILS_BIN	= ../utils
>+ # $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc.
>+-PAM_ROOT	= /etc
>++PAM_ROOT	= ${prefix}/etc
>+ PAM_DIR		= $(PAM_ROOT)/pam.d
>+ PAM_CONF	= $(PAM_ROOT)/pam.conf
>+ 
>diff --git x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
>index 3266ab3e29ad..9a5f1ed4b211 100644
>--- x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
>+++ x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
>@@ -1,6 +1,6 @@
>---- driver/XScreenSaver.ad.in.orig	2019-07-10 03:31:26 UTC
>+--- driver/XScreenSaver.ad.in.orig	2021-06-09 15:47:14 UTC
> +++ driver/XScreenSaver.ad.in
>-@@ -56,7 +56,7 @@
>+@@ -55,7 +55,7 @@
>  *splashDuration:	0:00:05
>  *visualID:		default
>  *installColormap:	True
>@@ -9,16 +9,16 @@
>  *authWarningSlack:	20
>  
>  *textMode:		file
>-@@ -124,7 +124,7 @@
>+@@ -103,7 +103,7 @@
>  
>- ! The format used for printing the date and time in the password dialog box
>- ! (see the strftime(3) manual page for details.)
>--*dateFormat:		%d-%b-%y (%a); %I:%M %p
>+ 
>+ ! The strftime(3) format string for printing the time on the password dialog.
>+-*dateFormat:		%I:%M %p, %a %b %e
> +*dateFormat:		%Y-%m-%d %H:%M:%S
>- ! For day month date:
>- ! *dateFormat:		%a %b %d, %I:%M %p
>- ! To show the time only:
>-@@ -343,6 +343,18 @@ XScreenSaver.bourneShell:		/bin/sh
>+ ! DD MMM:
>+ ! *dateFormat:		%I:%M %p, %e %b (%a)
>+ ! 12 hour time only:
>+@@ -324,6 +324,18 @@ XScreenSaver.bourneShell:		/bin/sh
>  !=============================================================================
>  
>  *programs:								      \
>@@ -37,11 +37,11 @@
>  				maze -root				    \n\
>  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
>  				attraction -root			    \n\
>-@@ -610,7 +622,6 @@ XScreenSaver.bourneShell:		/bin/sh
>- *hacks.dangerball.name:     DangerBall
>- *hacks.decayscreen.name:    DecayScreen
>- *hacks.deepstars.name:      DeepStars
>+@@ -602,7 +614,6 @@ XScreenSaver.bourneShell:		/bin/sh
>+ *hacks.dangerball.name:     Danger Ball
>+ *hacks.decayscreen.name:    Decay Screen
>+ *hacks.deepstars.name:      Deep Stars
> -*hacks.dnalogo.name:        DNA Logo
>- *hacks.dymaxionmap.name:    DymaxionMap
>- *hacks.energystream.name:   EnergyStream
>- *hacks.euler2d.name:        Euler2D
>+ *hacks.dymaxionmap.name:    Dymaxion Map
>+ *hacks.energystream.name:   Energy Stream
>+ *hacks.etruscanvenus.name:  Etruscan Venus
>diff --git x11/xscreensaver/pkg-plist x11/xscreensaver/pkg-plist
>index 919e349ebf32..f25e8cbd97e2 100644
>--- x11/xscreensaver/pkg-plist
>+++ x11/xscreensaver/pkg-plist
>@@ -1,10 +1,6 @@
> @(,,4755) bin/xscreensaver
> bin/xscreensaver-command
> bin/xscreensaver-demo
>-bin/xscreensaver-getimage
>-bin/xscreensaver-getimage-file
>-bin/xscreensaver-getimage-video
>-bin/xscreensaver-gl-helper
> bin/xscreensaver-hacks/abstractile
> bin/xscreensaver-hacks/anemone
> bin/xscreensaver-hacks/anemotaxis
>@@ -138,7 +134,6 @@ bin/xscreensaver-hacks/kumppa
> bin/xscreensaver-hacks/lament
> bin/xscreensaver-hacks/lavalite
> bin/xscreensaver-hacks/lcdscrub
>-bin/xscreensaver-hacks/ljlatest
> bin/xscreensaver-hacks/lockward
> bin/xscreensaver-hacks/loop
> bin/xscreensaver-hacks/m6502
>@@ -200,6 +195,13 @@ bin/xscreensaver-hacks/sierpinski3d
> bin/xscreensaver-hacks/skytentacles
> bin/xscreensaver-hacks/slidescreen
> bin/xscreensaver-hacks/slip
>+bin/xscreensaver-hacks/xscreensaver-auth
>+bin/xscreensaver-hacks/xscreensaver-getimage
>+bin/xscreensaver-hacks/xscreensaver-getimage-file
>+bin/xscreensaver-hacks/xscreensaver-getimage-video
>+bin/xscreensaver-hacks/xscreensaver-gfx
>+bin/xscreensaver-hacks/xscreensaver-gl-visual
>+bin/xscreensaver-hacks/xscreensaver-text
> %%SETUID_HACKS%%@mode 4755
> bin/xscreensaver-hacks/sonar
> %%SETUID_HACKS%%@mode
>@@ -250,16 +252,11 @@ bin/xscreensaver-hacks/xmatrix
> bin/xscreensaver-hacks/xrayswarm
> bin/xscreensaver-hacks/xspirograph
> bin/xscreensaver-hacks/zoom
>-bin/xscreensaver-text
>+bin/xscreensaver-settings
> %%PAM%%etc/pam.d/xscreensaver
> lib/X11/app-defaults/XScreenSaver
> man/man1/xscreensaver-command.1.gz
> man/man1/xscreensaver-demo.1.gz
>-man/man1/xscreensaver-getimage-file.1.gz
>-man/man1/xscreensaver-getimage-video.1.gz
>-man/man1/xscreensaver-getimage.1.gz
>-man/man1/xscreensaver-systemd.1.gz
>-man/man1/xscreensaver-text.1.gz
> man/man1/xscreensaver.1.gz
> man/man6/abstractile.6.gz
> man/man6/anemone.6.gz
>@@ -269,6 +266,16 @@ man/man6/antmaze.6.gz
> man/man6/antspotlight.6.gz
> man/man6/apollonian.6.gz
> man/man6/apple2.6.gz
>+man/man1/xscreensaver-settings.1.gz
>+man/man6/xscreensaver-auth.6.gz
>+man/man6/xscreensaver-command.6.gz
>+man/man6/xscreensaver-getimage-file.6.gz
>+man/man6/xscreensaver-getimage-video.6.gz
>+man/man6/xscreensaver-getimage.6.gz
>+man/man6/xscreensaver-gfx.6.gz
>+man/man6/xscreensaver-gl-visual.6.gz
>+man/man6/xscreensaver-systemd.6.gz
>+man/man6/xscreensaver-text.6.gz
> man/man6/atlantis.6.gz
> man/man6/attraction.6.gz
> man/man6/atunnel.6.gz
>@@ -394,7 +401,6 @@ man/man6/kumppa.6.gz
> man/man6/lament.6.gz
> man/man6/lavalite.6.gz
> man/man6/lcdscrub.6.gz
>-man/man6/ljlatest.6.gz
> man/man6/lockward.6.gz
> man/man6/loop.6.gz
> man/man6/maze.6.gz
>@@ -499,7 +505,6 @@ man/man6/xjack.6.gz
> man/man6/xlyap.6.gz
> man/man6/xmatrix.6.gz
> man/man6/xrayswarm.6.gz
>-man/man6/xscreensaver-gl-helper.6.gz
> man/man6/xspirograph.6.gz
> man/man6/zoom.6.gz
> share/applications/xscreensaver-blank.desktop
>@@ -507,6 +512,11 @@ share/applications/xscreensaver-lock.desktop
> share/applications/xscreensaver-properties.desktop
> share/applications/xscreensaver-start.desktop
> share/applications/xscreensaver-stop.desktop
>+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
> %%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
> %%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
> %%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
>@@ -531,6 +541,7 @@ share/applications/xscreensaver-stop.desktop
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
> share/pixmaps/xscreensaver.xpm
> %%DATADIR%%/config/README
>+%%DATADIR%%/ui/xscreensaver.ui
> %%DATADIR%%/config/abstractile.xml
> %%DATADIR%%/config/anemone.xml
> %%DATADIR%%/config/anemotaxis.xml
>@@ -784,4 +795,3 @@ share/pixmaps/xscreensaver.xpm
> %%DATADIR%%/ui/screensaver-locking.png
> %%DATADIR%%/ui/screensaver-power.png
> %%DATADIR%%/ui/screensaver-snap.png
>-%%DATADIR%%/ui/xscreensaver-demo.ui

Actions: View | Diff

Attachments on bug 254178: 223139 | 226958 | 228092 | 228095 | 228500 | 228515 | 228661 | 229118 | 231805 | 231815 | 231850