Merge pull request #46 from paulo-coutinho/4599

updated to version 4599

Author: Paulo Coutinho

docker/android/Dockerfile

@@ -54,7 +54,7 @@ WORKDIR /build
 RUN gclient config --unmanaged https://pdfium.googlesource.com/pdfium.git
 RUN gclient sync
 WORKDIR /build/pdfium
-RUN git checkout 08d0658d7560330f064b380ade2ef243cf7cf2d4
+RUN git checkout 4d2a36f310de4a269a1838174f3c076550d9bd6d
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN ln -s /usr/bin/pip3 /usr/bin/pip

docker/wasm/Dockerfile

@@ -65,8 +65,8 @@ RUN make && make install
 RUN mkdir /emsdk
 WORKDIR /emsdk
 RUN git clone https://github.com/emscripten-core/emsdk.git . 
-RUN ./emsdk install 2.0.24
-RUN ./emsdk activate 2.0.24
+RUN ./emsdk install 2.0.26
+RUN ./emsdk activate 2.0.26
 ENV PATH="${PATH}:/emsdk:/emsdk/upstream/emscripten"
 
 # cache system libraries

extras/wasm/template/index.html

@@ -14,7 +14,7 @@
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
 
-    <script src="pdfium.js?v=4584"></script>
+    <script src="pdfium.js?v=4599"></script>
 
     <script>
         // variables
@@ -1038,7 +1038,7 @@ <h1 id="fileTitle" class="title" style="display: none;">PDF Viewer</h1>
                 everything run only on client side.
             </p>
             <p>
-                PDFium branch "4584" and commit "08d0658d7560330f064b380ade2ef243cf7cf2d4".
+                PDFium branch "4599" and commit "4d2a36f310de4a269a1838174f3c076550d9bd6d".
             </p>
         </div>
     </footer>

extras/wasm/utils/package.json

@@ -4,7 +4,7 @@
     "main": "index.js",
     "license": "MIT",
     "dependencies": {
-        "xmldom": "0.5.0",
+        "xmldom": "0.6.0",
         "xpath": "0.0.32"
     }
 }

modules/config.py

@@ -5,9 +5,9 @@
 targets = ["ios", "macos", "android"]
 
 # pdfium
-pdfium_git_branch = "4584"
-pdfium_git_commit = "08d0658d7560330f064b380ade2ef243cf7cf2d4"
-# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/4584
+pdfium_git_branch = "4599"
+pdfium_git_commit = "4d2a36f310de4a269a1838174f3c076550d9bd6d"
+# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/4599
 # 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)
 

modules/ios.py

@@ -47,12 +47,12 @@ def run_task_patch():
         source_dir,
         "BUILD.gn",
     )
-    if not f.file_line_has_content(source_file, 245, '#test("pdfium_unittests") {\n'):
+    if not f.file_line_has_content(source_file, 244, '#test("pdfium_unittests") {\n'):
         f.file_line_comment_range(
-            source_file, 245, 292
+            source_file, 244, 291
         )  # comment all lines of "pdfium_unittests"
         f.file_line_comment_range(
-            source_file, 383, 384
+            source_file, 382, 383
         )  # group "pdfium_all", comment all tests
 
         f.debug("Applied: Build GN")
@@ -116,8 +116,8 @@ def run_task_patch():
         "compiler",
         "BUILD.gn",
     )
-    if f.file_line_has_content(source_file, 1703, '      "-Wimplicit-fallthrough",\n'):
-        f.file_line_comment(source_file, 1703)
+    if f.file_line_has_content(source_file, 1705, '      "-Wimplicit-fallthrough",\n'):
+        f.file_line_comment(source_file, 1705)
 
         f.debug("Applied: Compiler")
     else:
@@ -153,11 +153,11 @@ def run_task_patch():
         "cpdf_type1font.cpp",
     )
     if not f.file_line_has_content(
-        source_file, 21, "#include <CoreGraphics/CoreGraphics.h>\n"
+        source_file, 22, "#include <CoreGraphics/CoreGraphics.h>\n"
     ):
         f.replace_line_in_file(
             source_file,
-            21,
+            22,
             "#include <CoreGraphics/CoreGraphics.h>\n",
         )
 
@@ -174,9 +174,9 @@ def run_task_patch():
         "rules.gni",
     )
     if not f.file_line_has_content(
-        source_file, 951, '#          data_deps += [ "//testing/iossim" ]\n'
+        source_file, 954, '#          data_deps += [ "//testing/iossim" ]\n'
     ):
-        f.file_line_comment(source_file, 951)
+        f.file_line_comment(source_file, 954)
 
         f.debug("Applied: iOS Simulator")
     else:
@@ -231,6 +231,27 @@ def run_task_patch():
     else:
         f.debug("Skipped: Core FXGE")
 
+    # clang 12
+    source_file = os.path.join(
+        source_dir,
+        "build",
+        "config",
+        "compiler",
+        "BUILD.gn",
+    )
+    if f.file_line_has_content(
+        source_file, 1230, '      cflags += [ "-ffile-compilation-dir=." ]\n'
+    ):
+        f.replace_line_in_file(
+            source_file,
+            1230,
+            '      cflags += ["-Xclang","-fdebug-compilation-dir","-Xclang","."]\n',
+        )
+
+        f.debug("Applied: Clang 12")
+    else:
+        f.debug("Skipped: Clang 12")
+
 
 def run_task_build():
     f.debug("Building libraries...")

modules/wasm.py

@@ -92,12 +92,12 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        217,
+        216,
         '    configs -= [ "//build/config/compiler:thin_archive" ]\n',
     ):
         f.replace_line_in_file(
             source_file,
-            217,
+            216,
             '    #configs -= [ "//build/config/compiler:thin_archive" ]\n',
         )
 
@@ -115,22 +115,22 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        835,
+        846,
         '        "-m64",\n',
     ):
         f.replace_line_in_file(
             source_file,
-            835,
+            846,
             '        #"-m64",\n',
         )
         f.replace_line_in_file(
             source_file,
-            836,
+            847,
             '        #"-march=$x64_arch",\n',
         )
         f.replace_line_in_file(
             source_file,
-            837,
+            848,
             '        #"-msse3",\n',
         )
 
@@ -148,12 +148,12 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        1608,
+        1621,
         '          "-Wno-ignored-pragma-optimize",\n',
     ):
         f.replace_line_in_file(
             source_file,
-            1608,
+            1621,
             '          "-Wno-deprecated-register",\n',
         )
 
@@ -171,12 +171,12 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        2424,
+        2426,
         '        cflags += [ "-ggnu-pubnames" ]\n',
     ):
         f.replace_line_in_file(
             source_file,
-            2424,
+            2426,
             '        #cflags += [ "-ggnu-pubnames" ]\n',
         )
 
@@ -245,18 +245,18 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        335,
+        333,
         '        cflags += [ "-fstack-protector" ]\n',
     ):
         f.replace_line_in_file(
             source_file,
-            335,
+            333,
             '        cflags += [ "-fno-stack-protector" ]\n',
         )
 
         f.replace_line_in_file(
             source_file,
-            347,
+            345,
             '        cflags += [ "-fno-stack-protector" ]\n',
         )
 
@@ -296,12 +296,12 @@ def run_task_patch():
     )
     if f.file_line_has_content(
         source_file,
-        496,
+        494,
         '    cflags += [ "-pthread" ]\n',
     ):
         f.replace_line_in_file(
             source_file,
-            496,
+            494,
             '    #cflags += [ "-pthread" ]\n',
         )