Merge pull request #97 from paulocoutinhox/update-version

update pdfium version to 6008
paulocoutinhox · Sep 14, 2023 · d549eca · d549eca
2 parents d1afeb2 + 3334bd5
commit d549eca
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { name: "macOS", os: "macos-latest", target: "macos" }
+          - { name: "macOS", os: "macos-12", target: "macos" }
         python-version: [3.7]
 
     steps:

diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile
@@ -58,7 +58,7 @@ WORKDIR /build
 RUN gclient config --unmanaged https://pdfium.googlesource.com/pdfium.git
 RUN gclient sync
 WORKDIR /build/pdfium
-RUN git checkout 15b1203da8e9be060d143a184de6473ca7a68b83
+RUN git checkout 9eec95782c4ecdae50cd8c8e9f88d3f8941db1cd
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN ln -s /usr/bin/pip3 /usr/bin/pip

diff --git a/docker/wasm/Dockerfile b/docker/wasm/Dockerfile
@@ -37,7 +37,7 @@ WORKDIR /build
 RUN gclient config --unmanaged https://pdfium.googlesource.com/pdfium.git
 RUN gclient sync
 WORKDIR /build/pdfium
-RUN git checkout 15b1203da8e9be060d143a184de6473ca7a68b83
+RUN git checkout 9eec95782c4ecdae50cd8c8e9f88d3f8941db1cd
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN ln -s /usr/bin/pip3 /usr/bin/pip

diff --git a/modules/android.py b/modules/android.py
@@ -66,6 +66,13 @@ def run_task_patch():
 
         f.set_file_line_content(source_file, line_number, content, new_line=True)
 
+        # more one
+        line_number = f.get_file_line_number_with_content(
+            source_file, line_content, strip=True
+        )
+
+        f.set_file_line_content(source_file, line_number, content, new_line=True)
+
         l.bullet("Applied: build gn flags", l.GREEN)
     else:
         l.bullet("Skipped: build gn flags", l.PURPLE)

diff --git a/modules/config.py b/modules/config.py
@@ -3,14 +3,14 @@
 task = ""
 
 # pdfium
-pdfium_git_branch = "5668"
-pdfium_git_commit = "15b1203da8e9be060d143a184de6473ca7a68b83"
-# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/5668
+pdfium_git_branch = "6008"
+pdfium_git_commit = "9eec95782c4ecdae50cd8c8e9f88d3f8941db1cd"
+# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/6008
 # OBS 1: don't forget change in android docker file (docker/android/Dockerfile)
 # OBS 2: don't forget change in wasm docker file (docker/wasm/Dockerfile)
 
 # emsdk
-emsdk_version = "3.1.34"
+emsdk_version = "3.1.45"
 # OBS 1: don't forget change in wasm docker file (docker/wasm/Dockerfile)
 
 # macos

diff --git a/modules/macos.py b/modules/macos.py
@@ -79,6 +79,8 @@ def run_task_build():
             args.append("pdf_is_complete_lib=true")
             args.append("use_custom_libcxx=false")
             args.append("use_sysroot=false")
+            args.append('mac_deployment_target="10.13.0"')
+            args.append("pdf_use_partition_alloc=false")
 
             if config == "release":
                 args.append("symbol_level=0")