sourcebuild: sync patches with pdfium-binaries

docs/devel/changelog_staging.md

@@ -7,6 +7,7 @@
 - `PdfPage.get_objects()`: Don't register pageobjects as children, because they don't need to be closed by the caller when part of a page. This avoids excessive caching of weakrefs that are not cleaned up with the object they refer to.
 - Fixed another dotted filepath blunder in the `extract-images` CLI. (The `PdfImage.extract()` API is not affected this time.)
 - Fixed installation with reference bindings (`PDFIUM_BINDINGS=reference`) by adding a missing `mkdir` call. (In older versions, this can be worked around by unpacking the sdist and creating the missing directory manually before installation.)
+- Fixed sourcebuild on windows by syncing patches with pdfium-binaries.
 - Updated test expectations: due to changes in pdfium, some numbers are now slightly different.
 - Fixed conda packaging: It is now required to explicitly specify `-c defaults` with `--override-channels`, presumably due to an upstream change.
 - Autorelease: Swapped default condition for minor/patch update, as pypdfium2 changes are likely more API-significant than pdfium updates. Added ability for manual override.

setupsrc/pypdfium2_setup/build_pdfium.py

@@ -26,7 +26,6 @@
     (PatchDir/"public_headers.patch", PDFiumDir),
 ]
 PatchesWindows = [
-    (PatchDir/"win"/"pdfium.patch", PDFiumDir),
     (PatchDir/"win"/"build.patch", PDFiumDir/"build"),
 ]
 

sourcebuild/patches/win/build.patch

@@ -1,13 +1,13 @@
 diff --git a/toolchain/win/toolchain.gni b/toolchain/win/toolchain.gni
-index 968a4a20e..536295050 100644
+index abb7d6228..3b74bda76 100644
 --- a/toolchain/win/toolchain.gni
 +++ b/toolchain/win/toolchain.gni
-@@ -235,7 +235,7 @@ template("single_msvc_toolchain") {
+@@ -259,7 +259,7 @@ template("msvc_toolchain") {
      }
 
      tool("rc") {
 -      command = "\"$python_path\" $_tool_wrapper_path rc-wrapper $env rc.exe /nologo $sys_include_flags{{defines}} {{include_dirs}} /fo{{output}} {{source}}"
-+      command = "rc.exe /nologo $sys_include_flags{{defines}} {{include_dirs}} /fo{{output}} {{source}}"
++      command = "rc.exe /nologo $sys_include_flags{{defines}} {{include_dirs}} /fo{{output}} /dENV=$env {{source}}"
        depsformat = "msvc"
        outputs = [ "$object_subdir/{{source_name_part}}.res" ]
        description = "RC {{output}}"