[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/

["Florian Schmaus" <flow@gentoo.org>]

commit:     cdfd6edf97df98e36f904b5beaf84ae7a0b21a8a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 17 07:39:05 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jul 17 07:50:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdfd6edf

x11-misc/xscreensaver: port logind-idle-hint patch, use greadme.eclass

Also improve wording a bit and fix USE=glx.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                 |  1 +
 x11-misc/xscreensaver/xscreensaver-6.12.ebuild | 46 +++++++++++++++++---------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f1355ebdacff..8e0ad4314ca1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -2,4 +2,5 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d
 DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
 DIST xscreensaver-6.09.tar.gz 22026182 BLAKE2B 34e3bf5b3affbfc6ef0aabaf9889c4b76ce27b09974d6c84a9b342b2267a3268fa1558a9bf0e0e487fce84ef218c3152fca4216268e15e40f82fef91021160da SHA512 6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653
 DIST xscreensaver-6.10.1.tar.gz 25081752 BLAKE2B 6bfeed1acbe0aee07ed64c31f8e503afd4930ef6063ca92f234ce7dc42b6b4e07d7d04b4e227f9172a63519d6376c6003c243336d139b831ebf0bb854f3657c5 SHA512 25219f670cdd18db34fc514dc68c628ac8721f88a15d5df2cecbef92ebdfaa916be40ddd171b79166fc20469c199573827dbcbeb7bfa258d48b7f1a9ca7ea07a
+DIST xscreensaver-6.12-logind-idle-hint.patch 4056 BLAKE2B 30861195aeef16f8252d2324e61674a8d77cd1c0fb62aa5128c8d1e7289edfc2ee7bc4d39e50e1dcbcfe5601b95c14868320bf257bb1c9fe96c9542bde86240a SHA512 3ebb0398266b659545831a772417772f0ba99dd8125cc1ae497eb8dfa4d98dd368a119763283464ea72cab410573b7adc32176e80d243652820b4649b1e4551d
 DIST xscreensaver-6.12.tar.gz 25177935 BLAKE2B 0e102abd2c28574110b6e1d2b8d59619430869d04c151f379654e1ee8350a93208f198f739f63507e781efd93808fbe17df0f11e5196dde6de010272272eb9fb SHA512 df98e07fe66fd6ad1fd680c6790d66a160f146ff721f90a76c46142888a0d17f82f068343b1ac82aa4562385460da393dc4733abdb26f0cda0f2a8944a614497

diff --git a/x11-misc/xscreensaver/xscreensaver-6.12.ebuild b/x11-misc/xscreensaver/xscreensaver-6.12.ebuild
index 5eed5211c1c4..57ddffcb335e 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.12.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.12.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils
+inherit autotools flag-o-matic font greadme optfeature pam strip-linguas systemd xdg-utils
 
 DESCRIPTION="Modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
 	https://www.jwz.org/xscreensaver/${PN}-${PV}.tar.gz
 	logind-idle-hint? (
-		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
-			${PN}-6.06-logind-idle-hint.patch
+		https://github.com/Flowdalic/xscreensaver/commit/e79e2f41be3367c196899ef2f38ab97436fa1a65.patch ->
+			${PN}-6.12-logind-idle-hint.patch
 	)
 	systemd? (
 		https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch ->
@@ -158,7 +158,11 @@ src_prepare() {
 	fi
 
 	if use logind-idle-hint; then
-		eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch"
+		eapply "${DISTDIR}/${PN}-6.12-logind-idle-hint.patch"
+	fi
+
+	if use glx; then
+		sed -i -e 's;OpenGL/gl.h;GL/gl.h;' driver/subprocs.c || die
 	fi
 
 	config_rpath_update "${S}"/config.rpath
@@ -261,26 +265,36 @@ src_install() {
 
 	# bug #885989
 	fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
-}
 
-pkg_postinst() {
-	use fonts && font_pkg_postinst
+	greadme_stdin <<-EOF
+	You can configure xscreensaver via 'xscreensaver-settings'.
+	EOF
 
 	# bug #811885
 	if ! use glx; then
-		elog "Enable USE='glx' if OpenGL screensavers are crashing."
+		greadme_stdin --append <<-EOF
+		Enable USE='glx' if OpenGL screensavers are crashing.
+		EOF
 	fi
 
 	if use wayland; then
-		elog "Wayland support is preliminar. It doesn't lock and you need"
-		elog "a supported compositor, like:"
-		elog ""
-		elog " *  kde-plasma/kwin"
-		elog " *  gui-wm/sway"
-		elog " *  gui-wm/hyprland"
-		elog " *  gui-wm/wayfire"
-		elog " *  gui-wm/labwc"
+		greadme_stdin --append <<-EOF
+		WARNING: Wayland support is preliminary. It does not lock and you need
+		a supported compositor, like:
+
+		 *  kde-plasma/kwin
+		 *  gui-wm/sway
+		 *  gui-wm/hyprland
+		 *  gui-wm/wayfire
+		 *  gui-wm/labwc
+		EOF
 	fi
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	greadme_pkg_postinst
 
 	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
 	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi