Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/xkeyboard-config-2.28.tar.bz2
|
||||
/xkeyboard-config-*.tar.xz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
f521cd49ab04f54778779dddc68e1771de2e8fbb SOURCES/xkeyboard-config-2.28.tar.bz2
|
||||
@ -0,0 +1,56 @@
|
||||
From 25fae9378d893ecf13f1054f8efa324fe2c3781a Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue, 20 Apr 2021 17:39:50 +1000
|
||||
Subject: [PATCH xkeyboard-config] meson.build: add option to install the
|
||||
legacy xorg symlinks
|
||||
|
||||
console-setup still relies on the xorg ruleset [1] and there may be other tools
|
||||
out there. Let's provide an equivalent option to our autotools build to
|
||||
install the xorg symlinks.
|
||||
|
||||
Note that unlike the autotools approach, only the "xorg" symlinks are
|
||||
provided, not the well and truly legacy "xfree86" ones.
|
||||
|
||||
[1] https://salsa.debian.org/installer-team/console-setup/-/merge_requests/7/
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
meson_options.txt | 4 ++++
|
||||
rules/meson.build | 7 +++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 1bee74b..912d21d 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -6,3 +6,7 @@ option('compat-rules',
|
||||
type: 'boolean',
|
||||
value: true,
|
||||
description: 'create compatibility rules [default=true]')
|
||||
+option('xorg-rules-symlinks',
|
||||
+ type: 'boolean',
|
||||
+ value: true,
|
||||
+ description: 'create "xorg" symlinks to the "base" rules files [default=false]')
|
||||
diff --git a/rules/meson.build b/rules/meson.build
|
||||
index c992f2e..7280560 100644
|
||||
--- a/rules/meson.build
|
||||
+++ b/rules/meson.build
|
||||
@@ -164,8 +164,15 @@ foreach ruleset: ['base', 'evdev']
|
||||
output: lst_file,
|
||||
install: true,
|
||||
install_dir: dir_xkb_rules)
|
||||
+
|
||||
endforeach
|
||||
|
||||
+if get_option('xorg-rules-symlinks')
|
||||
+ foreach suffix: ['', '.lst', '.xml']
|
||||
+ meson.add_install_script('sh', '-c',
|
||||
+ 'ln -s base@0@ $DESTDIR@1@/xorg@0@'.format(suffix, dir_xkb_rules))
|
||||
+ endforeach
|
||||
+endif
|
||||
# Copy the DTD to the build directory, the man page generation expects it in
|
||||
# the same directory as the input XML file.
|
||||
configure_file(output: 'xkb.dtd',
|
||||
--
|
||||
2.31.1
|
||||
|
||||
50
0001-rules-add-a-custom-layout-to-the-XML-file.patch
Normal file
50
0001-rules-add-a-custom-layout-to-the-XML-file.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 0c371033f1c18123701860803dd6039ea260ab20 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed, 17 Feb 2021 12:42:49 +1000
|
||||
Subject: [PATCH xkeyboard-config] rules: add a "custom" layout to the XML file
|
||||
|
||||
This layout does not exist and we will never provide it.
|
||||
|
||||
However, having it in the XML file means it will show up in GUI
|
||||
configuration mechansism that parse the XML file directly (instead of using
|
||||
libxbkcommon's libxkbregistry).
|
||||
|
||||
Our rulesets fall back to the file "symbols/layout", section "variant"
|
||||
for any layout(variant) that's not explicitly covered. This enables users to
|
||||
create a symbols/custom file with their layout and have it
|
||||
available.
|
||||
|
||||
As there are no variants, the GUI tools will only be able to use the default
|
||||
section. Commandline tools can use variants as well.
|
||||
|
||||
This is papering over the whole issue only, but it does provide for some
|
||||
convenience. It will still require adding a file in /usr/share in most cases,
|
||||
but since we do not provide this file, it will be safe from being overwritten.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
rules/base.xml | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/rules/base.xml b/rules/base.xml
|
||||
index 882278a..e291361 100644
|
||||
--- a/rules/base.xml
|
||||
+++ b/rules/base.xml
|
||||
@@ -6321,6 +6321,14 @@
|
||||
</variant>
|
||||
</variantList>
|
||||
</layout>
|
||||
+ <layout>
|
||||
+ <configItem>
|
||||
+ <name>custom</name>
|
||||
+ <shortDescription>custom</shortDescription>
|
||||
+ <description>A user-defined custom Layout</description>
|
||||
+ </configItem>
|
||||
+ <variantList/>
|
||||
+ </layout>
|
||||
</layoutList>
|
||||
<optionList>
|
||||
<group allowMultipleSelection="true">
|
||||
--
|
||||
2.29.2
|
||||
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
18
make-git-snapshot.sh
Executable file
18
make-git-snapshot.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
MODULE=xkeyboard-config
|
||||
DIRNAME=$MODULE-$( date +%Y%m%d )
|
||||
|
||||
rm -rf $DIRNAME
|
||||
git clone git://git.freedesktop.org/git/$MODULE $DIRNAME
|
||||
cd $DIRNAME
|
||||
if [ -z "$1" ]; then
|
||||
git log | head -1
|
||||
else
|
||||
git checkout $1
|
||||
fi
|
||||
git log | head -1 | awk '{ print $2 }' > ../commitid
|
||||
git repack -a -d
|
||||
cd ..
|
||||
tar jcf $DIRNAME.tar.bz2 $DIRNAME
|
||||
rm -rf $DIRNAME
|
||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (xkeyboard-config-2.41.tar.xz) = 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
|
||||
@ -6,9 +6,9 @@
|
||||
|
||||
Summary: X Keyboard Extension configuration data
|
||||
Name: xkeyboard-config
|
||||
Version: 2.28
|
||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
License: MIT
|
||||
Version: 2.41
|
||||
Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||
License: HPND AND HPND-sell-variant AND X11 AND X11-distribute-modifications-variant AND MIT AND MIT-open-group AND xkeyboard-config-Zinoviev
|
||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||
|
||||
%if 0%{?gitdate}
|
||||
@ -16,13 +16,13 @@ Source0: %{name}-%{gitdate}.tar.bz2
|
||||
Source1: make-git-snapshot.sh
|
||||
Source2: commitid
|
||||
%else
|
||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
|
||||
%endif
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: gettext gettext-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: meson
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: perl(XML::Parser)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
@ -30,11 +30,7 @@ BuildRequires: pkgconfig(x11) >= 1.4.3
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.12
|
||||
BuildRequires: pkgconfig(xproto) >= 7.0.20
|
||||
BuildRequires: xkbcomp
|
||||
BuildRequires: git
|
||||
|
||||
%if 0%{?gitdate}
|
||||
BuildRequires: git-core
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package contains configuration data used by the X Keyboard Extension (XKB),
|
||||
@ -52,16 +48,11 @@ Development files for %{name}.
|
||||
%autosetup -S git
|
||||
|
||||
%build
|
||||
autoreconf -v --force --install || exit 1
|
||||
%configure \
|
||||
--enable-compat-rules \
|
||||
--with-xkb-base=%{_datadir}/X11/xkb \
|
||||
--with-xkb-rules-symlink=xorg
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%meson -Dcompat-rules=true -Dxorg-rules-symlinks=true
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
%meson_install
|
||||
|
||||
# Remove unnecessary symlink
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
||||
@ -77,18 +68,129 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
||||
}
|
||||
|
||||
%files -f files.list -f %{name}.lang
|
||||
%doc AUTHORS README NEWS TODO COPYING docs/README.* docs/HOWTO.*
|
||||
%doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.*
|
||||
%{_mandir}/man7/xkeyboard-config.*
|
||||
%{_datadir}/X11/xkb/rules/xorg
|
||||
%{_datadir}/X11/xkb/rules/xorg.lst
|
||||
%{_datadir}/X11/xkb/rules/xorg.xml
|
||||
%{_mandir}/man7/xkeyboard-config.*
|
||||
|
||||
%files devel
|
||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
|
||||
- xkeyboard-config 2.28 (#1728817)
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.41-3
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.41-2
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Wed Feb 07 2024 Peter Hutterer <peter.hutterer@redhat.com> - 2.41-1
|
||||
- xkeyboard-config 2.41
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.40-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Nov 29 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.40-2
|
||||
- SPDX migration
|
||||
|
||||
* Fri Oct 13 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.40-1
|
||||
- xkeyboard-config 2.40
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.39-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jun 12 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.39-1
|
||||
- xkeyboard-config 2.39
|
||||
|
||||
* Tue Feb 07 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.38-1
|
||||
- xkeyboard-config 2.38
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Nov 26 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 2.36-3
|
||||
- Backport upstream MR to allow Apple MacBook keyboards to type \ properly
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jun 16 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.36-1
|
||||
- xkeyboard-config 2.36
|
||||
|
||||
* Wed Feb 09 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.35.1-1
|
||||
- xkeyboard-config 2.35.1
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.34-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Oct 07 2021 Peter Hutterer <peter.hutterer@redhat.com> - 2.34-1
|
||||
- xkeyboard-config 2.34
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.33-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jun 22 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.33-3
|
||||
- xkeyboard-config 2.33
|
||||
|
||||
* Tue Apr 20 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-3
|
||||
- Restore the xorg ruleset, console-setup and possibly others are still
|
||||
using those (#1951459)
|
||||
|
||||
* Fri Apr 09 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-2
|
||||
- Allow for a "custom" layout
|
||||
|
||||
* Tue Feb 16 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-1
|
||||
- xkeyboard-config 2.32
|
||||
- build with meson now
|
||||
- drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev
|
||||
these days.
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Dec 01 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-3
|
||||
- Add make to BuildRequires
|
||||
|
||||
* Wed Nov 04 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-2
|
||||
- Fix BuildRequires for git, we only need git-core
|
||||
|
||||
* Wed Oct 07 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-1
|
||||
- xkeyboard-config 2.31
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-2
|
||||
- Fix a syntax error in the indian symbols file
|
||||
|
||||
* Wed Jun 03 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-1
|
||||
- xkeyboard-config 2.30
|
||||
|
||||
* Fri Jan 31 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.29-1
|
||||
- xkeyboard-config 2.29
|
||||
|
||||
* Fri Oct 25 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
|
||||
- xkeyboard-config 2.28
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jun 13 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.27-1
|
||||
- xkeyboard-config 2.27
|
||||
- drop intltool, no longer needed, see upstream commit e8026f673e
|
||||
|
||||
* Mon May 27 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.26-2
|
||||
- xkeyboard-config 2.26, with sources this time
|
||||
|
||||
* Mon May 27 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.26-1
|
||||
- xkeyboard-config 2.26
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.24-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.24-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Jul 06 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-3
|
||||
- Remove high-keycode removal patches, xkbcomp 1.4.2 has been in stable for
|
||||
Loading…
Reference in New Issue
Block a user