buggins · virxkane · Aug 18, 2021 · Jun 13, 2021 · Jun 13, 2021 · Jun 13, 2021
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -241,22 +241,27 @@ endif (NOT JPEG_FOUND)
 
 if (NOT MSVC AND NOT CR3_FREETYPE)
 FIND_PACKAGE(Freetype 2.10.0)
-FIND_PACKAGE(HarfBuzz)
+FIND_PACKAGE(HarfBuzz 2.6.0)
 endif (NOT MSVC AND NOT CR3_FREETYPE)
 
 ADD_SUBDIRECTORY(thirdparty_unman/qimagescale)
 
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
   if (NOT HarfBuzz_FOUND)
-	SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-	SET(HARFBUZZ_LIBRARIES harfbuzz)
+    SET(HarfBuzz_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+    SET(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HarfBuzz_LIBRARIES harfbuzz CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIR ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIRS} CACHE PATH "" FORCE)
+    SET(HARFBUZZ_LIBRARIES ${HarfBuzz_LIBRARIES} CACHE PATH "" FORCE)
   endif (NOT HarfBuzz_FOUND)
   SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE)
   SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE)
   SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
   SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "" FORCE)
   SET(PNG_LIBRARY ${PNG_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_FREETYPE_SRCDIR})
   SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_FREETYPE_SRCDIR}/include CACHE PATH "" FORCE)
   SET(FREETYPE_LIBRARIES freetype)
@@ -267,13 +272,14 @@ if (NOT HarfBuzz_FOUND)
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
   SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
   SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+  SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE)
   ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR})
-  SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
-  SET(HARFBUZZ_LIBRARY harfbuzz)
+  SET(HarfBuzz_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE)
+  SET(HarfBuzz_LIBRARY harfbuzz)
 endif (NOT HarfBuzz_FOUND)
 
 if (NOT MSVC)
-	find_package(FontConfig)
+	find_package(FontConfig 2.11.0)
 endif(NOT MSVC)
 
 if (FONTCONFIG_FOUND)
@@ -283,7 +289,7 @@ else()
 endif (FONTCONFIG_FOUND)
 
 if (NOT MSVC)
-find_package(FriBidi)
+find_package(FriBidi 1.0.0)
 if (NOT FRIBIDI_FOUND)
   message("System FriBidi not found, will build local one\n")
   ADD_SUBDIRECTORY(thirdparty/${REPO_FRIBIDI_SRCDIR})
@@ -295,7 +301,7 @@ endif(NOT MSVC)
 
 
 if (NOT MSVC)
-	find_package(libunibreak)
+	find_package(libunibreak 4.0)
 endif(NOT MSVC)
 
 if (NOT LIBUNIBREAK_FOUND)
@@ -305,7 +311,7 @@ if (NOT LIBUNIBREAK_FOUND)
   SET(LIBUNIBREAK_LIBRARIES unibreak)
 endif (NOT LIBUNIBREAK_FOUND)
 
-find_package(ZSTD)
+find_package(ZSTD 1.4.0)
 if (NOT ZSTD_FOUND)
     message("\nSystem zstd not found, will build local one\n")
     set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE)
@@ -355,7 +361,7 @@ INCLUDE_DIRECTORIES(
   ${JPEG_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIRS}
-  ${HARFBUZZ_INCLUDE_DIRS}
+  ${HarfBuzz_INCLUDE_DIRS}
   ${ANTIWORD_INCLUDE_DIR}
   ${CHM_INCLUDE_DIR}
   ${FRIBIDI_INCLUDE_DIR}
@@ -371,7 +377,7 @@ else()
 SET(STD_LIBS
   ${JPEG_LIBRARIES}
   ${FREETYPE_LIBRARIES}
-  ${HARFBUZZ_LIBRARY}
+  ${HarfBuzz_LIBRARY}
   ${PNG_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${CHM_LIBRARIES}

diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(${CR3_ROOT}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_ZSTD_SRCDIR}/lib)
 include_directories(${CR3_ROOT}/thirdparty/${REPO_UTF8PROC_SRCDIR})
 
-add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
+add_definitions(-DLINUX=1 -D_LINUX=1)
 add_definitions(-DFT_CONFIG_MODULES_H=<android/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<android/config/ftoption.h>)
 add_definitions(-DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000)
 add_definitions(-DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1)
@@ -39,7 +39,7 @@ add_definitions(-DLVLONG_FILE_SUPPORT=1)
 add_definitions(-DMAX_IMAGE_SCALE_MUL=2)
 add_definitions(-DUSE_NANOSVG=1)
 add_definitions(-DBUNDLED_FRIBIDI=1)
-add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # patch "add_lb_get_char_class.patch" for libunibreak from koreader
+add_definitions(-DKO_LIBUNIBREAK_PATCH=1)       # libunibreak patched with "add_lb_get_char_class.patch" file from koreader
 add_definitions(-DUSE_UTF8PROC=1)
 
 #set(LOCAL_CFLAGS "-Wno-psabi -Wno-unused-variable -Wno-sign-compare -Wno-write-strings -Wno-main -Wno-unused-but-set-variable -Wno-unused-function -Wall")

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -24,7 +24,6 @@ android {
             aidl.srcDirs = ['../../android/src']
             java.srcDirs = ['../../android/src']
             res.srcDirs = ['../../android/res']
-            jni.srcDirs = ['../../android/jni']
         }
     }
     buildTypes {

diff --git a/android/build.gradle b/android/build.gradle
@@ -4,10 +4,10 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/android/eink-onyx-reflections/build.gradle b/android/eink-onyx-reflections/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java b/android/eink-onyx-reflections/src/main/java/org/eink_onyx_reflections/OnyxDevice.java
@@ -52,7 +52,7 @@ private static String getBoardPlatform() {
 	private static void bootstrap() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 			try {
-				// Allow Private API on Android 10 (API 28)
+				// Allow Private API on Android 10 (API 29)
 				Class<?> aClass = Class.class;
 				Method methodForName = aClass.getDeclaredMethod("forName", String.class);
 				Method methodGetDeclaredMethod = aClass.getDeclaredMethod("getDeclaredMethod", String.class, Class[].class);

diff --git a/android/genrescollection/build.gradle b/android/genrescollection/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion 3
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -5,9 +5,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE    := cr3engine-3-2-X
 
-# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, chmlib
+# Generate CREngine blob with statically linked libjpeg, libpng, freetype, harfbuzz, fribidi, libunibreak, zstd, utf8proc, antiword, chmlib
 
-CRFLAGS := -DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH \
+CRFLAGS := -DLINUX=1 -D_LINUX=1 \
      -DFT2_BUILD_LIBRARY=1 -DFT_CONFIG_MODULES_H=\<android/config/ftmodule.h\> -DFT_CONFIG_OPTIONS_H=\<android/config/ftoption.h\> \
      -DDOC_DATA_COMPRESSION_LEVEL=1 -DDOC_BUFFER_SIZE=0x1000000 \
      -DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1 \