[arch-commits] Commit in skia-sharp/trunk (3 files)

[Maxime Gauduin]

    Date: Tuesday, August 9, 2022 @ 16:53:53
  Author: alucryd
Revision: 1264023

upgpkg: skia-sharp 2.88.0-1

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

----------------------------------+
 PKGBUILD                         |   35 +++++++++++++++--------------------
 fix-build.patch                  |   24 ------------------------
 skia-sharp-missing-include.patch |   12 ++++++++++++
 3 files changed, 27 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-09 16:53:31 UTC (rev 1264022)
+++ PKGBUILD	2022-08-09 16:53:53 UTC (rev 1264023)
@@ -1,9 +1,9 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=skia-sharp
-pkgver=2.80.3
-_major=80
-_minor=2
+pkgver=2.88.0
+_major=88
+_minor=0
 _release=0
 pkgrel=1
 pkgdesc='The Skia 2D Graphics library from Google exposed to .NET languages and runtimes across the board'
@@ -15,6 +15,7 @@
   fontconfig
   libfreetype.so
   libjpeg-turbo
+  libheif
   libpng
   libwebp
   zlib
@@ -22,30 +23,28 @@
 makedepends=(
   clang
   git
-  python2
+  python
 )
 provides=(libSkiaSharp.so)
-_tag=3e3bfb097092ef7379e3b1c7fd1255882ef72532
+_tag=2e12735359928ead60dd08cdf0b983c4e3d4dc56
 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
+  skia-sharp-missing-include.patch
 )
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'c92794fb61288f2d558c7060fb0bd558d732ff4b5194998ff46a918867ae3e98')
+b2sums=('SKIP'
+        'SKIP'
+        'SKIP'
+        '8b4c33381f22225557fceae587fd1b8f7ac6fc75814fbb27db6eb6b0c772825f87d779d8e3d38849603a4f6c7c5ec7cdb88f34ecc58c0e0f83f1890b730b9df7')
 
 pkgver() {
   cd SkiaSharp
-
-  git describe --tags | sed 's/^v//'
+  git describe --tags | sed 's/^v//; s/-preview.*//'
 }
 
 prepare() {
   cd SkiaSharp
-
   for submodule in externals/{depot_tools,skia}; do
     git submodule init ${submodule}
     git config submodule.${submodule}.url ../${submodule#*/}
@@ -53,14 +52,9 @@
   done
 
   pushd externals/skia
-  python2 tools/git-sync-deps
+  patch -Np1 -i ../../../skia-sharp-missing-include.patch
+  python tools/git-sync-deps
   popd
-
-  pushd externals/depot_tools
-  ln -sf /usr/bin/python2 python
-  popd
-
-  patch -p1 -i ../fix-build.patch
 }
 
 build(){
@@ -91,6 +85,7 @@
             skia_enable_gpu=true \
             skia_enable_tools=false \
             skia_use_dng_sdk=true \
+            skia_use_heif=true \
             skia_use_icu=false \
             skia_use_piex=true \
             skia_use_sfntly=false \

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2022-08-09 16:53:31 UTC (rev 1264022)
+++ fix-build.patch	2022-08-09 16:53:53 UTC (rev 1264023)
@@ -1,24 +0,0 @@
---- 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 ();

Added: skia-sharp-missing-include.patch
===================================================================
--- skia-sharp-missing-include.patch	                        (rev 0)
+++ skia-sharp-missing-include.patch	2022-08-09 16:53:53 UTC (rev 1264023)
@@ -0,0 +1,12 @@
+diff '--color=auto' -rupN skia.orig/src/utils/SkParseColor.cpp skia/src/utils/SkParseColor.cpp
+--- skia.orig/src/utils/SkParseColor.cpp	2022-08-09 18:22:40.804164408 +0200
++++ skia/src/utils/SkParseColor.cpp	2022-08-09 18:23:32.245670523 +0200
+@@ -8,6 +8,8 @@
+ 
+ #include "include/utils/SkParse.h"
+ 
++#include <iterator>
++
+ static constexpr const char* gColorNames[] = {
+     "aliceblue",
+     "antiquewhite",