From aad71e517492fcb9add12a8d0fa1510f2070e897 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:57:20 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 2acaa44..cae1f84 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 33%{?dist} +Release: 34%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -52,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.46-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.46-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 818b59ce508104bb8a3b220279eebbe94dba1f16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:48:34 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index cae1f84..8d12f38 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 34%{?dist} +Release: 35%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -52,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.46-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.46-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 522599ce43bd477261a1190b46e93a6b0f15a3c6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 3 Feb 2024 09:17:21 -0500 Subject: [PATCH 3/9] fix cast issues causing FTBFS --- xkeycaps-2.46-fix-casts.patch | 30 ++++++++++++++++++++++++++++++ xkeycaps.spec | 11 ++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 xkeycaps-2.46-fix-casts.patch diff --git a/xkeycaps-2.46-fix-casts.patch b/xkeycaps-2.46-fix-casts.patch new file mode 100644 index 0000000..5ee6a87 --- /dev/null +++ b/xkeycaps-2.46-fix-casts.patch @@ -0,0 +1,30 @@ +diff -up xkeycaps-2.46/commands.c.fix-casts xkeycaps-2.46/commands.c +--- xkeycaps-2.46/commands.c.fix-casts 2024-02-03 09:12:14.943520207 -0500 ++++ xkeycaps-2.46/commands.c 2024-02-03 09:14:26.497197055 -0500 +@@ -1752,7 +1752,7 @@ keyset_list_cb (widget, client_data, cal + } + keysym_name_buffer [j++] = 0; + } +- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True); ++ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0, True); + } + + +@@ -2526,7 +2526,7 @@ keyboard_list_cb (widget, client_data, c + while (strcmp (keyboard_sets [i].type, keyboard_types [kbd])) + i++; + box->set = &keyboard_sets [i]; +- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True); ++ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0, True); + for (i = 0; i < box->set->map_count; i++) + { + char buf[255]; +@@ -2597,7 +2597,7 @@ vendor_list_cb (widget, client_data, cal + free (s1); + } + +- XawListChange (box->keyboard_list, list, 0, 0, True); ++ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True); + XawListHighlight (box->keyboard_list, kbd); + lr->list_index = kbd; + diff --git a/xkeycaps.spec b/xkeycaps.spec index 8d12f38..881f74e 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,14 +3,15 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 35%{?dist} +Release: 36%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop Source2: xkeycaps.png URL: http://www.jwz.org/xkeycaps/ -BuildRequires: make -BuildRequires: gcc +Patch0: xkeycaps-2.46-fix-casts.patch +BuildRequires: make +BuildRequires: gcc BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel BuildRequires: libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel BuildRequires: desktop-file-utils, libXext-devel @@ -27,6 +28,7 @@ xmodmap to recreate your changes in future sessions. %prep %setup -q +%patch -P0 -p1 -b .fix-casts %build xmkmf @@ -52,6 +54,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Feb 3 2024 Tom Callaway - 2.46-36 +- fix cast issues causing FTBFS + * Sat Jan 27 2024 Fedora Release Engineering - 2.46-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 16d90f40bdd4696d29d757384f0adc208ebec514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:09:30 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 881f74e..84fc27c 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 36%{?dist} +Release: 37%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -54,6 +54,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.46-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Feb 3 2024 Tom Callaway - 2.46-36 - fix cast issues causing FTBFS From ba3444bf5405f47994dfa1b85e2885bfca955cad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:56:24 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 84fc27c..e57a2f0 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 37%{?dist} +Release: 38%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -54,6 +54,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.46-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.46-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b634b028355221beedac3706c872b2837dc15d81 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 24 Feb 2025 16:48:27 -0500 Subject: [PATCH 6/9] revert patch to fix cast issues, looks like the dependent library behavior reverted --- xkeycaps-2.46-fix-casts.patch | 30 ------------------------------ xkeycaps.spec | 7 ++++--- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 xkeycaps-2.46-fix-casts.patch diff --git a/xkeycaps-2.46-fix-casts.patch b/xkeycaps-2.46-fix-casts.patch deleted file mode 100644 index 5ee6a87..0000000 --- a/xkeycaps-2.46-fix-casts.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up xkeycaps-2.46/commands.c.fix-casts xkeycaps-2.46/commands.c ---- xkeycaps-2.46/commands.c.fix-casts 2024-02-03 09:12:14.943520207 -0500 -+++ xkeycaps-2.46/commands.c 2024-02-03 09:14:26.497197055 -0500 -@@ -1752,7 +1752,7 @@ keyset_list_cb (widget, client_data, cal - } - keysym_name_buffer [j++] = 0; - } -- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True); -+ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0, True); - } - - -@@ -2526,7 +2526,7 @@ keyboard_list_cb (widget, client_data, c - while (strcmp (keyboard_sets [i].type, keyboard_types [kbd])) - i++; - box->set = &keyboard_sets [i]; -- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True); -+ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0, True); - for (i = 0; i < box->set->map_count; i++) - { - char buf[255]; -@@ -2597,7 +2597,7 @@ vendor_list_cb (widget, client_data, cal - free (s1); - } - -- XawListChange (box->keyboard_list, list, 0, 0, True); -+ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True); - XawListHighlight (box->keyboard_list, kbd); - lr->list_index = kbd; - diff --git a/xkeycaps.spec b/xkeycaps.spec index e57a2f0..23b4fe4 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,13 +3,12 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 38%{?dist} +Release: 39%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop Source2: xkeycaps.png URL: http://www.jwz.org/xkeycaps/ -Patch0: xkeycaps-2.46-fix-casts.patch BuildRequires: make BuildRequires: gcc BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel @@ -28,7 +27,6 @@ xmodmap to recreate your changes in future sessions. %prep %setup -q -%patch -P0 -p1 -b .fix-casts %build xmkmf @@ -54,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Mon Feb 24 2025 Tom Callaway - 2.46-39 +- revert patch to fix cast issues, looks like the dependent library behavior reverted + * Sun Jan 19 2025 Fedora Release Engineering - 2.46-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 217f06600b94b74749b203edcc96d4815dc28357 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:53:37 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 23b4fe4..87918c7 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 39%{?dist} +Release: 40%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -52,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.46-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Feb 24 2025 Tom Callaway - 2.46-39 - revert patch to fix cast issues, looks like the dependent library behavior reverted From 0faae3ccfaa8e4fcf212d01a7d87adc148e2e25c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:43:28 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 87918c7..3464209 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 40%{?dist} +Release: 41%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -52,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.46-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.46-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e7aa71ff6c2eabc87d2902a003d18168b47eb0bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:16:20 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xkeycaps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xkeycaps.spec b/xkeycaps.spec index 3464209..dab23c2 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 41%{?dist} +Release: 42%{?dist} License: MIT Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop @@ -52,6 +52,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.46-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.46-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild