diff --git a/.gitignore b/.gitignore index 7d19b61..aed7e79 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,12 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.61.tar.xz /xlockmore-5.63.tar.xz /xlockmore-5.64.tar.xz +/xlockmore-5.66.tar.xz +/xlockmore-5.67.tar.xz +/xlockmore-5.70.tar.xz +/xlockmore-5.74.tar.xz +/xlockmore-5.77.tar.xz +/xlockmore-5.81.tar.xz +/xlockmore-5.86.tar.xz +/xlockmore-5.87.tar.xz +/xlockmore-5.88.tar.xz diff --git a/sources b/sources index 8c291be..73fe2eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.64.tar.xz) = 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39 +SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3 diff --git a/xlockmore-5.64-exit.patch b/xlockmore-5.64-exit.patch deleted file mode 100644 index d336ee4..0000000 --- a/xlockmore-5.64-exit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -dup -rup xlockmore-5.64-orig/xlock/xlock.c xlockmore-5.64/xlock/xlock.c ---- xlockmore-5.64-orig/xlock/xlock.c 2020-04-03 05:22:08.000000000 +0200 -+++ xlockmore-5.64/xlock/xlock.c 2020-06-30 18:53:25.061776087 +0200 -@@ -3942,7 +3942,7 @@ both3d, (char *)DEF_BOTH3D); - (void) sigsetmask(old_sigmask); - #endif - (void) system(startCmd); -- exit(0); -+ _exit(0); - } - } - lock_delay = lockdelay; -@@ -3981,7 +3981,7 @@ both3d, (char *)DEF_BOTH3D); - cmd_pid = 0; - } else if (!cmd_pid) { - (void) system(endCmd); -- exit(0); -+ _exit(0); - } - } - diff --git a/xlockmore-ignore-void.patch b/xlockmore-ignore-void.patch new file mode 100644 index 0000000..5705837 --- /dev/null +++ b/xlockmore-ignore-void.patch @@ -0,0 +1,56 @@ +--- a/xglock/xglock.c.orig 2026-02-04 14:55:58.908881606 +0100 ++++ b/xglock/xglock.c 2026-02-04 14:56:41.293020943 +0100 +@@ -714,7 +714,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); + } + + /* +@@ -777,7 +777,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); + } + + /* +@@ -910,7 +910,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); + } + + /* +@@ -927,7 +927,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); + } + + /* +@@ -979,7 +979,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); + } + + /* +@@ -1002,7 +1002,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); + } + } + diff --git a/xlockmore.spec b/xlockmore.spec index 3dfebb1..878b3aa 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,17 +1,19 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.64 +Version: 5.88 Release: 2%{?dist} -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz -Patch9: xlockmore-5.64-exit.patch +BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: pam-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel BuildRequires: motif-devel gtk2-devel BuildRequires: libXau-devel +Patch0: xlockmore-ignore-void.patch %if 0%{?rhel} Requires: gnome-icon-theme %else @@ -37,12 +39,24 @@ GTK based frontend for xlockmore. %prep %setup -q -%patch9 -p1 +%patch -P 0 -p 1 %{__sed} -i -e "s,/lib,/%{_lib},g;s,-Wno-format,,g;" configure +# See README for X(M)LOCKLDFLAGS explanation +%{__sed} -i "/^XLOCKLDFLAGS$/d" configure +%{__sed} -i "/^XMLOCKLDFLAGS$/d" configure + %build %configure --with-crypt --enable-pam --enable-syslog --disable-setuid --disable-mb + +# Work around BZ#2341574 +sed -i 's/^CC =.*/\0 -std=c17/' xglock/Makefile + +# See README for X(M)LOCKLDFLAGS explanation +sed -i 's/@XLOCKLDFLAGS@//' modes/Makefile +sed -i 's/@XMLOCKLDFLAGS@//' xmlock/Makefile + %{__make} %{?_smp_mflags} %install @@ -102,6 +116,78 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 5.88-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Mon Feb 09 2026 Adrian Reber - 5.88-1 +- Updated to 5.88 (#2425617) + +* Wed Feb 04 2026 Adrian Reber - 5.87-2 +- Updated to 5.87 (#2435197) + +* Sat Jan 17 2026 Fedora Release Engineering - 5.86-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Dec 15 2025 Adrian Reber - 5.86-1 +- Updated to 5.86 (#2361972) + +* Fri Jul 25 2025 Fedora Release Engineering - 5.81-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Feb 19 2025 Martin Cermak - 5.81-1 +- Updated to 5.81 (#1837169) + +* Tue Feb 18 2025 Martin Cermak - 5.77-5 +- Updated for FTBFS (#2341574) + +* Sun Jan 19 2025 Fedora Release Engineering - 5.77-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 5.77-3 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 5.77-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu May 02 2024 Adrian Reber - 5.77-1 +- Updated to 5.77 (#1837169) + +* Sat Jan 27 2024 Fedora Release Engineering - 5.74-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 12 2023 Adrian Reber - 5.74-1 +- Updated to 5.74 (#1837169) + +* Sat Jul 22 2023 Fedora Release Engineering - 5.70-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 5.70-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 5.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Adrian Reber - 5.70-1 +- Updated to 5.70 (#1837169) + +* Sat Jan 22 2022 Fedora Release Engineering - 5.67-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Aug 30 2021 Adrian Reber - 5.67-1 +- Updated to 5.67 (#1837169) + +* Fri Jul 23 2021 Fedora Release Engineering - 5.66-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 5.66-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 29 2020 Adrian Reber - 5.66-1 +- Updated to 5.66 (#1837169) + +* Wed Jul 29 2020 Fedora Release Engineering - 5.64-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 30 2020 Adrian Reber - 5.64-2 - Applied patch from Jan Kratochvil (#1852546)