Bug#1027048: missing zxing patch
Hi,
turns out that when resuming a bug with reportbug, all its attachments
get lost even though they do get stored in the resume file.
Here is the patch for real now. :)
diff -Nru libreoffice-7.4.3/debian/changelog libreoffice-7.4.3/debian/changelog
--- libreoffice-7.4.3/debian/changelog 2022-11-28 18:32:19.000000000 +0100
+++ libreoffice-7.4.3/debian/changelog 2022-12-26 04:25:07.000000000 +0100
@@ -1,3 +1,11 @@
+libreoffice (1:7.4.3-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * add 0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch from
+ clearlinux-pkgs, see https://github.com/zxing-cpp/zxing-cpp/issues/361
+
+ -- Johannes Schauer Marin Rodrigues <josch@debian.org> Mon, 26 Dec 2022 04:25:07 +0100
+
libreoffice (1:7.4.3-2) unstable; urgency=medium
* debian/rules: disable checks on s390x for now (cause OOM on the buildds),
diff -Nru libreoffice-7.4.3/debian/patches/0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch libreoffice-7.4.3/debian/patches/0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch
--- libreoffice-7.4.3/debian/patches/0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-7.4.3/debian/patches/0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch 2022-12-26 04:23:31.000000000 +0100
@@ -0,0 +1,50 @@
+From a06c0eabc164cd2233cad4e159cff005951a5d06 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <brett.t.warden@intel.com>
+Date: Fri, 2 Dec 2022 12:06:35 -0800
+Subject: [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
+
+---
+ 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 3e7b48e7af86..c334785d2bea 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");
+ }
+--
+2.38.1
+
diff -Nru libreoffice-7.4.3/debian/patches/series libreoffice-7.4.3/debian/patches/series
--- libreoffice-7.4.3/debian/patches/series 2022-11-20 10:27:24.000000000 +0100
+++ libreoffice-7.4.3/debian/patches/series 2022-12-26 04:24:10.000000000 +0100
@@ -49,3 +49,4 @@
hrk-euro.diff
dragonbox-1.1.3.diff
fix-system-libfixmath.diff
+0004-Remove-dependency-on-BitArray.h-from-zxing-1.2.0.patch
Reply to: