automatic version update by autodist [release 7.5.0.2-1mamba;Sun Jan 22 2023]
This commit is contained in:
parent
d16e69e619
commit
cffaf5cae0
59
libreoffice-7.5.0.1-zxing-2.0.0.patch
Normal file
59
libreoffice-7.5.0.1-zxing-2.0.0.patch
Normal file
@ -0,0 +1,59 @@
|
||||
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(-)
|
||||
|
||||
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
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
%define langpacks 1
|
||||
|
||||
Name: libreoffice
|
||||
Version: 7.4.4.1
|
||||
Version: 7.5.0.2
|
||||
Release: 1mamba
|
||||
Summary: Free Office Suite
|
||||
Group: Graphical Desktop/Applications/Office
|
||||
@ -44,7 +44,7 @@ Source28: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.
|
||||
Source29: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
Source30: http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2
|
||||
Source31: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
Source32: http://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2
|
||||
Source32: http://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2
|
||||
Source33: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
Source34: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar
|
||||
Source35: https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||
@ -64,6 +64,7 @@ Patch47: libreoffice-7.2.0.4-libfreetype-2.11.0.patch
|
||||
Patch48: libreoffice-7.3.3.2-poppler-22.03.0.patch
|
||||
Patch49: libreoffice-7.3.3.2-poppler-22.04.0.patch
|
||||
Patch50: libreoffice-7.4.1.1-gpgme-1.18.patch
|
||||
Patch51: libreoffice-7.5.0.1-zxing-2.0.0.patch
|
||||
License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
#liblapack.so.3()(64bit): .so link not found
|
||||
@ -248,6 +249,9 @@ BuildRequires: libsane-backends-devel
|
||||
BuildRequires: libvigra-devel
|
||||
BuildRequires: libmdb-devel
|
||||
#BuildRequires: mdbtools
|
||||
BuildRequires: libzxing-cpp-devel >= 2.0.0
|
||||
# Remove after 7.5.0.1
|
||||
BuildRequires: libmdds20-devel
|
||||
|
||||
%description
|
||||
LibreOffice is an Open Source, community-developed, office productivity suite.
|
||||
@ -533,6 +537,7 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
|
||||
#%patch48 -p1 -b .poppler-22.03.0
|
||||
#%patch49 -p0 -b .poppler-22.04.0
|
||||
#%patch50 -p1
|
||||
#%patch51 -p1 -b .zxing-2.0.0
|
||||
|
||||
touch scripting/source/pyprov/delzip
|
||||
#touch scripting/util/provider/beanshell/delzip
|
||||
@ -1048,6 +1053,12 @@ This package contains %{langname} translations and resources for LibreOffice.\
|
||||
%langpack -l zu -n Zulu -F -H -Y
|
||||
|
||||
%changelog
|
||||
* Sun Jan 22 2023 Automatic Build System <autodist@mambasoft.it> 7.5.0.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Jan 16 2023 Automatic Build System <autodist@mambasoft.it> 7.5.0.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Dec 22 2022 Automatic Build System <autodist@mambasoft.it> 7.4.4.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user