From 3b94fb4da7b555d77f815cf96dd1ae0f6d92eecf Mon Sep 17 00:00:00 2001 From: John Date: Thu, 6 Apr 2023 13:41:23 +0200 Subject: [PATCH] libreoffice: remove redundant zxing patch --- srcpkgs/libreoffice/patches/15e5d86.diff | 51 ------------------------ 1 file changed, 51 deletions(-) delete mode 100644 srcpkgs/libreoffice/patches/15e5d86.diff diff --git a/srcpkgs/libreoffice/patches/15e5d86.diff b/srcpkgs/libreoffice/patches/15e5d86.diff deleted file mode 100644 index f01c44c1e58..00000000000 --- a/srcpkgs/libreoffice/patches/15e5d86.diff +++ /dev/null @@ -1,51 +0,0 @@ -From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 -From: Brett T. Warden -Date: Fri, 30 Dec 2022 08:43:25 +0100 -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 - -Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874 -Tested-by: René Engelhard -Reviewed-by: René Engelhard -Tested-by: Jenkins -Reviewed-by: Caolán McNamara ---- - -diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx -index f8cbac1..817be7f 100644 ---- a/cui/source/dialogs/QrCodeGenDialog.cxx -+++ b/cui/source/dialogs/QrCodeGenDialog.cxx -@@ -27,7 +27,6 @@ - #endif - - #include --#include - #include - #include - #include -@@ -79,7 +78,6 @@ - OStringBuffer sb; - const int width = bitmatrix.width(); - const int height = bitmatrix.height(); -- ZXing::BitArray row(width); - sb.append("\n" - "