Merge pull request #784 from NiLuJe/master

Bump third-party libraries
koreader · Dec 29, 2018 · d6aa320 · d6aa320
2 parents 9063f78 + da8b5f1
commit d6aa320
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/thirdparty/fbink/CMakeLists.txt b/thirdparty/fbink/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/NiLuJe/FBInk.git
-    v1.9.2
+    v1.9.3
     ${SOURCE_DIR}
 )
 

diff --git a/thirdparty/glib/CMakeLists.txt b/thirdparty/glib/CMakeLists.txt
@@ -28,7 +28,14 @@ if(($ENV{APPIMAGE}) OR ($ENV{CERVANTES}) OR ($ENV{KINDLE}) OR ($ENV{KOBO}))
 else()
     set(PATCH_CMD1 sh -c "true")
 endif()
-set(PATCH_CMD2 sh -c "NOCONFIGURE=1 ./autogen.sh")
+# Android makes Linux syscalls hard to get to... Fix pilfered from Python.
+if($ENV{ANDROID})
+    set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/glib-2.58.2-android-linux-syscalls.patch || true")
+else()
+    set(PATCH_CMD2 sh -c "true")
+endif()
+
+set(PATCH_CMD3 sh -c "NOCONFIGURE=1 ./autogen.sh")
 
 # in order to support legacy PocketBook 4.x firmware we should get rid of
 # eventfd@GLIBC_2.7 and pipe2@GLIB_2.9
@@ -68,15 +75,15 @@ set(CFG_CMD sh -c "${CFG_ENV_VAR} ${SOURCE_DIR}/configure ${CFG_OPTS}")
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/GNOME/glib.git
-    2.56.2
+    2.58.2
     ${SOURCE_DIR}
 )
 
 include(ExternalProject)
 ExternalProject_Add(
     ${PROJECT_NAME}
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
-    PATCH_COMMAND COMMAND ${PATCH_CMD1} COMMAND ${PATCH_CMD2}
+    PATCH_COMMAND COMMAND ${PATCH_CMD1} COMMAND ${PATCH_CMD2} COMMAND ${PATCH_CMD3}
     CONFIGURE_COMMAND COMMAND ${gen_arm_config} COMMAND ${CFG_CMD}
     BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} install

diff --git a/thirdparty/glib/glib-2.58.2-android-linux-syscalls.patch b/thirdparty/glib/glib-2.58.2-android-linux-syscalls.patch
@@ -0,0 +1,18 @@
+diff --git a/glib/gspawn.c b/glib/gspawn.c
+index 69d3fec10..c598e02d0 100644
+--- a/glib/gspawn.c
++++ b/glib/gspawn.c
+@@ -50,6 +50,13 @@
+ #ifdef __linux__
+ #include <sys/syscall.h>  /* for syscall and SYS_getdents64 */
+ #endif
++#ifdef __ANDROID__
++#include <android/api-level.h>
++#endif
++#if defined(__ANDROID__) && __ANDROID_API__ < 21 && !defined(SYS_getdents64)
++#include <sys/linux-syscalls.h>
++#define SYS_getdents64  __NR_getdents64
++#endif
+
+ #include "gspawn.h"
+ #include "gspawn-private.h"
diff --git a/thirdparty/harfbuzz/CMakeLists.txt b/thirdparty/harfbuzz/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/harfbuzz/harfbuzz.git
-    2.1.0
+    2.3.0
     ${SOURCE_DIR}
 )
 

diff --git a/thirdparty/libk2pdfopt/CMakeLists.txt b/thirdparty/libk2pdfopt/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/koreader/libk2pdfopt.git
-    9aec09f52bf72bd7b747172c446d462c8b88f6b4
+    3628a77b8e062d34455dca38a9cd5a31dd902011
     ${SOURCE_DIR}
 )
 

diff --git a/thirdparty/sqlite/CMakeLists.txt b/thirdparty/sqlite/CMakeLists.txt
@@ -33,12 +33,12 @@ set(CFG_CMD "${CFG_CMD} --disable-readline")
 set(CFG_CMD "${CFG_CMD} --disable-static-shell")
 
 include(ExternalProject)
-set(SQLITE_VER "3250300")
+set(SQLITE_VER "3260000")
 ExternalProject_Add(
     ${PROJECT_NAME}
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     URL https://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_VER}.tar.gz
-    URL_HASH SHA1=5d6dc7634ec59e7a6fffa8758c1e184b2522c2e5
+    URL_HASH SHA1=9af2df1a6da5db6e2ecf3f463625f16740e036e9
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CFG_CMD}
     BUILD_COMMAND $(MAKE) -j1