x11-misc/xlockmore: bump to 5.89

2026-10-05 21:00:36 +02:00 · 2026-09-23 12:13:28 +02:00
1 parent c751c73798
commit 1694175499
@@ -3,5 +3,8 @@ AUX xlockmore-5.71-fix-build-for-clang16.patch 1243 BLAKE2B 23ab604a955f36464c96
 AUX xlockmore-5.88-CXX.patch 696 BLAKE2B ebbcde5c74791e91f9808339059aa4300652da9d92dc47f004b03aef671b7e29cf619df2cd3f9041cc1b2795ef5bd14020d5d680ef3e32d35276b725f9bbf8aa SHA512 1fba52c43c4b30e494112e6d5b0dec8df0d6826e05472e9fde6ed76d67fc3465c35b882ed6e94c4fcecfb4730aeecca222da2de3d253482eb009fb4fa0756b55
 AUX xlockmore-5.88-gcc15.patch 2320 BLAKE2B c4ba43c6ab8fae81af402154cf24bf58230ce7bfd270ea7833814bfa590f7987423f3add59a6d0bbeda919368141178248f76005c2b78024f2c0684a1301ea0e SHA512 bb99c3b6b6ccebd410d44a75e93e4ef18528ee3a940789229382124f3b1b4d2cbd20ccb39991b13a993c4de3c249c3fc8602ba1f68bc4a87f5bef1fb3d25fa0d
 AUX xlockmore-5.88-strip.patch 2141 BLAKE2B 0a6a55938f8361eb1fa8f06c3b315c00e1ccd1c62186785e6e81c08082bf645c6d8b4e9617e1ba6411168f3f61a71da28e38f8a872c746dad93ce57e663ce1e2 SHA512 2b2c131557c7f454bb6c2bc8e00b5d53fd7459e09934a7bf9e45d0116224b684989d140cba005f5ac9f22f12270648831c3cbbae48b6e7b0014e9cb536fb319d
+AUX xlockmore-5.89-fix-unused-cast.patch 1797 BLAKE2B d5b56071529e9427d7115f1738518142e16afaeb31b29de9dafb5f1b354edcb2979f49b12c87a58e1db3ae5931c63a8bb1b67eb51901ce1eb3e9f8e594a2d6d7 SHA512 c41c8b7ab4cde1e6e4b05e8eae92f0c9ca7897c5c60399327261d69c75d7387c1f429f0a0b86a5452c5d18d85934dd60c2d46c22cc4cea165a1a961a9f256dae
 DIST xlockmore-5.88.tar.xz 2090620 BLAKE2B 7696956e113075ab4eb406160fbf5a3d70d0803d806b127cefe15bf1863a5e470a0ea3505a85011a7754c6179c718f23a02514ccb3c3440631612103d599f82f SHA512 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3
+DIST xlockmore-5.89.tar.xz 2090056 BLAKE2B ff3591db4c4e8e5e6487eed2bf6e5566e911371b8d61de6f4c85b21e6f63e63bdb8a16d73a9d7e36a4473e156c0be6f7437566d8e418f870b1c313dd1603b346 SHA512 4f0a52decf458edd9a49984aa811a08cbcd1f85f68e2200c342d7055e6c7cf7e4db9ae05911cd2beba0775a3d5c202808ff598fbb3104a0f26e4a14775ab5248
 EBUILD xlockmore-5.88.ebuild 2594 BLAKE2B 0b8bcbd9abba35367ca546b36b79ca5a415604767076b024395609bf098f3db3ae5dc12cb1f7b86e563930ca9cef1762f29c6a64deae8563d08af29b769e6bbd SHA512 792db469102dde81e4f93cabadb5bbc2b3157cdead9fa5a95db3790b9f36acb3362eb2444c0f65825a8320ad3eb52d4bae2ad165b88751d0f1c5ac2e2df6faf8
+EBUILD xlockmore-5.89.ebuild 2604 BLAKE2B 92a6809d0db09508f9b69b6dacbde046236e524cd984d853670578bc803e6d4730b5b1242fd38b1ba44949fcd0fa49a2f0f77515add2d92a7eb133545a0666f7 SHA512 70860796cca7502ce60b4d8a0bf9d707e1376fefee1518096458d11c4db1ec85b79a8d2e8ab5ab6c4b6db924c57fde4089a7d859ae122b149a084a6497836bfe
@@ -0,0 +1,57 @@
+diff '--color=auto' -ur xlockmore-5.89_orig/xglock/xglock.c xlockmore-5.89/xglock/xglock.c
+--- xlockmore-5.89_orig/xglock/xglock.c	2026-06-30 04:04:54.000000000 +0200
+++ xlockmore-5.89/xglock/xglock.c	2026-09-23 11:44:19.856152158 +0200
+@@ -666,7 +666,7 @@
+     struct_option_fntcol_callback *cbs_ptr =(struct_option_fntcol_callback *)udata;
+     gtk_widget_hide(cbs_ptr->fntcol_dialog);
+     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
+-    (void) g_free(udata);
+    g_free(udata);
+ }
+ 
+ /*
+@@ -729,7 +729,7 @@
+     gtk_entry_set_text( GTK_ENTRY(cbs_ptr->entry), colorstr );
+     gtk_widget_hide( cbs_ptr->fntcol_dialog );
+     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
+-    (void) g_free(udata);
+    g_free(udata);
+ }
+ 
+ /*
+@@ -862,7 +862,7 @@
+     struct_option_fntcol_callback *cbs_ptr = (struct_option_fntcol_callback *)udata;
+     gtk_widget_hide(cbs_ptr->fntcol_dialog);
+     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
+-    (void) g_free(udata);
+    g_free(udata);
+ }
+ 
+ /*
+@@ -879,7 +879,7 @@
+     gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry),
+                        gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(cbs_ptr->fntcol_dialog)));
+     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
+-    (void) g_free(udata);
+    g_free(udata);
+ }
+ 
+ /*
+@@ -931,7 +931,7 @@
+     struct_option_fntcol_callback *cbs_ptr= (struct_option_fntcol_callback *)udata;
+     gtk_widget_hide( cbs_ptr->fntcol_dialog );
+     gtk_widget_destroy( cbs_ptr->fntcol_dialog );
+-    (void) g_free(udata);
+    g_free(udata);
+ }
+ 
+ /*
+@@ -954,7 +954,7 @@
+         gtk_widget_hide(cbs_ptr->fntcol_dialog);
+         gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), filename);
+         gtk_widget_destroy(cbs_ptr->fntcol_dialog);
+-        (void) g_free(udata);
+        g_free(udata);
+     }
+ }
+ 
@@ -0,0 +1,126 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+S="${WORKDIR}/${P/_alpha/ALPHA}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="athena crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch
+	"${FILESDIR}"/${PN}-5.88-CXX.patch
+	"${FILESDIR}"/${PN}-5.88-strip.patch
+	"${FILESDIR}"/${PN}-5.89-fix-unused-cast.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# #864761
+	filter-lto
+
+	local myconf=()
+
+	if use opengl && use truetype; then
+		append-cppflags -DFTGL213
+
+		myconf=( --with-ftgl )
+	else
+		myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with athena)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	if use pam; then
+		pamd_mimic_system xlock auth
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}