Compare commits

..

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

2 changed files with 33 additions and 19 deletions

View file

@ -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;

View file

@ -3,12 +3,13 @@
Name: xkeycaps
Summary: Graphical front end to xmodmap
Version: 2.46
Release: 42%{?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/
Patch0: xkeycaps-2.46-fix-casts.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-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,24 +54,6 @@ desktop-file-install \
%{_mandir}/man1/*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.46-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.46-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.46-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Feb 24 2025 Tom Callaway <spot@fedoraproject.org> - 2.46-39
- revert patch to fix cast issues, looks like the dependent library behavior reverted
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.46-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.46-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Feb 3 2024 Tom Callaway <spot@fedoraproject.org> - 2.46-36
- fix cast issues causing FTBFS