configure.ac | 2 +- download.lst | 12 ++++++------ vcl/inc/skia/gdiimpl.hxx | 16 ++++++++-------- vcl/skia/gdiimpl.cxx | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit d821595c26af057eb26de033b42d72c3d0b88fac Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 9 22:13:17 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:46:09 2026 +0100 sqlite: upgrade to 3.51.2 Downloaded from https://sqlite.org/2026/sqlite-amalgamation-3510200.zip Change-Id: I505c2ea4e8e141c8a421d6689ac47e147576ba1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196946 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 8eee532e3e1b6c6c022168e671e3bba78754af17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196957 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/download.lst b/download.lst index b5826cd89206..07ecb5285060 100644 --- a/download.lst +++ b/download.lst @@ -730,8 +730,8 @@ SKIA_TARBALL := skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -SQLITE3_SHA256SUM := 84a85d6a1b920234349f01720912c12391a4f0cb5cb998087e641dee3ef8ef2e -SQLITE3_TARBALL := sqlite-amalgamation-3510100.zip +SQLITE3_SHA256SUM := 6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec +SQLITE3_TARBALL := sqlite-amalgamation-3510200.zip # three static lines # so that git cherry-pick # will not run into conflicts commit 78789c82d01a3a484062530c3ae847507e31aa2d Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 9 10:11:05 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:46:09 2026 +0100 ICU: upgrade to 78.2 Downloaded from https://github.com/unicode-org/icu/releases/tag/release-78.2 Change-Id: I85222049ebc587ae45560088744fcae68b66ee29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196905 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 2f2817b003d8be6e443196ac94c5711e66ca7438) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196949 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/configure.ac b/configure.ac index 8b9c2bee789d..d60e4203e3cd 100644 --- a/configure.ac +++ b/configure.ac @@ -11572,7 +11572,7 @@ dnl =================================================================== dnl Check for system icu dnl =================================================================== ICU_MAJOR=78 -ICU_MINOR=1 +ICU_MINOR=2 ICU_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common" ICU_LIBS_internal="-L${WORKDIR}/UnpackedTarball/icu/source/lib -licuuc" libo_CHECK_SYSTEM_MODULE([icu],[ICU],[icu-i18n >= 66]) diff --git a/download.lst b/download.lst index 379bce4ffb5d..b5826cd89206 100644 --- a/download.lst +++ b/download.lst @@ -420,10 +420,10 @@ IACCESSIBLE2_TARBALL := IAccessible2-1.3+git20231013.3d8c7f0.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -ICU_SHA256SUM := 6217f58ca39b23127605cfc6c7e0d3475fe4b0d63157011383d716cb41617886 -ICU_TARBALL := icu4c-78.1-sources.tgz -ICU_DATA_SHA256SUM := e7b652244f27194e0ea46a0d21cfc714ee8a818e1fd82d51a93bc91516fdcf65 -ICU_DATA_TARBALL := icu4c-78.1-data.zip +ICU_SHA256SUM := 3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35 +ICU_TARBALL := icu4c-78.2-sources.tgz +ICU_DATA_SHA256SUM := 582968cf174c9498b2046b4f4e7f786def5f18222bd8d98432d7a29399c38c70 +ICU_DATA_TARBALL := icu4c-78.2-data.zip # three static lines # so that git cherry-pick # will not run into conflicts commit 2d35e325ee6d3a091062d7bee3bb2fa1288e2a60 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jan 8 10:20:23 2026 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:46:09 2026 +0100 tdf#169914 dark mode + editing report + Windows + chart is broken regression from commit 9791aaaa31749857e719ab8b6926b180966f959b Author: Noel Grandin <[email protected]> Date: Tue Aug 5 14:40:41 2025 +0200 tdf#167643 Selection is black What is weird here is that this is what I first tried when fixing tdf#167643, and it did not work. But now this change does work, and tdf#167643 does not recur. Huh. It still looks terrible, but at least it is visible now. The report designer will likely need further work to support dark mode properly, and likely chart rendering too. Change-Id: I6b7ed5d073a73377edcb772ef016cdb53294eb9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196827 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 06ec063412cd6de022dd70743ef06558446d57ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196966 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index 774275f0a2da..1da86264f588 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -293,11 +293,11 @@ protected: // Create SkPaint to use when drawing to the surface. It is not to be used // when doing internal drawing such as when merging two bitmaps together. // This may apply some default settings to the paint as necessary. - SkPaint makePaintInternal(bool bSrcATop = false) const; + SkPaint makePaintInternal(bool bSrcOver = false) const; // Create SkPaint set up for drawing lines (using mLineColor etc.). SkPaint makeLinePaint(double transparency = 0) const; // Create SkPaint set up for filling (using mFillColor etc.). - SkPaint makeFillPaint(double transparency = 0, bool bSrcATop = false) const; + SkPaint makeFillPaint(double transparency = 0, bool bSrcOver = false) const; // Create SkPaint set up for bitmap drawing. SkPaint makeBitmapPaint() const; // Create SkPaint set up for gradient drawing. @@ -358,7 +358,7 @@ protected: bool mInWindowBackingPropertiesChanged; }; -inline SkPaint SkiaSalGraphicsImpl::makePaintInternal(bool bSrcATop) const +inline SkPaint SkiaSalGraphicsImpl::makePaintInternal(bool bSrcOver) const { SkPaint paint; // Invert could be done using a blend mode like invert() does, but @@ -369,8 +369,8 @@ inline SkPaint SkiaSalGraphicsImpl::makePaintInternal(bool bSrcATop) const SkiaHelper::setBlenderInvert(&paint); else if (mXorMode == XorMode::Xor) SkiaHelper::setBlenderXor(&paint); - else if (bSrcATop) - paint.setBlendMode(SkBlendMode::kSrcATop); + else if (bSrcOver) + paint.setBlendMode(SkBlendMode::kSrcOver); else paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha return paint; @@ -387,10 +387,10 @@ inline SkPaint SkiaSalGraphicsImpl::makeLinePaint(double transparency) const return paint; } -inline SkPaint SkiaSalGraphicsImpl::makeFillPaint(double transparency, bool bSrcATop) const +inline SkPaint SkiaSalGraphicsImpl::makeFillPaint(double transparency, bool bSrcOver) const { assert(moFillColor.has_value()); - SkPaint paint = makePaintInternal(bSrcATop); + SkPaint paint = makePaintInternal(bSrcOver); paint.setColor(transparency == 0 ? SkiaHelper::toSkColor(*moFillColor) : SkiaHelper::toSkColorWithTransparency(*moFillColor, transparency)); @@ -420,7 +420,7 @@ inline SkPaint SkiaSalGraphicsImpl::makeGradientPaint() const { return makePaint inline SkPaint SkiaSalGraphicsImpl::makeTextPaint(std::optional<Color> color) const { assert(color.has_value()); - SkPaint paint = makePaintInternal(/*bSrcATop*/ true); + SkPaint paint = makePaintInternal(/*bSrcOver*/ true); paint.setColor(SkiaHelper::toSkColor(*color)); return paint; } diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 40091ec62069..d68f02337a0b 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -965,7 +965,7 @@ void SkiaSalGraphicsImpl::performDrawPolyPolygon(const basegfx::B2DPolyPolygon& } if (moFillColor) { - SkPaint aPaint = makeFillPaint(fTransparency, /*bSrcATop*/ true); + SkPaint aPaint = makeFillPaint(fTransparency, /*bSrcOver*/ true); aPaint.setAntiAlias(useAA); // HACK: If the polygon is just a line, it still should be drawn. But when filling // Skia doesn't draw empty polygons, so in that case ensure the line is drawn.
