Compare commits
No commits in common. "rawhide" and "f30" have entirely different histories.
4 changed files with 5 additions and 93 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -4,4 +4,3 @@ xvkbd-3.2.tar.gz
|
|||
/xvkbd-3.6.tar.gz
|
||||
/xvkbd-3.7.tar.gz
|
||||
/xvkbd-3.9.tar.gz
|
||||
/xvkbd-4.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (xvkbd-4.1.tar.gz) = 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9
|
||||
SHA512 (xvkbd-3.9.tar.gz) = f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
Fixes this issue when building with -fno-common, which is the default
|
||||
starting with GCC 10:
|
||||
|
||||
/usr/bin/ld: findwidget.o:/builddir/build/BUILD/xvkbd-3.9/resources.h:108: multiple definition of `appres'; xvkbd.o:/builddir/build/BUILD/xvkbd-3.9/resources.h:108: first defined here
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
--- a/resources.h 2018-02-24 00:12:28.000000000 -0700
|
||||
+++ b/resources.h 2020-02-07 08:28:45.858695416 -0700
|
||||
@@ -105,8 +105,9 @@ struct appres_struct {
|
||||
int key_click_pitch;
|
||||
int key_click_duration;
|
||||
int autoclick_delay;
|
||||
-} appres;
|
||||
+};
|
||||
|
||||
+extern struct appres_struct appres;
|
||||
|
||||
/* FindWidget() is defined in findwidget.c */
|
||||
extern Window FindWidget(Widget w, Window client, const char *name);
|
||||
--- a/xvkbd.c 2018-02-24 17:55:33.000000000 -0700
|
||||
+++ b/xvkbd.c 2020-02-07 08:29:38.323821686 -0700
|
||||
@@ -444,6 +444,8 @@ static XrmOptionDescRec options[] = {
|
||||
/*
|
||||
* Global variables
|
||||
*/
|
||||
+struct appres_struct appres;
|
||||
+
|
||||
static char dict_filename[PATH_MAX] = "";
|
||||
|
||||
static int argc1;
|
||||
65
xvkbd.spec
65
xvkbd.spec
|
|
@ -1,15 +1,13 @@
|
|||
Name: xvkbd
|
||||
Version: 4.1
|
||||
Release: 15%{?dist}
|
||||
Version: 3.9
|
||||
Release: 4%{?dist}
|
||||
Summary: Virtual Keyboard for X Window System
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
URL: http://t-sato.in.coocan.jp/xvkbd
|
||||
Source0: %{url}/%{name}-%{version}.tar.gz
|
||||
Source1: %{name}.desktop
|
||||
# The following icon is licensed under CC BY-SA 3.0.
|
||||
Source2: http://download.sourceforge.jp/xvkbd-fedora/45742/%{name}.png
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: imake
|
||||
|
|
@ -27,7 +25,7 @@ terminals or hand-held devices. This program also has facility to send
|
|||
characters specified as the command line option to another client.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
sed -i 's|<X11/Xaw|<X11/Xaw3d|g' xvkbd.c
|
||||
|
||||
%build
|
||||
|
|
@ -54,63 +52,8 @@ install -pDm644 %{S:2} %{buildroot}%{_datadir}/pixmaps
|
|||
%{_datadir}/X11/app-defaults/XVkbd*
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/X11/words.english
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.1-11
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2020 Raphael Groner <raphgro@fedoraproject.org> - 4.1-1
|
||||
- bump to v4.1
|
||||
|
||||
* Fri Feb 7 2020 Jerry James <loganjerry@gmail.com> - 3.9-6
|
||||
- Add patch to fix build with -fno-common
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue