Merge branch 'jb49158' into 'master'

Update to 2.29 version See merge request mer-core/xkeyboard-config!4
sailfishos · Mar 12, 2020 · 989197d · 989197d
2 parents 9c5d728 + 71477bd
commit 989197d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 55 deletions.
diff --git a/rpm/0001-build-without-docs-so-we-don-t-require-xorg-macros.patch b/rpm/0001-build-without-docs-so-we-don-t-require-xorg-macros.patch
@@ -1,17 +1,16 @@
-From ccf29588bd4d9d0eb58917bf33166ab92328afe3 Mon Sep 17 00:00:00 2001
+From ad9a1a47089a1b5fa963accd03eabe9dcaa3a0ee 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
+Date: Mon, 2 Mar 2020 15:49:57 +0000
+Subject: [PATCH 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(-)
+ configure.ac | 12 ------------
+ 2 files changed, 1 insertion(+), 13 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 4cc8254..f2e934e 100644
+index 743610b..88b5a3a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,6 +1,6 @@
@@ -23,12 +22,12 @@ index 4cc8254..f2e934e 100644
  pkgconfigdir = $(datadir)/pkgconfig
  pkgconfig_DATA = xkeyboard-config.pc
 diff --git a/configure.ac b/configure.ac
-index 3c42ad0..833f4f8 100644
+index 2ee71e8..5b8022e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3,15 +3,6 @@ AC_CONFIG_SRCDIR(rules/base.xml.in)
+@@ -2,16 +2,6 @@ AC_INIT(xkeyboard-config, 2.29)
+ AC_CONFIG_SRCDIR(rules/base.xml)
  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],
@@ -38,11 +37,12 @@ index 3c42ad0..833f4f8 100644
 -XORG_MANPAGE_SECTIONS
 -XORG_WITH_XSLTPROC
 -AC_PROG_SED
+-AM_PATH_PYTHON([3.0])
 -
  AC_SUBST(VERSION)
 
  AC_ARG_WITH( xkb_base,
-@@ -104,8 +95,6 @@ symbols/sun_vndr/Makefile
+@@ -99,8 +89,6 @@ symbols/sun_vndr/Makefile
  symbols/xfree68_vndr/Makefile
  types/Makefile
  xkeyboard-config.pc
@@ -52,5 +52,5 @@ index 3c42ad0..833f4f8 100644
 
  echo '***********************************************************'
 -- 
-2.24.1
+1.8.3-rc3
 
diff --git a/rpm/0002-Workaround-devices-with-bad-headset-event-on-Sailfis.patch b/rpm/0002-Workaround-devices-with-bad-headset-event-on-Sailfis.patch
@@ -1,8 +1,8 @@
-From 59b7e644a30488361de2568e984f40182aa92c6a Mon Sep 17 00:00:00 2001
+From 122645b1356b7e3b161b00bcf1f9ce035552909e 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
+Subject: [PATCH 2/4] Workaround devices with bad headset event on Sailfish.
+ Contributes to JB#33503
 
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 ---
@@ -11,7 +11,7 @@ Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/symbols/inet b/symbols/inet
-index 755597e..a244d6c 100644
+index 049ac18..2aad945 100644
 --- a/symbols/inet
 +++ b/symbols/inet
 @@ -197,7 +197,9 @@ xkb_symbols "evdev" {
@@ -38,5 +38,5 @@ index d2388c3..16244cf 100644
 +    key <I234>  { [     XF86Phone                                                       ] };
  };
 -- 
-2.24.1
+1.8.3-rc3
 
diff --git a/rpm/0003-upstream-Map-camera-focus-and-snapshot-keys.-Contrib.patch b/rpm/0003-upstream-Map-camera-focus-and-snapshot-keys.-Contrib.patch
@@ -1,8 +1,8 @@
-From 32c91fae6151e4a849e0d2a89498a65f435bdd17 Mon Sep 17 00:00:00 2001
+From a7387d004e853216dfb4741c7919d593923ad3d4 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
+Subject: [PATCH 3/4] [upstream] Map camera focus and snapshot keys.
+ Contributes to MER#1817
 
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 ---
@@ -11,13 +11,13 @@ Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/keycodes/evdev b/keycodes/evdev
-index 624ac68..a638205 100644
+index d41799d..6bb9142 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
+@@ -288,6 +288,8 @@ default xkb_keycodes "evdev" {
+ 	<I382> = 382;   // #define KEY_KEYBOARD            374
+ 	<I569> = 569;   // #define KEY_ROTATE_LOCK_TOGGLE  561
+ 	<I380> = 380;   // #define KEY_FULL_SCREEN         372
 +	<I536> = 536;   // #define KEY_CAMERA_FOCUS        528
 +	<I774> = 774;   // #define KEY_CAMERA_SNAPSHOT     766 - not in vanilla kernel
 
@@ -36,5 +36,5 @@ index 16244cf..6c378eb 100644
 +    key <I774>  { [     XF86WebCam                                                      ] };
  };
 -- 
-2.24.1
+1.8.3-rc3
 
diff --git a/rpm/0004-sbj-Map-Select-key.-Contributes-to-JB-39965.patch b/rpm/0004-sbj-Map-Select-key.-Contributes-to-JB-39965.patch
@@ -1,8 +1,7 @@
-From 5389664db203684b8ecd610a174234bac7369f98 Mon Sep 17 00:00:00 2001
+From 2187dda6bbad3b8d608ff1b25cd168c39a94e5dc 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
+Subject: [PATCH 4/4] [sbj] Map Select key. Contributes to JB#39965
 
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 ---
@@ -11,17 +10,17 @@ Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/keycodes/evdev b/keycodes/evdev
-index a638205..bb0e232 100644
+index 6bb9142..0a89b76 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
+@@ -287,6 +287,7 @@ default xkb_keycodes "evdev" {
+ 	<I372> = 372;   // #define KEY_FAVORITES           364
+ 	<I382> = 382;   // #define KEY_KEYBOARD            374
+ 	<I569> = 569;   // #define KEY_ROTATE_LOCK_TOGGLE  561
 +	<I361> = 361;	// #define KEY_SELECT              353
+ 	<I380> = 380;   // #define KEY_FULL_SCREEN         372
  	<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
@@ -33,5 +32,5 @@ index 6c378eb..dd7f31e 100644
 +    key <I361>  { [     Select                                                          ] };
  };
 -- 
-2.24.1
+1.8.3-rc3
 
diff --git a/rpm/xkeyboard-config.spec b/rpm/xkeyboard-config.spec
@@ -1,7 +1,7 @@
 Name:       xkeyboard-config
 
 Summary:    Alternative xkb data files
-Version:    2.17
+Version:    2.29
 Release:    1
 License:    MIT
 BuildArch:  noarch
@@ -11,10 +11,11 @@ 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:  gettext gettext-devel
+BuildRequires:  libtool
+BuildRequires:  libxslt
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  gettext
-BuildRequires:  intltool
-BuildRequires:  fdupes
+BuildRequires:  pkgconfig(glib-2.0)
 Provides:   xkbdata
 Obsoletes:   xorg-x11-xkbdata
 
@@ -32,10 +33,8 @@ Development files for %{name}.
 %autosetup -p1 -n %{name}-%{version}/upstream
 
 %build
-%autogen --disable-static \
-    --enable-compat-rules \
+%autogen --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
-    --disable-xkbcomp-symlink \
     --with-xkb-rules-symlink=xorg \
     --disable-runtime-deps
 
@@ -46,22 +45,18 @@ make %{?_smp_mflags}
 
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
-
-# Bernie: remove locale stuff
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
 
 # Create filelist
 {
-FILESLIST=${PWD}/files.list
-pushd $RPM_BUILD_ROOT
-find ./usr/share/X11 -type d | sed -e "s/^\./%dir /g" > $FILESLIST
-find ./usr/share/X11 -type f | sed -e "s/^\.//g" >> $FILESLIST
-popd
+   FILESLIST=${PWD}/files.list
+   pushd $RPM_BUILD_ROOT
+   find .%{_datadir}/X11/xkb -type d | sed -e "s/^\./%dir /g" > $FILESLIST
+   find .%{_datadir}/X11/xkb -type f | sed -e "s/^\.//g" >> $FILESLIST
+   popd
 }
 
-%fdupes  %{buildroot}//usr/share/X11
-
-%files -f files.list
+%files -f files.list -f %{name}.lang
 %defattr(-,root,root,-)
 %{_datadir}/X11/xkb/rules/xorg
 %{_datadir}/X11/xkb/rules/xorg.lst

diff --git a/upstream b/upstream