chromium/6555 for darwin

espresso3389 · Jun 26, 2024 · 1c0c30d · 1c0c30d
1 parent 2fdd1f4
commit 1c0c30d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/darwin/pdfium/build-config.sh b/darwin/pdfium/build-config.sh
@@ -5,8 +5,8 @@ if [ "$2" = "" ]; then
   exit 1
 fi
 
-# https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/6517
-LAST_KNOWN_GOOD_COMMIT=a80a8cbfdf7fa64adb743a9ca203124785656ca3
+# https://pdfium.googlesource.com/pdfium/+/refs/heads/chromium/6555
+LAST_KNOWN_GOOD_COMMIT=5a6a8741b0e111a6b5bd9ab4e1036377c98885dc
 
 SCRIPT_DIR=$(cd $(dirname $0) && pwd)
 
@@ -93,22 +93,22 @@ fi
 if [[ "$TARGET_OS" == "ios" ]]; then
   # (cd $PDFIUM_SRCDIR && git diff > ../../../patches/ios/pdfium.patch)
   pushd $PDFIUM_SRCDIR
-  git apply $SCRIPT_DIR/patches/ios/pdfium.patch
+  git apply --reject --whitespace=fix $SCRIPT_DIR/patches/ios/pdfium.patch
   popd
   # (cd $PDFIUM_SRCDIR/third_party/libjpeg_turbo && git diff > ../../../../../patches/ios/libjpeg_turbo.patch)
   pushd $PDFIUM_SRCDIR/third_party/libjpeg_turbo/
-  git apply $SCRIPT_DIR/patches/ios/libjpeg_turbo.patch
+  git apply --reject --whitespace=fix $SCRIPT_DIR/patches/ios/libjpeg_turbo.patch
   popd
 fi
 
 if [[ "$TARGET_OS" == "mac" ]]; then
   # (cd $PDFIUM_SRCDIR && git diff > ../../../patches/macos/pdfium.patch)
   pushd $PDFIUM_SRCDIR
-  git apply $SCRIPT_DIR/patches/macos/pdfium.patch
+  git apply --reject --whitespace=fix $SCRIPT_DIR/patches/macos/pdfium.patch
   popd
   # (cd $PDFIUM_SRCDIR/build && git diff > ../../../../patches/macos/build-config.patch)
   pushd $PDFIUM_SRCDIR/build
-  git apply $SCRIPT_DIR/patches/macos/build-config.patch
+  git apply --reject --whitespace=fix $SCRIPT_DIR/patches/macos/build-config.patch
   popd
 fi
 

diff --git a/darwin/pdfium/patches/macos/pdfium.patch b/darwin/pdfium/patches/macos/pdfium.patch
@@ -1,18 +1,3 @@
-diff --git a/BUILD.gn b/BUILD.gn
-index 42a2c73db..a6002b962 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -228,6 +228,10 @@ config("pdfium_common_config") {
-       "-Wno-return-type",
-     ]
-   }
-+
-+  cflags += [
-+    "-Wno-unknown-warning-option"
-+  ]
- }
-
- config("pdfium_implementation_config") {
 diff --git a/public/fpdfview.h b/public/fpdfview.h
 index c066e6cb4..fbfcd9670 100644
 --- a/public/fpdfview.h

diff --git a/example/viewer/macos/Podfile.lock b/example/viewer/macos/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - pdfrx (0.0.1):
+  - pdfrx (0.0.2):
     - Flutter
     - FlutterMacOS
   - url_launcher_macos (0.0.1):
@@ -27,10 +27,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  pdfrx: 79d416d7c08f5cd60547aa7351f07ccec9544000
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  pdfrx: ed3f6b74ed1d9dec328d5d4b65d4b5fde02aef02
   url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2
diff --git a/example/viewer/macos/Runner.xcodeproj/project.pbxproj b/example/viewer/macos/Runner.xcodeproj/project.pbxproj
@@ -259,7 +259,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {

diff --git a/example/viewer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/viewer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"