Commit af46c5cc authored by Francesco Gazzetta's avatar Francesco Gazzetta
Browse files

skia: 124-unstable-2024-05-22 -> 129-unstable-2024-09-18

parent a11ec092

pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp

index 7d6fd62..2cca01d 100644

--- a/src/ports/SkFontMgr_fontconfig.cpp

+++ b/src/ports/SkFontMgr_fontconfig.cpp

@@ -16,6 +16,7 @@

 #include "include/core/SkString.h"

 #include "include/core/SkTypeface.h"

 #include "include/core/SkTypes.h"

+#include "include/ports/SkFontMgr_fontconfig.h"

 #include "include/private/base/SkDebug.h"

 #include "include/private/base/SkMutex.h"

 #include "include/private/base/SkTArray.h"

pkgs/by-name/sk/skia/package.nix

+3 −10
Original line number Diff line number Diff line
@@ -26,22 +26,15 @@ stdenv.mkDerivation (finalAttrs: { 
  # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md

  # or https://chromiumdash.appspot.com/releases

  # plus date of the tip of the corresponding chrome/m$version branch

  version = "124-unstable-2024-05-22";

  version = "129-unstable-2024-09-18";



  src = fetchgit {

    url = "https://skia.googlesource.com/skia.git";

    # Tip of the chrome/m$version branch

    rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826";

    hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=";

    rev = "dda581d538cb6532cda841444e7b4ceacde01ec9";

    hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals=";

  };



  patches = [

    # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia

    # does not export it.

    # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/?

    ./export-SkFontMgr_New_FontConfig.patch

  ];



  postPatch = ''

    # System zlib detection bug workaround

    substituteInPlace BUILD.gn \