[xkeyboard-config] Update to 2.17 version. JB#49158

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
sailfishos · Mar 6, 2020 · 5474b7a · 5474b7a
1 parent 1ebe580
commit 5474b7a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 2,499 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,7 +1,8 @@
-From c31a1d577b87236a7cd10bbd38d63de143638576 Mon Sep 17 00:00:00 2001
+From ccf29588bd4d9d0eb58917bf33166ab92328afe3 Mon Sep 17 00:00:00 2001
 From: Matti Kosola <matti.kosola@jolla.com>
-Date: Mon, 2 Mar 2020 14:25:20 +0000
-Subject: [PATCH 1/6] build without docs so we don't require xorg macros
+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>
 ---
@@ -10,7 +11,7 @@ Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  2 files changed, 1 insertion(+), 12 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index e0b3168..2c789d6 100644
+index 4cc8254..f2e934e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,6 +1,6 @@
@@ -22,7 +23,7 @@ index e0b3168..2c789d6 100644
  pkgconfigdir = $(datadir)/pkgconfig
  pkgconfig_DATA = xkeyboard-config.pc
 diff --git a/configure.ac b/configure.ac
-index 51f070c..cdbb40a 100644
+index 3c42ad0..833f4f8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3,15 +3,6 @@ AC_CONFIG_SRCDIR(rules/base.xml.in)
@@ -41,7 +42,7 @@ index 51f070c..cdbb40a 100644
  AC_SUBST(VERSION)
 
  AC_ARG_WITH( xkb_base,
-@@ -103,8 +94,6 @@ symbols/sun_vndr/Makefile
+@@ -104,8 +95,6 @@ symbols/sun_vndr/Makefile
  symbols/xfree68_vndr/Makefile
  types/Makefile
  xkeyboard-config.pc
@@ -51,5 +52,5 @@ index 51f070c..cdbb40a 100644
 
  echo '***********************************************************'
 -- 
-1.8.3-rc3
+2.24.1
 
diff --git a/...vices-with-bad-headset-event-on-Sai.patch → ...s-with-bad-headset-event-on-Sailfis.patch b/...vices-with-bad-headset-event-on-Sai.patch → ...s-with-bad-headset-event-on-Sailfis.patch
@@ -1,8 +1,8 @@
-From bd162b7834f43dfc1f0648547b606a34c72dff61 Mon Sep 17 00:00:00 2001
+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 4/6] [sbj] Workaround devices with bad headset event on
- Sailfish. Contributes to JB#33503
+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>
 ---
@@ -11,10 +11,10 @@ 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 839439a..d5f606e 100644
+index 755597e..a244d6c 100644
 --- a/symbols/inet
 +++ b/symbols/inet
-@@ -200,7 +200,9 @@ xkb_symbols "evdev" {
+@@ -197,7 +197,9 @@ xkb_symbols "evdev" {
      key <I231>   {      [ Cancel                ]       };
      key <I232>   {      [ XF86MonBrightnessDown ]       };
      key <I233>   {      [ XF86MonBrightnessUp   ]       };
@@ -38,5 +38,5 @@ index d2388c3..16244cf 100644
 +    key <I234>  { [     XF86Phone                                                       ] };
  };
 -- 
-1.8.3-rc3
+2.24.1