Date: Tuesday, August 9, 2022 @ 16:54:04 Author: alucryd Revision: 1264025
archrelease: copy trunk to community-x86_64 Added: skia-sharp/repos/community-x86_64/PKGBUILD (from rev 1264024, skia-sharp/trunk/PKGBUILD) skia-sharp/repos/community-x86_64/skia-sharp-missing-include.patch (from rev 1264024, skia-sharp/trunk/skia-sharp-missing-include.patch) Deleted: skia-sharp/repos/community-x86_64/PKGBUILD skia-sharp/repos/community-x86_64/fix-build.patch ----------------------------------+ PKGBUILD | 219 +++++++++++++++++-------------------- fix-build.patch | 24 ---- skia-sharp-missing-include.patch | 12 ++ 3 files changed, 118 insertions(+), 137 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-08-09 16:53:53 UTC (rev 1264024) +++ PKGBUILD 2022-08-09 16:54:04 UTC (rev 1264025) @@ -1,113 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> - -pkgname=skia-sharp -pkgver=2.80.3 -_major=80 -_minor=2 -_release=0 -pkgrel=1 -pkgdesc='The Skia 2D Graphics library from Google exposed to .NET languages and runtimes across the board' -arch=(x86_64) -url=https://github.com/mono/SkiaSharp -license=(MIT) -depends=( - expat - fontconfig - libfreetype.so - libjpeg-turbo - libpng - libwebp - zlib -) -makedepends=( - clang - git - python2 -) -provides=(libSkiaSharp.so) -_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' - 'c92794fb61288f2d558c7060fb0bd558d732ff4b5194998ff46a918867ae3e98') - -pkgver() { - cd SkiaSharp - - git describe --tags | sed 's/^v//' -} - -prepare() { - cd SkiaSharp - - for submodule in externals/{depot_tools,skia}; do - git submodule init ${submodule} - git config submodule.${submodule}.url ../${submodule#*/} - git submodule update ${submodule} - done - - pushd externals/skia - python2 tools/git-sync-deps - popd - - pushd externals/depot_tools - ln -sf /usr/bin/python2 python - popd - - patch -p1 -i ../fix-build.patch -} - -build(){ - 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 \ - -Wno-error=unused" - - extra_cflags="" - for cflag in $CFLAGS; do - extra_cflags+="\"${cflag}\"," - done - extra_ldflags="" - for ldflag in $LDFLAGS; do - extra_ldflags+="\"${ldflag}\"," - done - - bin/gn gen out \ - --args="target_os=\"linux\" \ - target_cpu=\"x64\" \ - cc=\"clang\" \ - cxx=\"clang++\" \ - extra_cflags=[${extra_cflags}] \ - extra_ldflags=[${extra_ldflags}] \ - skia_enable_gpu=true \ - skia_enable_tools=false \ - skia_use_dng_sdk=true \ - skia_use_icu=false \ - skia_use_piex=true \ - skia_use_sfntly=false \ - is_component_build=false \ - is_debug=false \ - is_official_build=true \ - linux_soname_version=\"${_major}.${_minor}.${_release}\"" - ninja -C out -} - -package() { - install -Dm 755 SkiaSharp/externals/skia/out/libSkiaSharp.so.${_major}.${_minor}.${_release} -t "${pkgdir}"/usr/lib/ - ln -s libSkiaSharp.so.${_major}.${_minor}.${_release} "${pkgdir}"/usr/lib/libSkiaSharp.so.${_major} - ln -s libSkiaSharp.so.${_major} "${pkgdir}"/usr/lib/libSkiaSharp.so - install -Dm 644 SkiaSharp/LICENSE.md -t "${pkgdir}"/usr/share/licenses/skia-sharp/ -} - -# vim: ts=2 sw=2 et: Copied: skia-sharp/repos/community-x86_64/PKGBUILD (from rev 1264024, skia-sharp/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-08-09 16:54:04 UTC (rev 1264025) @@ -0,0 +1,106 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> + +pkgname=skia-sharp +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' +arch=(x86_64) +url=https://github.com/mono/SkiaSharp +license=(MIT) +depends=( + expat + fontconfig + libfreetype.so + libjpeg-turbo + libheif + libpng + libwebp + zlib +) +makedepends=( + clang + git + python +) +provides=(libSkiaSharp.so) +_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 + skia-sharp-missing-include.patch +) +b2sums=('SKIP' + 'SKIP' + 'SKIP' + '8b4c33381f22225557fceae587fd1b8f7ac6fc75814fbb27db6eb6b0c772825f87d779d8e3d38849603a4f6c7c5ec7cdb88f34ecc58c0e0f83f1890b730b9df7') + +pkgver() { + cd SkiaSharp + 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#*/} + git submodule update ${submodule} + done + + pushd externals/skia + patch -Np1 -i ../../../skia-sharp-missing-include.patch + python tools/git-sync-deps + popd +} + +build(){ + cd SkiaSharp/externals/skia + + export PATH="${srcdir}/SkiaSharp/externals/depot_tools:$PATH" + + CFLAGS="$CFLAGS \ + -I/usr/include/freetype2 \ + -DSKIA_C_DLL" + + extra_cflags="" + for cflag in $CFLAGS; do + extra_cflags+="\"${cflag}\"," + done + extra_ldflags="" + for ldflag in $LDFLAGS; do + extra_ldflags+="\"${ldflag}\"," + done + + bin/gn gen out \ + --args="target_os=\"linux\" \ + target_cpu=\"x64\" \ + cc=\"clang\" \ + cxx=\"clang++\" \ + extra_cflags=[${extra_cflags}] \ + extra_ldflags=[${extra_ldflags}] \ + 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 \ + is_component_build=false \ + is_debug=false \ + is_official_build=true \ + linux_soname_version=\"${_major}.${_minor}.${_release}\"" + ninja -C out +} + +package() { + install -Dm 755 SkiaSharp/externals/skia/out/libSkiaSharp.so.${_major}.${_minor}.${_release} -t "${pkgdir}"/usr/lib/ + ln -s libSkiaSharp.so.${_major}.${_minor}.${_release} "${pkgdir}"/usr/lib/libSkiaSharp.so.${_major} + ln -s libSkiaSharp.so.${_major} "${pkgdir}"/usr/lib/libSkiaSharp.so + install -Dm 644 SkiaSharp/LICENSE.md -t "${pkgdir}"/usr/share/licenses/skia-sharp/ +} + +# vim: ts=2 sw=2 et: Deleted: fix-build.patch =================================================================== --- fix-build.patch 2022-08-09 16:53:53 UTC (rev 1264024) +++ fix-build.patch 2022-08-09 16:54:04 UTC (rev 1264025) @@ -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 (); Copied: skia-sharp/repos/community-x86_64/skia-sharp-missing-include.patch (from rev 1264024, skia-sharp/trunk/skia-sharp-missing-include.patch) =================================================================== --- skia-sharp-missing-include.patch (rev 0) +++ skia-sharp-missing-include.patch 2022-08-09 16:54:04 UTC (rev 1264025) @@ -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",