From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7232E158010 for ; Tue, 10 Jan 2023 00:04:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34258E0769; Tue, 10 Jan 2023 00:04:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3119E0769 for ; Tue, 10 Jan 2023 00:04:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57B17340E26 for ; Tue, 10 Jan 2023 00:04:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CAF1804 for ; Tue, 10 Jan 2023 00:04:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1673309073.05c841fbf1f173837c1078ebf9b1ae076317413f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch app-office/libreoffice/libreoffice-7.3.7.2.ebuild app-office/libreoffice/libreoffice-7.4.3.2.ebuild app-office/libreoffice/libreoffice-7.4.4.2.ebuild app-office/libreoffice/libreoffice-7.4.9999.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 05c841fbf1f173837c1078ebf9b1ae076317413f X-VCS-Branch: master Date: Tue, 10 Jan 2023 00:04:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3870634-5bce-4a3c-91d2-a1aefd4435b0 X-Archives-Hash: 6d45f7913a66f78aa03e6f8c38ebebe3 commit: 05c841fbf1f173837c1078ebf9b1ae076317413f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 9 21:09:42 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 10 00:04:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c841fb app-office/libreoffice: backport patch for >=zxing-cpp-1.4.0 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch | 59 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 5 +- app-office/libreoffice/libreoffice-7.4.3.2.ebuild | 7 +-- app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 15 +++--- app-office/libreoffice/libreoffice-7.4.9999.ebuild | 15 +++--- 5 files changed, 82 insertions(+), 19 deletions(-) diff --git a/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch new file mode 100644 index 000000000000..52b383a9d3e9 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch @@ -0,0 +1,59 @@ +From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 +From: "Brett T. Warden" +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 +Reviewed-by: René Engelhard +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +--- + 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 +-#include + #include + #include + #include +@@ -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("\n" + "