Merge branch 'work/v1.10' into dev

# Conflicts:
#	CMakeLists.txt
#	Depends-Android.cmake
#	res/about/version.gmi
#	res/lang/cs.bin
#	res/lang/eo.bin
#	res/lang/es.bin
#	res/lang/fi.bin
#	res/lang/gl.bin
#	res/lang/ia.bin
#	res/lang/ie.bin
#	res/lang/ru.bin
#	res/lang/sr.bin
#	res/lang/tok.bin
#	res/lang/tr.bin
#	res/lang/uk.bin
#	res/lang/zh_Hant.bin
#	src/app.c
#	src/main.c
#	src/ui/documentwidget.c
#	src/ui/labelwidget.c
#	src/ui/sidebarwidget.c
#	src/ui/util.c

1 files changed, 10 insertions, 1 deletions

diff --git a/Depends-Android.cmake b/Depends-Android.cmake
index 74635620..cffcf139 100644
--- a/Depends-Android.cmake
+++ b/Depends-Android.cmake
@@ -21,6 +21,7 @@ set (TFDN_STATIC_LIBRARY    ON  CACHE BOOL "")
 set (TFDN_ENABLE_INSTALL    OFF CACHE BOOL "")
 set (TFDN_ENABLE_TESTS      OFF CACHE BOOL "")
 set (TFDN_ENABLE_WEBREQUEST OFF CACHE BOOL "")
+set (TFDN_ENABLE_SSE41      OFF CACHE BOOL "")
 add_subdirectory (lib/the_Foundation)  
 add_library (the_Foundation::the_Foundation ALIAS the_Foundation)
 if (NOT OPENSSL_FOUND)
@@ -28,4 +29,12 @@ if (NOT OPENSSL_FOUND)
 endif ()
 if (NOT ZLIB_FOUND)
     message (FATAL_ERROR "Lagrange requires zlib for reading compressed archives. Please check if pkg-config can find 'zlib'.")
-endif ()
\ No newline at end of file
+endif ()
+
+set (FRIBIDI_FOUND YES)
+set (FRIBIDI_LIBRARIES ${ANDROID_DIR}/fribidi-android/${ANDROID_ABI}/lib/libfribidi.a)
+set (FRIBIDI_INCLUDE_DIRS ${ANDROID_DIR}/fribidi-android/${ANDROID_ABI}/include)
+
+set (HARFBUZZ_FOUND YES)
+set (HARFBUZZ_LIBRARIES ${ANDROID_DIR}/harfbuzz-android/${ANDROID_ABI}/lib/libharfbuzz.a)
+set (HARFBUZZ_INCLUDE_DIRS ${ANDROID_DIR}/harfbuzz-android/${ANDROID_ABI}/include/harfbuzz)