[arch-commits] Commit in electron14/trunk (PKGBUILD chromium-93-pdfium-include.patch)

[Nicola Squartini]

    Date: Friday, November 26, 2021 @ 10:58:31
  Author: tensor5
Revision: 1054848

upgpkg: electron14 14.2.1-1

Added:
  electron14/trunk/chromium-93-pdfium-include.patch
Modified:
  electron14/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   10 ++--
 chromium-93-pdfium-include.patch |   87 +++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-26 10:30:43 UTC (rev 1054847)
+++ PKGBUILD	2021-11-26 10:58:31 UTC (rev 1054848)
@@ -1,12 +1,12 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 _use_suffix=1
-pkgver=14.2.0
-_commit=c2b3c974e07a9743ab758cb98db323dceddd6903
+pkgver=14.2.1
+_commit=71cd259b7bf1fb246399932e63f8ebcc2f02a05a
 _chromiumver=93.0.4577.82
 _gcc_patchset=6
 # shellcheck disable=SC2034
-pkgrel=2
+pkgrel=1
 
 _major_ver=${pkgver%%.*}
 if [[ ${_use_suffix} != 0 ]]; then
@@ -58,6 +58,7 @@
         'replace-blacklist-with-ignorelist.patch'
         'sql-make-VirtualCursor-standard-layout-type.patch'
         'chromium-93-ffmpeg-4.4.patch'
+        'chromium-93-pdfium-include.patch'
         'chromium-harfbuzz-3.0.0.patch'
         'skia-harfbuzz-3.0.0.patch'
        )
@@ -78,6 +79,7 @@
             'd3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35'
             'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
             '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
+            '7c0c47f4b67d96515bcfa68ffd34d515d03f1e9e41c063459f39e4169de0324c'
             '7ce947944a139e66774dfc7249bf7c3069f07f83a0f1b2c1a1b14287a7e15928'
             'dae11dec5088eb1b14045d8c9862801a342609c15701d7c371e1caccf46e1ffd'
            )
@@ -169,7 +171,6 @@
 
   echo "Applying local patches..."
   # Fixes for building with libstdc++ instead of libc++
-  patch -Np1 -i ../patches/chromium-93-pdfium-include.patch
   patch -Np1 -i ../patches/chromium-90-ruy-include.patch
   patch -Np1 -i ../patches/chromium-93-HashPasswordManager-include.patch
   patch -Np1 -i ../patches/chromium-93-BluetoothLowEnergyScanFilter-include.patch
@@ -178,6 +179,7 @@
   patch -Np1 -i ../patches/chromium-93-ScopedTestDialogAutoConfirm-include.patch
 
   patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
+  patch -Np1 -i ../chromium-93-pdfium-include.patch
   patch -Np1 -i ../chromium-harfbuzz-3.0.0.patch
   patch -Np1 -d third_party/skia <../skia-harfbuzz-3.0.0.patch
   patch -Np1 -i ../linux-sandbox-syscall-broker-use-struct-kernel_stat.patch

Added: chromium-93-pdfium-include.patch
===================================================================
--- chromium-93-pdfium-include.patch	                        (rev 0)
+++ chromium-93-pdfium-include.patch	2021-11-26 10:58:31 UTC (rev 1054848)
@@ -0,0 +1,87 @@
+--- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
++++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
+@@ -7,6 +7,7 @@
+ #include "core/fxcodec/jpeg/jpegmodule.h"
+ 
+ #include <setjmp.h>
++#include <string.h>
+ 
+ #include <memory>
+ #include <utility>
+--- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
++++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxcodec/jpx/cjpx_decoder.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ #include <limits>
+ #include <utility>
+--- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
++++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/cfx_cliprgn.h"
+ 
++#include <string.h>
++
+ #include <utility>
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_bitmapcomposer.h"
+ 
++#include <string.h>
++
+ #include "core/fxcrt/fx_safe_types.h"
+ #include "core/fxge/cfx_cliprgn.h"
+ #include "core/fxge/dib/cfx_dibitmap.h"
+--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_bitmapstorer.h"
+ 
++#include <string.h>
++
+ #include <utility>
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+--- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_dibbase.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ #include <memory>
+ #include <utility>
+--- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_dibitmap.h"
+ 
++#include <string.h>
++
+ #include <limits>
+ #include <memory>
+ #include <utility>
+--- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
++++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "core/fxge/dib/cfx_scanlinecompositor.h"
+ 
++#include <string.h>
++
+ #include <algorithm>
+ 
+ #include "core/fxge/dib/fx_dib.h"