From e3898f2d191774274c3cf889a8da397fe3c712f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 22 Jul 2025 03:57:52 +0700 Subject: [PATCH] libreoffice: update to 25.2.5.2. --- .../011-fix_build_with_poppler_25.05.patch | 39 ------------------- srcpkgs/libreoffice/template | 13 ++++--- 2 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch diff --git a/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch b/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch deleted file mode 100644 index ac6263a1041..00000000000 --- a/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0ee2636304ac049f21415c67e92040f7d6c14d35 Mon Sep 17 00:00:00 2001 -From: Xisco Fauli -Date: Mon, 5 May 2025 10:03:10 +0200 -Subject: poppler: uggrade to 25.05 - -Change-Id: Icd2b318cc01bedc5baeb4445a463a136ed6d7c48 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184953 -Tested-by: Jenkins -Reviewed-by: Xisco Fauli ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++ - 3 files changed, 17 insertions(+), 9 deletions(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index dcc1932f7ad7..604ba3b7db2c 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -1320,11 +1320,19 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *, - } - } - -+#if POPPLER_CHECK_VERSION(25, 5, 0) -+ std::unique_ptr pRgbStr(new MemStream(pBitmapData, 0, -+ nBitmapWidth * nBitmapHeight * 3, Object::null())); -+ std::unique_ptr pAlphaStr(new MemStream(reinterpret_cast(pSplashBitmap->getAlphaPtr()), -+ 0, nBitmapWidth * nBitmapHeight, Object::null())); -+ auto aDecode = Object::null(); -+#else - std::unique_ptr pRgbStr(new MemStream(pBitmapData, 0, - nBitmapWidth * nBitmapHeight * 3, Object(objNull))); - std::unique_ptr pAlphaStr(new MemStream(reinterpret_cast(pSplashBitmap->getAlphaPtr()), - 0, nBitmapWidth * nBitmapHeight, Object(objNull))); - auto aDecode = Object(objNull); -+#endif - #if POPPLER_CHECK_VERSION(24, 10, 0) - std::unique_ptr pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, - std::make_unique())); --- -cgit v1.2.3 diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 0aaf156447d..349318d3d9b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=25.2.4.3 -revision=2 +version=25.2.5.2 +revision=1 build_helper="gir" build_style=configure # hack, avoid sourcing common/.../gnu-configure-args.sh metapackage=yes @@ -62,7 +62,8 @@ homepage="https://www.libreoffice.org/" _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}" # Please don't remove this mirror, it's faster for me # _baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}" -_baseurl="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}" +# _baseurl="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}" +# _baseurl="https://mirrors.tuna.tsinghua.edu.cn/libreoffice/src/${version%.*}" _addurl="https://dev-www.libreoffice.org/src" _exturl="https://dev-www.libreoffice.org/extern" @@ -97,9 +98,9 @@ distfiles=" ${_addurl}/Java-WebSocket-1.6.0.tar.gz ${_addurl}/zxcvbn-c-2.5.tar.gz " -checksum="01e1985f66c60da0e5cd9d1bb3773b7b46e9a920e318f35c6702d28e78e1c14f - 5f3bbca9fc96284b6ee78a31f9719c6b9930dd884ec5394b71af9e99b05e0bea - ecbce6336e596f26f9645672075efde19547648a622f215587dc615b6a20616c +checksum="8c9fb209649f49a2adceca5b29b8a251c0285eb06c691beb3cad60e168b2b339 + 5b83ad86b8dfb8e41aaa4037e64faca69f83ce7f80c1c19f1da8379113c7dc19 + 6304151c2dcc5f54f8ecdfdd856d71d56eb1e6f0d6fd5fa7de3d3ce3b5f5dd9b 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00