Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'version-2-17' into 'master'
Update to upstream version 2.17

See merge request mer-core/xkeyboard-config!5
  • Loading branch information
Matti Kosola committed Mar 6, 2020
2 parents 1916e25 + 5474b7a commit 9c5d728
Show file tree
Hide file tree
Showing 439 changed files with 186 additions and 225,588 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "upstream"]
path = upstream
url = git://anongit.freedesktop.org/xkeyboard-config
url = https://git.sailfishos.org/mirror/xkeyboard-config.git
56 changes: 56 additions & 0 deletions rpm/0001-build-without-docs-so-we-don-t-require-xorg-macros.patch
@@ -0,0 +1,56 @@
From ccf29588bd4d9d0eb58917bf33166ab92328afe3 Mon Sep 17 00:00:00 2001
From: Matti Kosola <matti.kosola@jolla.com>
Date: Fri, 6 Mar 2020 10:34:16 +0200
Subject: [PATCH xkeyboard-config 1/4] build without docs so we don't require
xorg macros

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
Makefile.am | 2 +-
configure.ac | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4cc8254..f2e934e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign

-SUBDIRS = compat geometry keycodes po rules symbols types docs man
+SUBDIRS = compat geometry keycodes po rules symbols types

pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xkeyboard-config.pc
diff --git a/configure.ac b/configure.ac
index 3c42ad0..833f4f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,15 +3,6 @@ AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE

-# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.12 or later before
- running autoconf/autogen])])
-XORG_MACROS_VERSION(1.12)
-XORG_MANPAGE_SECTIONS
-XORG_WITH_XSLTPROC
-AC_PROG_SED
-
AC_SUBST(VERSION)

AC_ARG_WITH( xkb_base,
@@ -104,8 +95,6 @@ symbols/sun_vndr/Makefile
symbols/xfree68_vndr/Makefile
types/Makefile
xkeyboard-config.pc
-docs/Makefile
-man/Makefile
])

echo '***********************************************************'
--
2.24.1

@@ -0,0 +1,42 @@
From 59b7e644a30488361de2568e984f40182aa92c6a Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Fri, 15 Jan 2016 15:48:49 +0200
Subject: [PATCH xkeyboard-config 2/4] Workaround devices with bad headset
event on Sailfish. Contributes to JB#33503

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
symbols/inet | 4 +++-
symbols/jolla_vndr/sbj | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/symbols/inet b/symbols/inet
index 755597e..a244d6c 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -197,7 +197,9 @@ xkb_symbols "evdev" {
key <I231> { [ Cancel ] };
key <I232> { [ XF86MonBrightnessDown ] };
key <I233> { [ XF86MonBrightnessUp ] };
- key <I234> { [ XF86AudioMedia ] };
+// HACK: disabled to allow Jolla layout to define different mapping.
+// TODO: there's likely a better way to keep this and allow override.
+// key <I234> { [ XF86AudioMedia ] };
key <I235> { [ XF86Display ] };
key <I236> { [ XF86KbdLightOnOff ] }; // KEY_KBDILLUMTOGGLE
key <I237> { [ XF86KbdBrightnessDown ] }; // KEY_KBDILLUMDOWN
diff --git a/symbols/jolla_vndr/sbj b/symbols/jolla_vndr/sbj
index d2388c3..16244cf 100644
--- a/symbols/jolla_vndr/sbj
+++ b/symbols/jolla_vndr/sbj
@@ -54,4 +54,7 @@ xkb_symbols "common-keys" {

// generated from the headset, must always be in the map.
key <I264> { [ XF86Phone ] };
+ // Some kernel input drivers send KEY_MEDIA from headset button.
+ // Work around by mapping to phone key.
+ key <I234> { [ XF86Phone ] };
};
--
2.24.1

@@ -0,0 +1,40 @@
From 32c91fae6151e4a849e0d2a89498a65f435bdd17 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Wed, 27 Sep 2017 17:28:25 +0300
Subject: [PATCH xkeyboard-config 3/4] [upstream] Map camera focus and snapshot
keys. Contributes to MER#1817

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
keycodes/evdev | 2 ++
symbols/jolla_vndr/sbj | 3 +++
2 files changed, 5 insertions(+)

diff --git a/keycodes/evdev b/keycodes/evdev
index 624ac68..a638205 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
<I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
<I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
<I253> = 253; // #define KEY_DISPLAY_OFF 245
+ <I536> = 536; // #define KEY_CAMERA_FOCUS 528
+ <I774> = 774; // #define KEY_CAMERA_SNAPSHOT 766 - not in vanilla kernel

// Fake keycodes for virtual keys
<LVL3> = 92;
diff --git a/symbols/jolla_vndr/sbj b/symbols/jolla_vndr/sbj
index 16244cf..6c378eb 100644
--- a/symbols/jolla_vndr/sbj
+++ b/symbols/jolla_vndr/sbj
@@ -57,4 +57,7 @@ xkb_symbols "common-keys" {
// Some kernel input drivers send KEY_MEDIA from headset button.
// Work around by mapping to phone key.
key <I234> { [ XF86Phone ] };
+ // These should be camera focus and camera snapshot, but there are no better symbols available
+ key <I536> { [ XF86ContrastAdjust ] };
+ key <I774> { [ XF86WebCam ] };
};
--
2.24.1

37 changes: 37 additions & 0 deletions rpm/0004-sbj-Map-Select-key.-Contributes-to-JB-39965.patch
@@ -0,0 +1,37 @@
From 5389664db203684b8ecd610a174234bac7369f98 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.petrell@jollamobile.com>
Date: Tue, 3 Oct 2017 17:12:08 +0300
Subject: [PATCH xkeyboard-config 4/4] [sbj] Map Select key. Contributes to
JB#39965

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
keycodes/evdev | 1 +
symbols/jolla_vndr/sbj | 1 +
2 files changed, 2 insertions(+)

diff --git a/keycodes/evdev b/keycodes/evdev
index a638205..bb0e232 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,7 @@ default xkb_keycodes "evdev" {
<I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
<I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
<I253> = 253; // #define KEY_DISPLAY_OFF 245
+ <I361> = 361; // #define KEY_SELECT 353
<I536> = 536; // #define KEY_CAMERA_FOCUS 528
<I774> = 774; // #define KEY_CAMERA_SNAPSHOT 766 - not in vanilla kernel

diff --git a/symbols/jolla_vndr/sbj b/symbols/jolla_vndr/sbj
index 6c378eb..dd7f31e 100644
--- a/symbols/jolla_vndr/sbj
+++ b/symbols/jolla_vndr/sbj
@@ -60,4 +60,5 @@ xkb_symbols "common-keys" {
// These should be camera focus and camera snapshot, but there are no better symbols available
key <I536> { [ XF86ContrastAdjust ] };
key <I774> { [ XF86WebCam ] };
+ key <I361> { [ Select ] };
};
--
2.24.1

19 changes: 9 additions & 10 deletions rpm/xkeyboard-config.spec
@@ -1,13 +1,16 @@
Name: xkeyboard-config

Summary: Alternative xkb data files
Version: 2.10.1
Version: 2.17
Release: 1
Group: System/X11
License: MIT
BuildArch: noarch
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig#Releases
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
Source0: %{name}-%{version}.tar.bz2
Patch0: 0001-build-without-docs-so-we-don-t-require-xorg-macros.patch
Patch3: 0002-Workaround-devices-with-bad-headset-event-on-Sailfis.patch
Patch4: 0003-upstream-Map-camera-focus-and-snapshot-keys.-Contrib.patch
Patch5: 0004-sbj-Map-Select-key.-Contributes-to-JB-39965.patch
BuildRequires: perl(XML::Parser)
BuildRequires: gettext
BuildRequires: intltool
Expand All @@ -20,29 +23,25 @@ Alternative xkb data files.

%package devel
Summary: Devel package for alternative xkb data files
Group: System/X11
Requires: %{name} = %{version}-%{release}

%description devel
Development files for %{name}.


%prep
%setup -q -n %{name}-%{version}/%{name}
%autosetup -p1 -n %{name}-%{version}/upstream

%build

%autogen --disable-static \
--enable-compat-rules \
--with-xkb-base=%{_datadir}/X11/xkb \
--disable-xkbcomp-symlink \
--with-xkb-rules-symlink=xorg \
--disable-runtime-deps

make %{?jobs:-j%jobs}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%make_install

# Remove unnecessary symlink
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 51ab5c to 4a48ae
102 changes: 0 additions & 102 deletions xkeyboard-config/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions xkeyboard-config/AUTHORS

This file was deleted.

0 comments on commit 9c5d728

Please sign in to comment.