From 917ea256e05e6e2d04c3f7e8255a78cabb9b9fb64581a4f17fba3dddfaf5f0e7 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Fri, 3 Feb 2023 09:18:30 +0000
Subject: [PATCH] Accepting request 1063006 from LibreOffice:7.4

OBS-URL: https://build.opensuse.org/request/show/1063006
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1060
---
 Remove_dependency_on_BitArray_h.patch | 62 +++++++++++++++++++++++++++
 libreoffice.changes                   | 10 +++++
 libreoffice.spec                      |  3 ++
 3 files changed, 75 insertions(+)
 create mode 100644 Remove_dependency_on_BitArray_h.patch

diff --git a/Remove_dependency_on_BitArray_h.patch b/Remove_dependency_on_BitArray_h.patch
new file mode 100644
index 0000000..a319bbb
--- /dev/null
+++ b/Remove_dependency_on_BitArray_h.patch
@@ -0,0 +1,62 @@
+From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <brett.t.warden@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 <rene@debian.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@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
+
+
diff --git a/libreoffice.changes b/libreoffice.changes
index 96c8218..225c5fd 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -3,6 +3,16 @@ Sat Jan 28 23:37:14 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
 - add boost-181.patch to fix build with boost 1.81.x
 
+-------------------------------------------------------------------
+Fri Jan 27 12:47:10 UTC 2023 - Bjørn Lie <bjorn.lie@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
+
 -------------------------------------------------------------------
 Thu Jan 19 13:51:27 UTC 2023 - Andras Timar <andras.timar@collabora.com>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 0354938..9927ec1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -118,6 +118,8 @@ Patch14:        use-fixmath-shared-library.patch
 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 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 %patch990 -p1
 %patch991 -p1