Merge pull request #153 from paulocoutinhox/version-7169

updated to version 7243

Author: paulocoutinhox

.github/workflows/android.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { name: "Ubuntu", os: "ubuntu-20.04", target: "android" }
+          - { name: "Ubuntu", os: "ubuntu-24.04", target: "android" }
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/wasm.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { name: "Ubuntu", os: "ubuntu-20.04", target: "wasm" }
+          - { name: "Ubuntu", os: "ubuntu-24.04", target: "wasm" }
 
     steps:
       - uses: actions/checkout@v4
@@ -44,9 +44,14 @@ jobs:
           version: "1.10.0"
 
       - name: Install EMSDK
-        uses: mymindstorm/setup-emsdk@v14
-        with:
-          version: "3.1.64"
+        run: |
+          mkdir -p emsdk
+          cd emsdk
+          git clone https://github.com/emscripten-core/emsdk.git .
+          ./emsdk install 4.0.10
+          ./emsdk activate 4.0.10
+          echo "EMSDK=${{ github.workspace }}/emsdk" >> $GITHUB_ENV
+          echo "${{ github.workspace }}/emsdk:${{ github.workspace }}/emsdk/upstream/emscripten" >> $GITHUB_PATH
 
       - name: Install Node
         uses: actions/setup-node@v4

.gitignore

@@ -19,3 +19,6 @@ Thumbs.db
 __pycache__/
 *.py[cod]
 *$py.class
+
+# Virtual env
+.venv

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Paulo Coutinho
+Copyright (c) 2018-2025 Paulo Coutinho
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -116,7 +116,7 @@ Check tutorial here: [How to include files](docs/HOW_TO_INCLUDE_FILES.md)
 
 Support the continuous development of this project.
 
-<a href='https://ko-fi.com/paulocoutinho' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
+<a href='https://ko-fi.com/A0A412XEV' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi2.png?v=6' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
 
 ## My other projects
 
@@ -129,4 +129,4 @@ This license informations is about this personal project, not the Google PDFium
 
 [MIT](http://opensource.org/licenses/MIT)
 
-Copyright (c) 2018-2024, Paulo Coutinho
+Copyright (c) 2018-2025, Paulo Coutinho

docker/android/Dockerfile

@@ -54,7 +54,7 @@ RUN mkdir /build
 WORKDIR /build
 RUN gclient config --custom-var checkout_configuration=minimal --unmanaged https://pdfium.googlesource.com/pdfium.git
 RUN echo "target_os = [ 'android' ]" >> .gclient
-RUN gclient sync -r origin/chromium/6694 --no-history --shallow
+RUN gclient sync -r origin/chromium/7243 --no-history --shallow
 
 # pdfium reset and clean directories
 RUN git -C /build/pdfium reset --hard
@@ -80,7 +80,7 @@ RUN apt-get install -o APT::Immediate-Configure=false -f apt \
     && apt-get -f install \
     && dpkg --configure -a \
     && apt-get -y dist-upgrade \
-    && echo n | ./build/install-build-deps.sh --android \
+    && echo n | ./build/install-build-deps.sh --android || true \
     && rm -rf /build
 
 # ninja

docker/wasm/Dockerfile

@@ -37,8 +37,8 @@ ENV PATH=${PATH}:/opt/depot-tools
 RUN mkdir /build
 WORKDIR /build
 RUN gclient config --custom-var checkout_configuration=minimal --unmanaged https://pdfium.googlesource.com/pdfium.git
-RUN echo "target_os = [ 'wasm' ]" >> .gclient
-RUN gclient sync -r origin/chromium/6694 --no-history --shallow
+RUN echo "target_os = [ 'emscripten' ]" >> .gclient
+RUN gclient sync -r origin/chromium/7243 --no-history --shallow
 
 # pdfium reset and clean directories
 RUN git -C /build/pdfium reset --hard
@@ -60,11 +60,8 @@ RUN git status
 # system dependencies
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
-RUN apt-get install -o APT::Immediate-Configure=false -f apt \
-    && apt-get -f install \
-    && dpkg --configure -a \
-    && apt-get -y dist-upgrade \
-    && echo n | ./build/install-build-deps.sh \
+RUN apt update -y \
+    && echo n | ./build/install-build-deps.sh || true \
     && rm -rf /build
 
 # ninja
@@ -78,16 +75,16 @@ RUN pip3 install setuptools docopt pygemstones
 RUN mkdir /emsdk
 WORKDIR /emsdk
 RUN git clone https://github.com/emscripten-core/emsdk.git .
-RUN ./emsdk install 3.1.64
-RUN ./emsdk activate 3.1.64
+RUN ./emsdk install 4.0.10
+RUN ./emsdk activate 4.0.10
 ENV PATH="${PATH}:/emsdk:/emsdk/upstream/emscripten"
 
 # cache system libraries
 RUN bash -c 'echo "int main() { return 0; }" > /tmp/main.cc'
 RUN bash -c 'source /emsdk/emsdk_env.sh && em++ -s USE_ZLIB=1 -s USE_LIBJPEG=1 -s USE_PTHREADS=1 -s ASSERTIONS=1 -o /tmp/main.html /tmp/main.cc'
 
 # nodejs and npm
-RUN curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install -g npm@latest
 

docs/BUILD_WASM.md

@@ -14,7 +14,7 @@
 ```python3 make.py patch-wasm```
 
 6. PDFium Linux dependencies
-```./build/wasm32/pdfium/build/install-build-deps.sh```
+```./build/emscripten/pdfium/build/install-build-deps.sh```
 
 7. Compile:
 ```python3 make.py build-wasm```

modules/common.py

@@ -167,11 +167,10 @@ def get_build_args(
         # static lib
         if not shared:
             args.append("pdf_is_complete_lib=true")
-    elif target_os.startswith("wasm"):
+    elif target_os.startswith("emscripten"):
         args.append("pdf_is_complete_lib=true")
         args.append("is_clang=false")
         args.append("use_custom_libcxx=false")
-        args.append("use_sysroot=false")
 
     if libc == "musl":
         args.append("is_musl=true")

modules/config.py

@@ -3,13 +3,13 @@
 task = ""
 
 # pdfium
-pdfium_git_branch = "chromium/6694"
-# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/6694
+pdfium_git_branch = "chromium/7243"
+# ^ ref: https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/7243
 # 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.64"
+emsdk_version = "4.0.10"
 # OBS 1: don't forget change in wasm docker file (docker/wasm/Dockerfile)
 
 # macos
@@ -78,5 +78,5 @@
 configurations_wasm = ["release"]
 shared_lib_wasm = False
 targets_wasm = [
-    {"target_os": "wasm32", "target_cpu": "wasm", "pdfium_os": "wasm"},
+    {"target_os": "emscripten", "target_cpu": "wasm", "pdfium_os": "emscripten"},
 ]