Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2023-02-04 14:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.4462 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Sat Feb 4 14:11:11 2023 rev:268 rq:1063007 version:7.4.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2023-01-31 16:12:07.274768874 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.4462/libreoffice.changes 2023-02-04 14:21:10.827471340 +0100 @@ -6,0 +7,10 @@ +Fri Jan 27 12:47:10 UTC 2023 - Bjørn Lie <bjorn....@gmail.com> + +- Add Remove_dependency_on_BitArray_h.patch: Remove dependency on + BitArray.h from zxing-1.2.0. 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 + +------------------------------------------------------------------- New: ---- Remove_dependency_on_BitArray_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.WZn3d5/_old 2023-02-04 14:21:11.579475617 +0100 +++ /var/tmp/diff_new_pack.WZn3d5/_new 2023-02-04 14:21:11.583475640 +0100 @@ -118,6 +118,8 @@ Patch15: bsc1204825.patch # LO-L3: Connector lines from PPTX "break"/bend too often Patch16: bsc1205866.patch +# PATCH-FIX-UPSTREAM Remove_dependency_on_BitArray_h.patch -- Remove dependency on BitArray.h from zxing-1.2.0 +Patch17: Remove_dependency_on_BitArray_h.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1045,6 +1047,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %patch990 -p1 %patch991 -p1 ++++++ Remove_dependency_on_BitArray_h.patch ++++++ >From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 From: "Brett T. Warden" <brett.t.war...@intel.com> 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 <r...@debian.org> Reviewed-by: René Engelhard <r...@debian.org> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> --- cui/source/dialogs/QrCodeGenDialog.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cui/source/dialogs/QrCodeGenDialog.cxx') 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
