Date: Thursday, February 2, 2023 @ 15:11:18 Author: andyrtr Revision: 467884
upgpkg: libreoffice-fresh 7.5.0-1: upstream update 7.5.0 Modified: libreoffice-fresh/trunk/PKGBUILD Deleted: libreoffice-fresh/trunk/0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch -------------------------------------------------------------+ 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch | 59 ---------- PKGBUILD | 30 +---- 2 files changed, 10 insertions(+), 79 deletions(-) Deleted: 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch =================================================================== --- 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch 2023-02-02 15:10:56 UTC (rev 467883) +++ 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch 2023-02-02 15:11:18 UTC (rev 467884) @@ -1,59 +0,0 @@ -From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 -From: "Brett T. Warden" <[email protected]> -Date: Fri, 30 Dec 2022 08:43:25 +0100 -Subject: Remove dependency on BitArray.h from zxing-1.2.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In zxing-1.4.0, numerous headers are no longer public. Rework the -ConvertToSVGFormat method so it uses bitmatrix.get instead of -bitmatrix.getRow, similar to the ToSVG method in zxing itself. - -See https://github.com/zxing-cpp/zxing-cpp/issues/361 - -Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874 -Tested-by: René Engelhard <[email protected]> -Reviewed-by: René Engelhard <[email protected]> -Tested-by: Jenkins -Reviewed-by: Caolán McNamara <[email protected]> ---- - cui/source/dialogs/QrCodeGenDialog.cxx | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx -index f8cbac1d758d..817be7f21ede 100644 ---- a/cui/source/dialogs/QrCodeGenDialog.cxx -+++ b/cui/source/dialogs/QrCodeGenDialog.cxx -@@ -27,7 +27,6 @@ - #endif - - #include <BarcodeFormat.h> --#include <BitArray.h> - #include <BitMatrix.h> - #include <MultiFormatWriter.h> - #include <TextUtfEncoding.h> -@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) - OStringBuffer sb; - const int width = bitmatrix.width(); - const int height = bitmatrix.height(); -- ZXing::BitArray row(width); - sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<svg xmlns=\"http://www.w3.org/2000/svg\"; version=\"1.1\" viewBox=\"0 0 " - + OString::number(width) + " " + OString::number(height) -@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) - "<path d=\""); - for (int i = 0; i < height; ++i) - { -- bitmatrix.getRow(i, row); - for (int j = 0; j < width; ++j) - { -- if (row.get(j)) -+ if (bitmatrix.get(j, i)) - { - sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z"); - } --- -cgit v1.2.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-02 15:10:56 UTC (rev 467883) +++ PKGBUILD 2023-02-02 15:11:18 UTC (rev 467884) @@ -10,8 +10,8 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=7.4.5.1 -pkgver=7.4.5 +_LOver=7.5.0.3 +pkgver=7.5.0 pkgrel=1 arch=('x86_64') license=('LGPL3') @@ -48,7 +48,7 @@ ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/pdfium-5058.tar.bz2 + ${_additional_source_url}/pdfium-5408.tar.bz2 ${_additional_source_url}/dtoa-20180411.tgz ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 @@ -59,9 +59,7 @@ ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - libreoffice-boost-1.81.0-locale.patch::https://github.com/LibreOffice/core/commit/23dcd4339428.patch make-pyuno-work-with-system-wide-module-install.diff - 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch 623ea5c.diff soffice-template.desktop.in libreoffice-fresh.sh libreoffice-fresh.csh) @@ -73,7 +71,7 @@ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - pdfium-5058.tar.bz2 + pdfium-5408.tar.bz2 dtoa-20180411.tgz lxml-4.1.1.tgz Firebird-3.0.7.33374-0.tar.bz2 @@ -86,11 +84,11 @@ 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <[email protected]> -sha256sums=('380ecf12cb37b94a2f5f210d277fc2d1e14b9f14d1d39e09d49135194e6ce18d' +sha256sums=('f5120fa3ae80a7deb08150038a6e78335bcab578bd7c41ddc733c2057977003b' 'SKIP' - '9e6badb999b686fd511db529b85f5e3e31ad991bffa06fb243e4685956bce681' + '7e3e9542ad4bf608d12a10c8792c8905b0f2a7d4c96a30beb000a632b4fda8cd' 'SKIP' - 'a49a58e8070ec111cc40efc9cdab32e8a1894d6a7788319306ccc461128e87c0' + 'd3584f70acf9865cc02941db55d3a129c386444bf91857b68e11cd20d9265972' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -100,7 +98,7 @@ 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - 'eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac' + '7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35' '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' @@ -111,9 +109,7 @@ '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' - '9754c1c9025dd34b010b3e9c9c39ef2f850331e486b5d0adbf5c86f554259b04' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - 'fa0073dee8fc0519b84ed6af6fa9769b88abb24e694c314344c4606478101547' '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e' @@ -135,15 +131,9 @@ rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources - # https://gerrit.libreoffice.org/c/core/+/143343 - patch -Np1 -i "${srcdir}"/libreoffice-boost-1.81.0-locale.patch + # fix not upstreamable pyuno paths - FS#54250 + patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff - # fix not upstreamable pyuno paths - FS#54250 - patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff - - # allow build with recent syytem xzing - patch -Np1 -i "${srcdir}"/0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch - # fix build - https://gerrit.libreoffice.org/c/core/+/145421 patch -Np1 -i "${srcdir}"/623ea5c.diff
