rpm/xkeyboard-config
SHA256
1
0
Fork 0
forked from pool/xkeyboard-config
Code Pull Requests Activity

Accepting request 980513 from X11:XOrg

Browse Source 
- U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch
  * Regression fixed from
    c3c5d02rules: sort the names of multimedia keyboards alphabetically
    "\" at the end of line were mistakenly replacd by "/"

- Update to version 2.36 
  * bugfixes
  * removed autotools support :-(
- switched to meson

OBS-URL: https://build.opensuse.org/request/show/980513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2022-06-03 12:16:43 +00:00 committed by Git OBS Bridge
commit fb58b9037b
5 changed files with 85 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch Normal file
View File

@ -0,0 +1,55 @@
From e7d699f868d028861e182f1543eaf5b3b16bf58e Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Thu, 2 Jun 2022 15:28:55 +0200
Subject: [PATCH] Fixes regression from c3c5d02: "\" were mistakenly replacd by
"/"
Regression fixed from
c3c5d02rules: sort the names of multimedia keyboards alphabetically
"\" at the end of line were mistakenly replacd by "/"
---
rules/0002-base.lists.part | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part
index 0af6db56..cb661240 100644
--- a/rules/0002-base.lists.part
+++ b/rules/0002-base.lists.part
@@ -37,18 +37,18 @@
unitekkb1925 yahoo
! $inetmediakbds = \
- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop /
- armada asus_laptop benqx btc5090 btc6301urf btc9019u /
- cherrybluea cherryblueb cherrycyboard chicony042 /
- compalfl90 compaqik13 compaqik18 creativedw7000 /
- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 /
- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy /
- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf /
- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude /
- logidinovo logidinovoedge logitech_base logitech_g15 /
- microsoft4000 microsoft7000 microsoftmult microsoftpro /
- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m /
- presario propeller samsung4500 samsung4510 scorpius /
- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 /
- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 /
+ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \
+ armada asus_laptop benqx btc5090 btc6301urf btc9019u \
+ cherrybluea cherryblueb cherrycyboard chicony042 \
+ compalfl90 compaqik13 compaqik18 creativedw7000 \
+ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \
+ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \
+ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \
+ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \
+ logidinovo logidinovoedge logitech_base logitech_g15 \
+ microsoft4000 microsoft7000 microsoftmult microsoftpro \
+ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \
+ presario propeller samsung4500 samsung4510 scorpius \
+ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \
+ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \
toshiba_s3000 trust trustda trust_slimline unitekkb1925
--
2.34.1

3
xkeyboard-config-2.34.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce
size 1763558

3
xkeyboard-config-2.36.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595
size 880776

16
xkeyboard-config.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jun 2 13:35:01 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch
* Regression fixed from
c3c5d02rules: sort the names of multimedia keyboards alphabetically
"\" at the end of line were mistakenly replacd by "/"
-------------------------------------------------------------------
Thu Jun 2 02:21:07 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 2.36
* bugfixes
* removed autotools support :-(
- switched to meson
-------------------------------------------------------------------
Fri Feb 18 17:36:39 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>

21
xkeyboard-config.spec
View File

@ -17,17 +17,19 @@
Name: xkeyboard-config
Version: 2.34
Version: 2.36
Release: 0
Summary: The X Keyboard Extension
License: CDDL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/X11/Utilities
URL: https://www.freedesktop.org/Software/XKeyboardConfig
Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
Patch0: U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch
# PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
Patch109: n_disable-2xalt_2xctrl-toggle.diff
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: xsltproc
@ -48,19 +50,18 @@ make keyboards more accessible to people with physical impairments.
%prep
%setup -q
%patch0 -p1
%patch109 -p1
%build
%configure \
--disable-silent-rules \
--with-xkb-rules-symlink=xorg \
--with-xkb-base=%{_datadir}/X11/xkb \
--enable-compat_rules \
--disable-runtime-deps
%make_build
%{meson} \
-Dxkb-base=%{_datadir}/X11/xkb \
-Dcompat-rules=true \
-Dxorg-rules-symlinks=true
%{meson_build}
%install
%make_install
%{meson_install}
mkdir -p %{buildroot}%{_localstatedir}/lib/xkb
# Bug 335553
mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/