From d97dce0491aa4973707f49f69ed23eb67c70d957 Mon Sep 17 00:00:00 2001
From: Cosmin Gorgovan <cosmin@linux-geek.org>
Date: Tue, 26 Apr 2016 04:17:28 +0100
Subject: [PATCH] Update koreader

---
 build.sh                        |  9 ++-------
 build_rootfs.sh                 |  2 +-
 files/defaults.persistent.lua   |  2 ++
 src/koreader                    |  2 +-
 src/koreader-pkg/DEBIAN/control |  2 +-
 src/koreader_base_arm.patch     | 11 -----------
 6 files changed, 7 insertions(+), 21 deletions(-)
 create mode 100644 files/defaults.persistent.lua
 delete mode 100644 src/koreader_base_arm.patch

diff --git a/build.sh b/build.sh
index a31c346..487feec 100755
--- a/build.sh
+++ b/build.sh
@@ -119,15 +119,8 @@ compile_koreader() {
   rm *.targz *.tar.gz *.zip
 
   make fetchthirdparty
-
-  # Remove -m32 cflag
-  patch -p1 < ../koreader_base_arm.patch
-
   make TARGET=kobo koboupdate
 
-  # Reverse the patch so that koreader-base can be cleanly updated in the future
-  patch -R -p1 < ../koreader_base_arm.patch
-
   cd ../koreader-pkg
   rm -Rf opt
   mkdir opt
@@ -141,6 +134,8 @@ compile_koreader() {
   echo "done" >> koreader/okreader.sh
   chmod +x koreader/okreader.sh
   
+  cp ../../../files/defaults.persistent.lua koreader/
+
   cd ../../
   dpkg-deb -b koreader-pkg .
   cd ../
diff --git a/build_rootfs.sh b/build_rootfs.sh
index 2034fcc..252ebba 100755
--- a/build_rootfs.sh
+++ b/build_rootfs.sh
@@ -84,7 +84,7 @@ config_rootfs() {
 install_packages() {
   cp src/linux-okreader-modules_2.6.35.3-1_armhf.deb rootfs/
   cp src/firmware-okreader_1.0-1_armhf.deb rootfs/
-  cp src/koreader_2016.01-4_armhf.deb rootfs/
+  cp src/koreader_2016.04-1_armhf.deb rootfs/
   cp src/kobo_hwconfig/kobo-hwconfig_1.0-1_armhf.deb rootfs/
 
   chroot rootfs/ bash -c "dpkg -i /*.deb"
diff --git a/files/defaults.persistent.lua b/files/defaults.persistent.lua
new file mode 100644
index 0000000..7144e91
--- /dev/null
+++ b/files/defaults.persistent.lua
@@ -0,0 +1,2 @@
+KOBO_LIGHT_ON_START = 0
+KOBO_SYNC_BRIGHTNESS_WITH_NICKEL = false
diff --git a/src/koreader b/src/koreader
index 856ec6d..24a30cb 160000
--- a/src/koreader
+++ b/src/koreader
@@ -1 +1 @@
-Subproject commit 856ec6d075e8d93d38c1c1a91b9612d845b67c12
+Subproject commit 24a30cbda5bac311b5783983ab938090d3fb3b85
diff --git a/src/koreader-pkg/DEBIAN/control b/src/koreader-pkg/DEBIAN/control
index 0a77a52..0baa5ff 100644
--- a/src/koreader-pkg/DEBIAN/control
+++ b/src/koreader-pkg/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: koreader
-Version: 2016.01-4
+Version: 2016.04-1
 Maintainer: Cosmin Gorgovan <okreader@linux-geek.org>
 Architecture: armhf
 Description: An ebook viewer application.
diff --git a/src/koreader_base_arm.patch b/src/koreader_base_arm.patch
deleted file mode 100644
index 23846cf..0000000
--- a/src/koreader_base_arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/base/Makefile
-+++ b/base/Makefile
-@@ -196,7 +196,7 @@ else
- 	# Build its HOST/TARGET_CFLAGS based on CFLAGS, so we need
- 	# a neutral CFLAGS without arch
- 	$(MAKE) -j$(PROCESSORS) -C $(LUA_DIR) \
--		CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" \
-+		CC="$(HOSTCC)" HOST_CC="$(HOSTCC)" \
- 		CFLAGS="$(BASE_CFLAGS)" HOST_CFLAGS="$(HOSTCFLAGS)" \
- 		$(if $(WIN32),LDFLAGS="$(LDFLAGS)",) \
- 		$(if $(WIN32),TARGET_SYS=Windows,) \