include patch for ISO layout

3 files changed, 30 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e92bb12b5d7..948d4b763c4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Apr 19 10:08:00 UTC 2017
+# Wed Apr 19 11:30:25 UTC 2017
 pkgbase = macbook12-spi-driver-dkms
 	pkgdesc = WIP input driver for the SPI touchpad / keyboard found in the 12" MacBook
 	pkgver = 0+git.25
@@ -11,8 +11,10 @@ pkgbase = macbook12-spi-driver-dkms
 	makedepends = git
 	depends = dkms
 	source = git+https://github.com/cb22/macbook12-spi-driver.git
+	source = iso-layout.patch
 	source = dkms.conf
 	sha256sums = SKIP
+	sha256sums = 986550b8a316f01be1f7dc6b5e28952a89ce76a0f3d5d35636970960c32adea1
 	sha256sums = 72d908df93de0022dbd5e3cc458a3434105fe61125454a2738587727a42e21b7
 
 pkgname = macbook12-spi-driver-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 01fb591c574a..9d43b11dd12d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,10 @@ depends=('dkms')
 makedepends=('git')
 optdepends=()
 source=(git+https://github.com/cb22/macbook12-spi-driver.git
+        iso-layout.patch
         dkms.conf)
 sha256sums=('SKIP'
+            '986550b8a316f01be1f7dc6b5e28952a89ce76a0f3d5d35636970960c32adea1'
             '72d908df93de0022dbd5e3cc458a3434105fe61125454a2738587727a42e21b7')
 
 pkgver() {
@@ -21,6 +23,13 @@ pkgver() {
     echo "0+git.$(git rev-list HEAD --count)"
 }
 
+build() {
+    cd "${srcdir}"/${_pkgbase}
+
+    # uncomment for ISO layout
+    #patch -Nsf -p1 -i "${srcdir}"/iso-layout.patch
+}
+
 package() {
     cd "${srcdir}"
 
diff --git a/iso-layout.patch b/iso-layout.patch
new file mode 100644
index 000000000000..668f8bb7022d
--- /dev/null
+++ b/iso-layout.patch
@@ -0,0 +1,18 @@
+diff --git a/applespi.c b/applespi.c
+index 4356f84..3bf40ea 100644
+--- a/applespi.c
++++ b/applespi.c
+@@ -129,11 +129,12 @@ static const unsigned char applespi_scancodes[] = {
+ 	KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,
+ 	KEY_ENTER, KEY_ESC, KEY_BACKSPACE, KEY_TAB, KEY_SPACE, KEY_MINUS,
+ 	KEY_EQUAL, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, 0,
+-	KEY_SEMICOLON, KEY_APOSTROPHE, KEY_GRAVE, KEY_COMMA, KEY_DOT, KEY_SLASH,
++	KEY_SEMICOLON, KEY_APOSTROPHE, KEY_102ND, KEY_COMMA, KEY_DOT, KEY_SLASH,
+ 	KEY_CAPSLOCK,
+ 	KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9,
+ 	KEY_F10, KEY_F11, KEY_F12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	KEY_RIGHT, KEY_LEFT, KEY_DOWN, KEY_UP,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_GRAVE,
+ };
+ 
+ static const unsigned char applespi_controlcodes[] = {