Date: Thu, 24 Nov 2022 12:52:41 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 163c60305063 - main - x11/xscreensaver: Update to 6.05 Message-ID: <202211241252.2AOCqfFq024978@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=163c6030506313e42ca8f1e967e5e88489bd8a1b commit 163c6030506313e42ca8f1e967e5e88489bd8a1b Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2022-11-21 12:31:35 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2022-11-24 12:52:06 +0000 x11/xscreensaver: Update to 6.05 Changelog: - 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. Approved by: x11 (manu, maintainer), cy, tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37461 --- x11/xscreensaver/Makefile | 6 +++--- x11/xscreensaver/distinfo | 6 +++--- x11/xscreensaver/files/patch-config.h.in | 12 ------------ x11/xscreensaver/files/patch-configure.ac | 13 +++++++++++-- .../files/patch-hacks__config__sonar.xml | 20 -------------------- x11/xscreensaver/pkg-plist | 7 ------- 6 files changed, 17 insertions(+), 47 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index cc38b9dc790c..acaa9bd41b1d 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,8 +1,8 @@ PORTNAME= xscreensaver -PORTVERSION= 6.04 -PORTREVISION= 1 +DISTVERSION= 6.05 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ +EXTRACT_SUFX= .1.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Save your screen while you entertain your cat @@ -22,7 +22,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags \ perl5 pkgconfig xorg USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 gdkpixbuf2xlib gtk20 intltool libglade2 libxml2 +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 USE_PERL5= run USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm CPE_VENDOR= xscreensaver_project diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 31f6542aa743..705de1aee22f 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655112914 -SHA256 (xscreensaver-6.04.tar.gz) = 787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152 -SIZE (xscreensaver-6.04.tar.gz) = 26112437 +TIMESTAMP = 1669032437 +SHA256 (xscreensaver-6.05.1.tar.gz) = 2da512b201cacc85c496f602e73947da4e89bfb5bb67a74e65e052fd5e677b3a +SIZE (xscreensaver-6.05.1.tar.gz) = 26110057 diff --git a/x11/xscreensaver/files/patch-config.h.in b/x11/xscreensaver/files/patch-config.h.in deleted file mode 100644 index e8ece901c93d..000000000000 --- a/x11/xscreensaver/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2022-02-20 19:12:54 UTC -+++ config.h.in -@@ -311,6 +311,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 XF86VidModeGetViewPort, for virtual desktops. */ - #undef HAVE_XF86VMODE - diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac index e685985492fe..d7a6115c6f7e 100644 --- a/x11/xscreensaver/files/patch-configure.ac +++ b/x11/xscreensaver/files/patch-configure.ac @@ -1,6 +1,15 @@ ---- configure.ac.orig 2022-02-20 21:05:40 UTC +--- configure.ac.orig 2022-09-02 16:10:15 UTC +++ configure.ac -@@ -3986,7 +3986,7 @@ fi +@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then + + GTK_DATADIR="" + if test "$have_gtk" = yes; then +- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` ++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` + GTK_DATADIR="$GTK_DATADIR/share" + fi + +@@ -4031,7 +4031,7 @@ fi ############################################################################### PTY_LIBS= diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml deleted file mode 100644 index 59842a528bb4..000000000000 --- a/x11/xscreensaver/files/patch-hacks__config__sonar.xml +++ /dev/null @@ -1,20 +0,0 @@ ---- hacks/config/sonar.xml.orig 2016-04-08 02:15:38 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"/> - -- <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,linux.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/> -+ <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,freebsd.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/> - - <option id="sim" _label="Simulation (don't ping)" arg-set="-ping simulation"/> - </select> -@@ -78,6 +78,8 @@ respectively. - - Alternately, it can run a simulation that doesn't involve hosts. - -+To ping, use the port build option to install this suid. -+ - https://en.wikipedia.org/wiki/Ping#History - - Written by Jamie Zawinski and Stephen Martin; 1998. diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index f3982b76e38f..365e4dc6a9d1 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -552,7 +552,6 @@ share/fonts/xscreensaver/luximr.ttf %%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo share/pixmaps/xscreensaver.png %%DATADIR%%/config/README -%%DATADIR%%/ui/xscreensaver.ui %%DATADIR%%/config/abstractile.xml %%DATADIR%%/config/anemone.xml %%DATADIR%%/config/anemotaxis.xml @@ -807,9 +806,3 @@ share/pixmaps/xscreensaver.png %%DATADIR%%/config/xspirograph.xml %%DATADIR%%/config/zoom.xml %%DATADIR%%/xscreensaver.service -%%DATADIR%%/ui/screensaver-cmndln.png -%%DATADIR%%/ui/screensaver-colorselector.png -%%DATADIR%%/ui/screensaver-diagnostic.png -%%DATADIR%%/ui/screensaver-locking.png -%%DATADIR%%/ui/screensaver-power.png -%%DATADIR%%/ui/screensaver-snap.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211241252.2AOCqfFq024978>