download.lst | 4 - external/skia/0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch | 13 ---- external/skia/C4100warning.patch.1 | 31 ++++++++++ external/skia/UnpackedTarball_skia.mk | 1 external/skia/make-api-visible.patch.1 | 20 ------ 5 files changed, 34 insertions(+), 35 deletions(-)
New commits: commit 3ac469795c7c06189e9cbbf00c9d1d1e719531fe Author: Xisco Fauli <[email protected]> AuthorDate: Thu Dec 18 15:44:59 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Dec 19 00:54:07 2025 +0100 skia: upgrade to m144 Add external/skia/C4100warning.patch.1 to fix E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(92): error C2220: the following warning is treated as an error E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(92): warning C4100: 'window': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(93): warning C4100: 'c': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(95): warning C4100: 'y': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(95): warning C4100: 'x': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(96): warning C4100: 'y': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(96): warning C4100: 'x': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(96): warning C4100: 'delta': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(97): warning C4100: 'y': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(97): warning C4100: 'x': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(97): warning C4100: 'owner': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(99): warning C4100: 'state': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(100): warning C4100: 'y': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(100): warning C4100: 'x': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(100): warning C4100: 'scale': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(100): warning C4100: 'state': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(101): warning C4100: 'stateValue': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(101): warning C4100: 'stateName': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(104): warning C4100: 'height': unreferenced parameter E:\jenkins\workspace\gerrit_windows_wsl\workdir\UnpackedTarball\skia ools/sk_app/Window.h(104): warning C4100: 'width': unreferenced parameter Done following the steps in external/skia/README Change-Id: If6d60484b36f8f90cf899078426586cf0c382daa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195856 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/download.lst b/download.lst index 05cf1b19d925..78d63ffe1eac 100644 --- a/download.lst +++ b/download.lst @@ -652,8 +652,8 @@ RHINO_TARBALL := rhino-1.7.15.1.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 49792e2b37869180e3ed3f0291ad72d2b556c0e0655b8b59aa3bdf53d75c6ffb -SKIA_TARBALL := skia-m143-da51f0d60ea2b14e845a823dc11b405dbeef42d8.tar.xz +SKIA_SHA256SUM := 31ad00946dd858f4d069173e411162cd81e72646e274fb2cba0a55ca7872be78 +SKIA_TARBALL := skia-m144-ee20d565acb08dece4a32e3f209cdd41119015ca.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch b/external/skia/0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch index 07640b3f24d2..c1427c2e88da 100644 --- a/external/skia/0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch +++ b/external/skia/0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch @@ -25,22 +25,9 @@ reference scalar semantics and unblocks testing of debug builds. Change-Id: I45e43a7a7e6d50b4c32c5e69a6d1d7de341eccf1 Signed-off-by: Bingwu Zhang <[email protected]> --- - AUTHORS | 1 + src/opts/SkRasterPipeline_opts.h | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -diff --git a/AUTHORS b/AUTHORS -index 03d0ac82a412..ef0fdfa550d7 100755 ---- a/AUTHORS -+++ b/AUTHORS -@@ -104,6 +104,7 @@ Sylvestre Ledru <[email protected]> - The Chromium Authors <*@chromium.org> - Thiago Fransosi Farina <[email protected]> - Vibe Inc <*@vibe.us> -+WANG Xuerui <[email protected]> - William Candillon <[email protected]> - Wonmin Park <[email protected]> - Yandex LLC <*@yandex-team.ru> diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h index 27a00474e07b..42e9cd8aa229 100644 --- a/src/opts/SkRasterPipeline_opts.h diff --git a/external/skia/C4100warning.patch.1 b/external/skia/C4100warning.patch.1 new file mode 100644 index 000000000000..cbe78fe14a6c --- /dev/null +++ b/external/skia/C4100warning.patch.1 @@ -0,0 +1,31 @@ +--- skia/tools/sk_app/Window.h 2025-12-18 18:13:35.508008948 +0100 ++++ skia/tools/sk_app/Window.h 2025-12-18 18:14:36.723788086 +0100 +@@ -89,19 +89,19 @@ + + // return value of 'true' means 'I have handled this event' + virtual void onBackendCreated() {} +- virtual void onAttach(Window* window) {} +- virtual bool onChar(SkUnichar c, skui::ModifierKey) { return false; } ++ virtual void onAttach(Window*) {} ++ virtual bool onChar(SkUnichar, skui::ModifierKey) { return false; } + virtual bool onKey(skui::Key, skui::InputState, skui::ModifierKey) { return false; } +- virtual bool onMouse(int x, int y, skui::InputState, skui::ModifierKey) { return false; } +- virtual bool onMouseWheel(float delta, int x, int y, skui::ModifierKey) { return false; } +- virtual bool onTouch(intptr_t owner, skui::InputState, float x, float y) { return false; } ++ virtual bool onMouse(int, int, skui::InputState, skui::ModifierKey) { return false; } ++ virtual bool onMouseWheel(float, int, int, skui::ModifierKey) { return false; } ++ virtual bool onTouch(intptr_t, skui::InputState, float, float) { return false; } + // Platform-detected gesture events +- virtual bool onFling(skui::InputState state) { return false; } +- virtual bool onPinch(skui::InputState state, float scale, float x, float y) { return false; } +- virtual void onUIStateChanged(const SkString& stateName, const SkString& stateValue) {} ++ virtual bool onFling(skui::InputState) { return false; } ++ virtual bool onPinch(skui::InputState, float, float, float) { return false; } ++ virtual void onUIStateChanged(const SkString&, const SkString&) {} + virtual void onPrePaint() {} + virtual void onPaint(SkSurface*) {} +- virtual void onResize(int width, int height) {} ++ virtual void onResize(int, int) {} + + private: + friend class Window; diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 692eba0130e5..a4d8e71e3b32 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -44,6 +44,7 @@ skia_patches := \ 0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \ msvc-unknown-attributes.patch.1 \ fix-semaphore-include.patch.1 \ + C4100warning.patch.1 \ ifneq ($(MSYSTEM),) # use binary flag so patch from git-bash won't choke on mixed line-endings in patches diff --git a/external/skia/make-api-visible.patch.1 b/external/skia/make-api-visible.patch.1 index 6285b4f8f9b5..0f45f020a11e 100644 --- a/external/skia/make-api-visible.patch.1 +++ b/external/skia/make-api-visible.patch.1 @@ -76,26 +76,6 @@ diff -ur skia.org/tools/window/unix/GaneshVulkanWindowContext_unix.h skia/tools/ } // namespace skwindow #endif -diff -ur skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h ---- skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h 2024-10-12 15:57:21 -+++ skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h 2024-10-12 15:58:48 -@@ -8,6 +8,7 @@ - #ifndef GraphiteDawnVulkanWindowContext_unix_DEFINED - #define GraphiteDawnVulkanWindowContext_unix_DEFINED - -+#include "include/private/base/SkAPI.h" - #include <memory> - - namespace skwindow { -@@ -15,7 +16,7 @@ - class DisplayParams; - struct XlibWindowInfo; - --std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&, -+SK_API std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&, - std::unique_ptr<const DisplayParams>); - } // namespace skwindow - diff -ur skia.org/tools/window/unix/RasterWindowContext_unix.h skia/tools/window/unix/RasterWindowContext_unix.h --- skia.org/tools/window/unix/RasterWindowContext_unix.h 2024-10-12 15:57:21 +++ skia/tools/window/unix/RasterWindowContext_unix.h 2024-10-12 15:58:48
