[arch-commits] Commit in skia-sharp/trunk (PKGBUILD fix-build.patch)

[Antonio Rojas]

    Date: Saturday, March 12, 2022 @ 11:43:58
  Author: arojas
Revision: 1149837

9437DD3815A7A9169E3D3946AFF5D95098BC6FF5 key removal

Added:
  skia-sharp/trunk/fix-build.patch
Modified:
  skia-sharp/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 ++++++++++----
 fix-build.patch |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-12 11:38:33 UTC (rev 1149836)
+++ PKGBUILD	2022-03-12 11:43:58 UTC (rev 1149837)
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=skia-sharp
-pkgver=2.80.2
+pkgver=2.80.3
 _major=80
 _minor=2
 _release=0
@@ -25,15 +25,17 @@
   python2
 )
 provides=(libSkiaSharp.so)
-_tag=2019706296585965cadbbe977ceab52a3a604fa5
+_tag=3e3bfb097092ef7379e3b1c7fd1255882ef72532
 source=(
   git+https://github.com/mono/SkiaSharp.git#tag=${_tag}
   git+https://chromium.googlesource.com/chromium/tools/depot_tools.git
   git+https://github.com/mono/skia.git
+  fix-build.patch
 )
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'c92794fb61288f2d558c7060fb0bd558d732ff4b5194998ff46a918867ae3e98')
 
 pkgver() {
   cd SkiaSharp
@@ -57,6 +59,8 @@
   pushd externals/depot_tools
   ln -sf /usr/bin/python2 python
   popd
+
+  patch -p1 -i ../fix-build.patch
 }
 
 build(){
@@ -63,10 +67,12 @@
   cd SkiaSharp/externals/skia
 
   export PATH="${srcdir}/SkiaSharp/externals/depot_tools:$PATH"
+  export CXXFLAGS="$CXXFLAGS -Wno-error=unused"
 
   CFLAGS="$CFLAGS \
     -I/usr/include/freetype2 \
-    -DSKIA_C_DLL"
+    -DSKIA_C_DLL \
+    -Wno-error=unused"
 
   extra_cflags=""
   for cflag in $CFLAGS; do

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2022-03-12 11:43:58 UTC (rev 1149837)
@@ -0,0 +1,24 @@
+--- SkiaSharp0/externals/skia/third_party/externals/harfbuzz/src/hb-subset-cff1.cc      2022-03-12 11:04:35.366861639 +0000
++++ SkiaSharp/externals/skia/third_party/externals/harfbuzz/src/hb-subset-cff1.cc       2022-03-12 11:18:46.870071130 +0000
+@@ -469,12 +469,11 @@
+   unsigned int plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
+   {
+     const Encoding *encoding = acc.encoding;
+-    unsigned int  size0, size1, supp_size;
++    unsigned int  size0, size1;
+     hb_codepoint_t  code, last_code = CFF_UNDEF_CODE;
+     hb_vector_t<hb_codepoint_t> supp_codes;
+ 
+     subset_enc_code_ranges.resize (0);
+-    supp_size = 0;
+     supp_codes.init ();
+ 
+     subset_enc_num_codes = plan->num_output_glyphs () - 1;
+@@ -509,7 +509,6 @@
+ 	  code_pair_t pair = { supp_codes[i], sid };
+ 	  subset_enc_supp_codes.push (pair);
+ 	}
+-	supp_size += SuppEncoding::static_size * supp_codes.length;
+       }
+     }
+     supp_codes.fini ();