Compare commits

..

No commits in common. "rawhide" and "f40" have entirely different histories.

4 changed files with 3 additions and 115 deletions

5
.gitignore vendored
View file

@ -22,8 +22,3 @@ xlockmore-5.28.tar.bz2
/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

View file

@ -1 +1 @@
SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3
SHA512 (xlockmore-5.74.tar.xz) = 041d49c835281cdd0c8c92712a38595504658934729bef9604a607a3cd1ac0b243373978c0eb9ac550b73ec9da8ee1425131e835e9a4b6643881b5e163645d30

View file

@ -1,56 +0,0 @@
--- 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);
}
}

View file

@ -1,9 +1,8 @@
Summary: Screen lock and screen saver
Name: xlockmore
Version: 5.88
Version: 5.74
Release: 2%{?dist}
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
License: BSD
URL: http://sillycycle.com/xlockmore.html
Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz
BuildRequires: make
@ -13,7 +12,6 @@ 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
@ -39,24 +37,11 @@ GTK based frontend for xlockmore.
%prep
%setup -q
%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
@ -116,42 +101,6 @@ desktop-file-install \
%{_bindir}/xglock
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.88-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Mon Feb 09 2026 Adrian Reber <adrian@lisas.de> - 5.88-1
- Updated to 5.88 (#2425617)
* Wed Feb 04 2026 Adrian Reber <adrian@lisas.de> - 5.87-2
- Updated to 5.87 (#2435197)
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.86-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Dec 15 2025 Adrian Reber <adrian@lisas.de> - 5.86-1
- Updated to 5.86 (#2361972)
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.81-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Wed Feb 19 2025 Martin Cermak <mcermak@redhat.com> - 5.81-1
- Updated to 5.81 (#1837169)
* Tue Feb 18 2025 Martin Cermak <mcermak@redhat.com> - 5.77-5
- Updated for FTBFS (#2341574)
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.77-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 5.77-3
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.77-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu May 02 2024 Adrian Reber <adrian@lisas.de> - 5.77-1
- Updated to 5.77 (#1837169)
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild