Merge pull request #61 from paulo-coutinho/version-4795

version 4795

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 64a3691918bca26c4d233c8c897d926a39e4a8b7
+RUN git checkout 187d077faebb81a2bbc11d777ece46830cf5cd8f
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN ln -s /usr/bin/pip3 /usr/bin/pip

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 64a3691918bca26c4d233c8c897d926a39e4a8b7
+RUN git checkout 187d077faebb81a2bbc11d777ece46830cf5cd8f
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN ln -s /usr/bin/pip3 /usr/bin/pip

modules/android.py

@@ -72,6 +72,27 @@ def run_task_patch():
     else:
         l.bullet("Skipped: build gn flags", l.PURPLE)
 
+    # compiler warning as error
+    source_file = os.path.join(
+        source_dir,
+        "build",
+        "config",
+        "compiler",
+        "compiler.gni",
+    )
+
+    line_content = "treat_warnings_as_errors = true"
+    line_number = f.get_file_line_number_with_content(
+        source_file, line_content, strip=True
+    )
+
+    if line_number:
+        content = "  treat_warnings_as_errors = false"
+        f.set_file_line_content(source_file, line_number, content, new_line=True)
+        l.bullet("Applied: compiler warning as error", l.GREEN)
+    else:
+        l.bullet("Skipped: compiler warning as error", l.PURPLE)
+
     l.ok()
 
 

modules/config.py

@@ -3,9 +3,9 @@
 task = ""
 
 # pdfium
-pdfium_git_branch = "4734"
-pdfium_git_commit = "64a3691918bca26c4d233c8c897d926a39e4a8b7"
-# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/4734
+pdfium_git_branch = "4795"
+pdfium_git_commit = "187d077faebb81a2bbc11d777ece46830cf5cd8f"
+# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/4795
 # 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

@@ -312,6 +312,34 @@ def run_task_patch():
     else:
         l.bullet("Skipped: core fxge", l.PURPLE)
 
+    # mllvm - 1
+    source_file = os.path.join(source_dir, "build", "config", "compiler", "BUILD.gn")
+
+    line_content = '"-mllvm",'
+    line_number = f.get_file_line_number_with_content(
+        source_file, line_content, strip=True
+    )
+
+    if line_number:
+        f.prepend_to_file_line_range(source_file, line_number, line_number + 1, "#")
+        l.bullet("Applied: mllvm - 1", l.GREEN)
+    else:
+        l.bullet("Skipped: mllvm - 1", l.PURPLE)
+
+    # mllvm - 2
+    source_file = os.path.join(source_dir, "build", "config", "compiler", "BUILD.gn")
+
+    line_content = 'ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]'
+    line_number = f.get_file_line_number_with_content(
+        source_file, line_content, strip=True
+    )
+
+    if line_number:
+        f.prepend_to_file_line(source_file, line_number, "#")
+        l.bullet("Applied: mllvm - 2", l.GREEN)
+    else:
+        l.bullet("Skipped: mllvm - 2", l.PURPLE)
+
     # clang 12
     source_file = os.path.join(
         source_dir,

modules/wasm.py

@@ -187,7 +187,7 @@ def run_task_patch():
         "gcc_toolchain.gni",
     )
 
-    line_content = 'cc = "$prefix/clang"'
+    line_content = 'cc = "${prefix}/clang"'
     line_number = f.get_file_line_number_with_content(
         source_file, line_content, strip=True
     )
@@ -207,7 +207,7 @@ def run_task_patch():
         "gcc_toolchain.gni",
     )
 
-    line_content = 'cxx = "$prefix/clang++"'
+    line_content = 'cxx = "${prefix}/clang++"'
     line_number = f.get_file_line_number_with_content(
         source_file, line_content, strip=True
     )
@@ -321,27 +321,6 @@ def run_task_patch():
     else:
         l.bullet("Skipped: skia pthread", l.PURPLE)
 
-    # compiler bitwise
-    # obs: this is not required for emscripten 3.0.0+
-    source_file = os.path.join(
-        source_dir,
-        "build",
-        "config",
-        "compiler",
-        "BUILD.gn",
-    )
-
-    line_content = '"-Wno-bitwise-instead-of-logical",'
-    line_number = f.get_file_line_number_with_content(
-        source_file, line_content, strip=True
-    )
-
-    if line_number:
-        f.prepend_to_file_line(source_file, line_number, "#")
-        l.bullet("Applied: compiler bitwise", l.GREEN)
-    else:
-        l.bullet("Skipped: compiler bitwise", l.PURPLE)
-
     # copy files required
     l.colored("Copying required files...", l.YELLOW)