update to xscreensaver-5.45

This commit is contained in:
sthen 2021-01-10 21:32:12 +00:00
parent 443a8d633f
commit f9cace1fe6
5 changed files with 57 additions and 60 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.107 2020/12/11 16:24:59 rsadowski Exp $
# $OpenBSD: Makefile,v 1.108 2021/01/10 21:32:12 sthen Exp $
COMMENT= screen saver and locker for the X Window System
COMMENT= screen saver and locker for the X Window System
DISTNAME= xscreensaver-5.44
REVISION= 0
DISTNAME= xscreensaver-5.45
CATEGORIES= x11
CATEGORIES= x11
HOMEPAGE= https://www.jwz.org/xscreensaver/
HOMEPAGE= https://www.jwz.org/xscreensaver/
# BSD
PERMIT_PACKAGE= Yes
@ -15,42 +14,40 @@ 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 += gdk_pixbuf_xlib-2.0 gio-2.0 glade-2.0 gle glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz intl jpeg
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread util
WANTLIB += xml2 z
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
MASTER_SITES= ${HOMEPAGE}
MASTER_SITES= ${HOMEPAGE}
COMPILER= base-clang ports-gcc
COMPILER= base-clang ports-gcc
MODULES= textproc/intltool
MODULES= textproc/intltool
RUN_DEPENDS= devel/desktop-file-utils
RUN_DEPENDS= devel/desktop-file-utils
LIB_DEPENDS= devel/libglade2 \
graphics/gdk-pixbuf-xlib \
graphics/gle
LIB_DEPENDS= graphics/gdk-pixbuf-xlib \
graphics/gle \
x11/gtk+2
# ${FILESDIR}/migrate-xscreensaver-config.sh needs xsltproc
BUILD_DEPENDS += textproc/libxslt
BUILD_DEPENDS+= textproc/libxslt
# see pre-configure
BUILD_DEPENDS += devel/xdg-utils
RUN_DEPENDS += devel/xdg-utils
BUILD_DEPENDS+= devel/xdg-utils
RUN_DEPENDS+= devel/xdg-utils
USE_GMAKE= Yes
NO_TEST= Yes
USE_GMAKE= Yes
NO_TEST= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
--with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \
--without-pam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
--with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \
--without-pam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS= install_prefix=${WRKINST}
FAKE_FLAGS= install_prefix=${WRKINST}
pre-configure:
sed -i 's,gnome-open,xdg-open,g' ${WRKSRC}/configure
@ -71,5 +68,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/hacks/config/*.desktop \
${PREFIX}/share/applications/screensavers/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (xscreensaver-5.44.tar.gz) = c9gInPx9c2O12smbWwHf+zQp0KhV5q8WzppLd3cBe5U=
SIZE (xscreensaver-5.44.tar.gz) = 27001826
SHA256 (xscreensaver-5.45.tar.gz) = cBbfZza6ASamjB81q89BGmlf6TvAGhjr2d9Gyan01Q0=
SIZE (xscreensaver-5.45.tar.gz) = 27729147

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-configure_in,v 1.6 2019/07/03 16:15:28 sthen Exp $
Unbreak the build with ports-gcc and --std=c89
Index: configure.in
--- configure.in.orig
+++ configure.in
@@ -1236,7 +1236,6 @@ AC_PROG_CC_ANSI
AC_NO_LONG_STRING_WARNINGS
AC_NO_MISPLACED_DECLARATIONS
AC_NO_OBJECTIVE_C
-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
AC_PROG_CPP
AC_C_CONST
AC_C_INLINE

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-hacks_glx_crumbler_c,v 1.1 2018/08/13 18:53:50 sthen Exp $
$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
@ -11,5 +11,5 @@ Index: hacks/glx/crumbler.c
+ density *= 0.5;
+#endif
# ifdef HAVE_MOBILE
# ifdef USE_IPHONE
# ifdef HAVE_IPHONE
density *= 0.5; /* iPhone 6s runs out of memory at 4500 nverts. */

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.49 2020/03/21 21:07:02 sthen Exp $
@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
@ -16,7 +16,6 @@ bin/xscreensaver-getimage-file
bin/xscreensaver-getimage-video
@bin bin/xscreensaver-gl-helper
bin/xscreensaver-text
lib/X11/app-defaults/XScreenSaver
libexec/xscreensaver/
@bin libexec/xscreensaver/abstractile
@bin libexec/xscreensaver/anemone
@ -30,6 +29,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/attraction
@bin libexec/xscreensaver/atunnel
@bin libexec/xscreensaver/barcode
@bin libexec/xscreensaver/beats
@bin libexec/xscreensaver/binaryring
@bin libexec/xscreensaver/blaster
@bin libexec/xscreensaver/blinkbox
@ -54,6 +54,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/companioncube
@bin libexec/xscreensaver/compass
@bin libexec/xscreensaver/coral
@bin libexec/xscreensaver/covid19
@bin libexec/xscreensaver/crackberg
@bin libexec/xscreensaver/crumbler
@bin libexec/xscreensaver/crystal
@ -124,6 +125,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/halftone
@bin libexec/xscreensaver/halo
@bin libexec/xscreensaver/handsy
@bin libexec/xscreensaver/headroom
@bin libexec/xscreensaver/helix
@bin libexec/xscreensaver/hexadrop
@bin libexec/xscreensaver/hexstrut
@ -212,6 +214,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/slip
@bin libexec/xscreensaver/sonar
@bin libexec/xscreensaver/speedmine
@bin libexec/xscreensaver/sphereeversion
@bin libexec/xscreensaver/spheremonics
@bin libexec/xscreensaver/splitflap
@bin libexec/xscreensaver/splodesic
@ -277,6 +280,7 @@ libexec/xscreensaver/webcollage
@man man/man6/attraction.6
@man man/man6/atunnel.6
@man man/man6/barcode.6
@man man/man6/beats.6
@man man/man6/binaryring.6
@man man/man6/blaster.6
@man man/man6/blinkbox.6
@ -300,6 +304,7 @@ libexec/xscreensaver/webcollage
@man man/man6/companioncube.6
@man man/man6/compass.6
@man man/man6/coral.6
@man man/man6/covid19.6
@man man/man6/crackberg.6
@man man/man6/crumbler.6
@man man/man6/crystal.6
@ -369,6 +374,7 @@ libexec/xscreensaver/webcollage
@man man/man6/halftone.6
@man man/man6/halo.6
@man man/man6/handsy.6
@man man/man6/headroom.6
@man man/man6/helix.6
@man man/man6/hexadrop.6
@man man/man6/hexstrut.6
@ -455,6 +461,7 @@ libexec/xscreensaver/webcollage
@man man/man6/slip.6
@man man/man6/sonar.6
@man man/man6/speedmine.6
@man man/man6/sphereeversion.6
@man man/man6/spheremonics.6
@man man/man6/splitflap.6
@man man/man6/splodesic.6
@ -516,6 +523,7 @@ share/applications/screensavers/atlantis.desktop
share/applications/screensavers/attraction.desktop
share/applications/screensavers/atunnel.desktop
share/applications/screensavers/barcode.desktop
share/applications/screensavers/beats.desktop
share/applications/screensavers/binaryring.desktop
share/applications/screensavers/blaster.desktop
share/applications/screensavers/blinkbox.desktop
@ -538,9 +546,11 @@ share/applications/screensavers/celtic.desktop
share/applications/screensavers/circuit.desktop
share/applications/screensavers/cityflow.desktop
share/applications/screensavers/cloudlife.desktop
share/applications/screensavers/co____9.desktop
share/applications/screensavers/companioncube.desktop
share/applications/screensavers/compass.desktop
share/applications/screensavers/coral.desktop
share/applications/screensavers/covid19.desktop
share/applications/screensavers/crackberg.desktop
share/applications/screensavers/critical.desktop
share/applications/screensavers/crumbler.desktop
@ -616,6 +626,7 @@ share/applications/screensavers/greynetic.desktop
share/applications/screensavers/halftone.desktop
share/applications/screensavers/halo.desktop
share/applications/screensavers/handsy.desktop
share/applications/screensavers/headroom.desktop
share/applications/screensavers/helix.desktop
share/applications/screensavers/hexadrop.desktop
share/applications/screensavers/hexstrut.desktop
@ -715,6 +726,7 @@ share/applications/screensavers/slip.desktop
share/applications/screensavers/sonar.desktop
share/applications/screensavers/speedmine.desktop
share/applications/screensavers/sphere.desktop
share/applications/screensavers/sphereeversion.desktop
share/applications/screensavers/spheremonics.desktop
share/applications/screensavers/spiral.desktop
share/applications/screensavers/splitflap.desktop
@ -805,6 +817,7 @@ share/xscreensaver/config/atlantis.xml
share/xscreensaver/config/attraction.xml
share/xscreensaver/config/atunnel.xml
share/xscreensaver/config/barcode.xml
share/xscreensaver/config/beats.xml
share/xscreensaver/config/binaryring.xml
share/xscreensaver/config/blaster.xml
share/xscreensaver/config/blinkbox.xml
@ -829,6 +842,7 @@ share/xscreensaver/config/cloudlife.xml
share/xscreensaver/config/companioncube.xml
share/xscreensaver/config/compass.xml
share/xscreensaver/config/coral.xml
share/xscreensaver/config/covid19.xml
share/xscreensaver/config/crackberg.xml
share/xscreensaver/config/crumbler.xml
share/xscreensaver/config/crystal.xml
@ -899,6 +913,7 @@ share/xscreensaver/config/greynetic.xml
share/xscreensaver/config/halftone.xml
share/xscreensaver/config/halo.xml
share/xscreensaver/config/handsy.xml
share/xscreensaver/config/headroom.xml
share/xscreensaver/config/helix.xml
share/xscreensaver/config/hexadrop.xml
share/xscreensaver/config/hexstrut.xml
@ -986,6 +1001,7 @@ share/xscreensaver/config/slidescreen.xml
share/xscreensaver/config/slip.xml
share/xscreensaver/config/sonar.xml
share/xscreensaver/config/speedmine.xml
share/xscreensaver/config/sphereeversion.xml
share/xscreensaver/config/spheremonics.xml
share/xscreensaver/config/splitflap.xml
share/xscreensaver/config/splodesic.xml
@ -1030,12 +1046,12 @@ share/xscreensaver/config/xmatrix.xml
share/xscreensaver/config/xrayswarm.xml
share/xscreensaver/config/xspirograph.xml
share/xscreensaver/config/zoom.xml
share/xscreensaver/glade/
share/xscreensaver/glade/screensaver-cmndln.png
share/xscreensaver/glade/screensaver-colorselector.png
share/xscreensaver/glade/screensaver-diagnostic.png
share/xscreensaver/glade/screensaver-locking.png
share/xscreensaver/glade/screensaver-power.png
share/xscreensaver/glade/screensaver-snap.png
share/xscreensaver/glade/xscreensaver-demo.glade2
share/xscreensaver/ui/
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-demo.ui
@tag update-desktop-database