Attachment 158242 Details for Bug 201254 – update patch

[patch] update patch

xscreensaver.diff (text/plain), 11.57 KB, created by Guido Falsi on 2015-07-01 23:13:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2015-07-01 23:13:06 UTC

Size: 11.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 391037)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xscreensaver
>-PORTVERSION=	5.29
>-PORTREVISION=	4
>+PORTVERSION=	5.32
> CATEGORIES=	x11
> MASTER_SITES=	http://www.jwz.org/xscreensaver/
> 
>@@ -14,12 +13,9 @@
> 		giftopnm:${PORTSDIR}/graphics/netpbm
> LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle
> 
>-DESTDIRNAME=	install_prefix
>-
> CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
> 
>-USES=		gettext gmake jpeg perl5 pkgconfig
>-USE_AUTOTOOLS=	autoconf
>+USES=		autoreconf gettext gmake jpeg perl5 pkgconfig
> USE_GL=		yes
> USE_GNOME=	gdkpixbuf2 gtk20 intltool libglade2 libxml2
> USE_PERL5=	run
>@@ -35,11 +31,12 @@
> 		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
> 		--with-xf86gamma-ext --with-randr-ext --without-kerberos \
> 		--without-setuid-hacks --enable-locking
>+MAKE_ARGS+=	install_prefix=${STAGEDIR}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	PAM SETUID_HACKS FIREF XAOS1 XDALI XEARTH \
>-		XMOUN XPLANET XSNOW
>+		XFT XMOUN XPLANET XSNOW
> OPTIONS_SUB=	yes
> 
> PAM_CONFIGURE_WITH=		pam
>@@ -55,6 +52,9 @@
> XDALI_DESC=			Add extra port x11-clocks/xdaliclock
> XDALI_RUN_DEPENDS=		xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
> 
>+XFT_CONFIGURE_WITH=		xft
>+XFT_USE=			XORG=xft
>+
> XEARTH_DESC=			Add extra port astro/xearth
> XEARTH_RUN_DEPENDS=		xearth:${PORTSDIR}/astro/xearth
> 
>@@ -83,5 +83,6 @@
> post-install:
> 	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
> 	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
>+	${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 391037)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294
>-SIZE (xscreensaver-5.29.tar.gz) = 8774562
>+SHA256 (xscreensaver-5.32.tar.gz) = 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd
>+SIZE (xscreensaver-5.32.tar.gz) = 10571502
>Index: files/patch-config.h.in
>===================================================================
>--- files/patch-config.h.in	(revision 391037)
>+++ files/patch-config.h.in	(working copy)
>@@ -1,6 +1,6 @@
>---- config.h.in.orig	2013-09-02 12:44:35.341733572 +0200
>-+++ config.h.in	2013-09-02 12:45:05.396737361 +0200
>-@@ -340,6 +340,9 @@
>+--- config.h.in.orig	2014-10-08 18:09:49 UTC
>++++ config.h.in
>+@@ -304,6 +304,9 @@
>  /* Define to 1 if you have the <util.h> header file. */
>  #undef HAVE_UTIL_H
>  
>Index: files/patch-configure.in
>===================================================================
>--- files/patch-configure.in	(revision 391037)
>+++ files/patch-configure.in	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.in.orig	2013-09-02 12:45:33.940731237 +0200
>-+++ configure.in	2013-09-02 12:46:13.253728009 +0200
>-@@ -3359,7 +3359,7 @@
>+--- configure.in.orig	2014-10-08 18:09:41 UTC
>++++ configure.in
>+@@ -3510,7 +3510,7 @@ fi
>  ###############################################################################
>  
>  PTY_LIBS=
>Index: files/patch-driver_Makefile.in
>===================================================================
>--- files/patch-driver_Makefile.in	(revision 391037)
>+++ files/patch-driver_Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- driver/Makefile.in.orig	2013-07-16 11:23:32.000000000 +0200
>-+++ driver/Makefile.in	2013-09-02 11:56:16.862939343 +0200
>-@@ -81,8 +81,8 @@
>+--- driver/Makefile.in.orig	2014-11-19 07:24:01 UTC
>++++ driver/Makefile.in
>+@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
>  
>  
>  AD_DIR		= @APPDEFAULTS@
>@@ -11,7 +11,7 @@
>  
>  UTILS_SRC	= $(srcdir)/../utils
>  UTILS_BIN	= ../utils
>-@@ -207,7 +207,7 @@
>+@@ -205,7 +205,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
>  SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
>  		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
>  		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
>Index: files/patch-driver_XScreenSaver.ad.in
>===================================================================
>--- files/patch-driver_XScreenSaver.ad.in	(revision 391037)
>+++ files/patch-driver_XScreenSaver.ad.in	(working copy)
>@@ -1,5 +1,5 @@
>---- driver/XScreenSaver.ad.in.orig	2013-12-09 12:01:40.000000000 +0100
>-+++ driver/XScreenSaver.ad.in	2013-12-17 19:34:28.222008084 +0100
>+--- driver/XScreenSaver.ad.in.orig	2014-11-18 22:54:02 UTC
>++++ driver/XScreenSaver.ad.in
> @@ -56,7 +56,7 @@
>  *splashDuration:	0:00:05
>  *visualID:		default
>@@ -6,10 +6,10 @@
>  *captureStderr: 	True
> -*ignoreUninstalledPrograms: False
> +*ignoreUninstalledPrograms: True
>+ *authWarningSlack:	20
>  
>  *textMode:		file
>- *textLiteral:		XScreenSaver
>-@@ -122,7 +122,7 @@
>+@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False
>  
>  ! The format used for printing the date and time in the password dialog box
>  ! (see the strftime(3) manual page for details.)
>@@ -18,7 +18,7 @@
>  ! To show the time only:
>  ! *dateFormat:		%I:%M %p
>  ! For 24 hour time:
>-@@ -156,6 +156,18 @@
>+@@ -157,6 +157,18 @@ GetViewPortIsFullOfLies: False
>  ! screen savers interactively.
>  !
>  *programs:								      \
>@@ -37,15 +37,7 @@
>  				maze -root				    \n\
>  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
>  				attraction -root			    \n\
>-@@ -251,7 +263,6 @@
>- 				xspirograph -root			    \n\
>- @GL_KLUDGE@ GL: 				circuit -root				    \n\
>- @GL_KLUDGE@ GL: 				dangerball -root			    \n\
>--- GL: 				dnalogo -root				    \n\
>- @GL_KLUDGE@ GL: 				engine -root				    \n\
>- @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
>- @GL_KLUDGE@ GL: 				gltext -root				    \n\
>-@@ -449,7 +460,6 @@
>+@@ -457,7 +469,6 @@ XScreenSaver.bourneShell:		/bin/sh
>  *hacks.cwaves.name:         CWaves
>  *hacks.dangerball.name:     DangerBall
>  *hacks.decayscreen.name:    DecayScreen
>Index: files/patch-hacks__config__sonar.xml
>===================================================================
>--- files/patch-hacks__config__sonar.xml	(revision 391037)
>+++ files/patch-hacks__config__sonar.xml	(working copy)
>@@ -1,6 +1,6 @@
>---- hacks/config/sonar.xml.orig	2013-12-04 23:42:00.000000000 +0100
>-+++ hacks/config/sonar.xml	2013-12-09 12:29:34.301395635 +0100
>-@@ -29,7 +29,7 @@
>+--- hacks/config/sonar.xml.orig	2014-09-19 17:12:43 UTC
>++++ hacks/config/sonar.xml
>+@@ -31,7 +31,7 @@
>  
>       <option id="ssh" _label="Ping known SSH hosts"      arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
>  
>@@ -9,7 +9,7 @@
>  
>       <option id="sim" _label="Simulation (don't ping)"   arg-set="-ping simulation"/>
>      </select>
>-@@ -76,6 +76,8 @@
>+@@ -78,6 +78,8 @@ respectively.
>  
>  Alternately, it can run a simulation that doesn't involve hosts.
>  
>Index: files/patch-hacks_memscroller.c
>===================================================================
>--- files/patch-hacks_memscroller.c	(revision 391037)
>+++ files/patch-hacks_memscroller.c	(working copy)
>@@ -1,12 +1,16 @@
>---- hacks/memscroller.c.orig	2014-06-12 20:55:52.000000000 +0200
>-+++ hacks/memscroller.c	2014-06-12 20:56:03.000000000 +0200
>-@@ -349,9 +349,6 @@
>-          from earlier days before the advent of virtual memory management."
>-             -- sbrk(2) man page on MacOS
>-        */
>--#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
>--#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
>--#  endif
>-       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
>- # endif
>+--- hacks/memscroller.c.orig	2014-09-13 20:34:45 UTC
>++++ hacks/memscroller.c
>+@@ -306,13 +306,6 @@ open_file (state *st)
>+    from earlier days before the advent of virtual memory management."
>+       -- sbrk(2) man page on BSD systems, as of 1995 or so.
>+  */
>+-#ifdef HAVE_SBRK
>+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
>+-   /* Don't print "warning: 'sbrk' is deprecated". */
>+-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
>+-# endif
>+-#endif
>+-
>  
>+ static unsigned int
>+ more_bits (state *st, scroller *sc)
>Index: files/patch-utils_textclient.c
>===================================================================
>--- files/patch-utils_textclient.c	(revision 391037)
>+++ files/patch-utils_textclient.c	(working copy)
>@@ -1,5 +1,5 @@
>---- utils/textclient.c.orig	2013-09-02 12:43:01.271738814 +0200
>-+++ utils/textclient.c	2013-09-02 12:43:25.014748042 +0200
>+--- utils/textclient.c.orig	2014-11-05 00:08:06 UTC
>++++ utils/textclient.c
> @@ -50,6 +50,9 @@
>  # ifdef HAVE_UTIL_H
>  #  include <util.h>
>@@ -9,4 +9,4 @@
> +# endif
>  #endif /* HAVE_FORKPTY */
>  
>- /*#define DEBUG*/
>+ #undef DEBUG
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 391037)
>+++ pkg-plist	(working copy)
>@@ -17,6 +17,7 @@
> bin/xscreensaver-hacks/attraction
> bin/xscreensaver-hacks/atunnel
> bin/xscreensaver-hacks/barcode
>+bin/xscreensaver-hacks/binaryring
> bin/xscreensaver-hacks/blaster
> bin/xscreensaver-hacks/blinkbox
> bin/xscreensaver-hacks/blitspin
>@@ -35,6 +36,7 @@
> bin/xscreensaver-hacks/ccurve
> bin/xscreensaver-hacks/celtic
> bin/xscreensaver-hacks/circuit
>+bin/xscreensaver-hacks/cityflow
> bin/xscreensaver-hacks/cloudlife
> bin/xscreensaver-hacks/companioncube
> bin/xscreensaver-hacks/compass
>@@ -77,6 +79,7 @@
> bin/xscreensaver-hacks/galaxy
> bin/xscreensaver-hacks/gears
> bin/xscreensaver-hacks/geodesic
>+bin/xscreensaver-hacks/geodesicgears
> bin/xscreensaver-hacks/gflux
> bin/xscreensaver-hacks/glblur
> bin/xscreensaver-hacks/glcells
>@@ -206,6 +209,7 @@
> bin/xscreensaver-hacks/webcollage
> bin/xscreensaver-hacks/webcollage-helper
> bin/xscreensaver-hacks/whirlwindwarp
>+bin/xscreensaver-hacks/winduprobot
> bin/xscreensaver-hacks/wormhole
> bin/xscreensaver-hacks/xanalogtv
> bin/xscreensaver-hacks/xflame
>@@ -237,6 +241,7 @@
> man/man6/attraction.6.gz
> man/man6/atunnel.6.gz
> man/man6/barcode.6.gz
>+man/man6/binaryring.6.gz
> man/man6/blaster.6.gz
> man/man6/blinkbox.6.gz
> man/man6/blitspin.6.gz
>@@ -255,6 +260,7 @@
> man/man6/ccurve.6.gz
> man/man6/celtic.6.gz
> man/man6/circuit.6.gz
>+man/man6/cityflow.6.gz
> man/man6/cloudlife.6.gz
> man/man6/companioncube.6.gz
> man/man6/compass.6.gz
>@@ -297,6 +303,7 @@
> man/man6/galaxy.6.gz
> man/man6/gears.6.gz
> man/man6/geodesic.6.gz
>+man/man6/geodesicgears.6.gz
> man/man6/gflux.6.gz
> man/man6/glblur.6.gz
> man/man6/glcells.6.gz
>@@ -421,6 +428,7 @@
> man/man6/wander.6.gz
> man/man6/webcollage.6.gz
> man/man6/whirlwindwarp.6.gz
>+man/man6/winduprobot.6.gz
> man/man6/wormhole.6.gz
> man/man6/xanalogtv.6.gz
> man/man6/xflame.6.gz
>@@ -473,6 +481,7 @@
> %%DATADIR%%/config/attraction.xml
> %%DATADIR%%/config/atunnel.xml
> %%DATADIR%%/config/barcode.xml
>+%%DATADIR%%/config/binaryring.xml
> %%DATADIR%%/config/blaster.xml
> %%DATADIR%%/config/blinkbox.xml
> %%DATADIR%%/config/blitspin.xml
>@@ -491,6 +500,7 @@
> %%DATADIR%%/config/ccurve.xml
> %%DATADIR%%/config/celtic.xml
> %%DATADIR%%/config/circuit.xml
>+%%DATADIR%%/config/cityflow.xml
> %%DATADIR%%/config/cloudlife.xml
> %%DATADIR%%/config/companioncube.xml
> %%DATADIR%%/config/compass.xml
>@@ -533,6 +543,7 @@
> %%DATADIR%%/config/galaxy.xml
> %%DATADIR%%/config/gears.xml
> %%DATADIR%%/config/geodesic.xml
>+%%DATADIR%%/config/geodesicgears.xml
> %%DATADIR%%/config/gflux.xml
> %%DATADIR%%/config/glblur.xml
> %%DATADIR%%/config/glcells.xml
>@@ -658,6 +669,7 @@
> %%DATADIR%%/config/wander.xml
> %%DATADIR%%/config/webcollage.xml
> %%DATADIR%%/config/whirlwindwarp.xml
>+%%DATADIR%%/config/winduprobot.xml
> %%DATADIR%%/config/wormhole.xml
> %%DATADIR%%/config/xanalogtv.xml
> %%DATADIR%%/config/xaos.xml
>@@ -680,7 +692,3 @@
> %%DATADIR%%/glade/screensaver-power.png
> %%DATADIR%%/glade/screensaver-snap.png
> %%DATADIR%%/glade/xscreensaver-demo.glade2
>-@dirrmtry bin/xscreensaver-hacks
>-@dirrmtry %%DATADIR%%/config
>-@dirrmtry %%DATADIR%%/glade
>-@dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 201254: 158225 | 158242 | 158291 | 158320 | 158334 | 158335 | 158395