From 8b159700ff05432d8bbc04de56a3d27194374708 Mon Sep 17 00:00:00 2001 From: suvari Date: Mon, 16 Jan 2023 17:31:13 +0300 Subject: [PATCH] libreoffice: version bump to 7.4.4.2 --- .../libreoffice/files/623ea5c.diff | 21 +++ ...dency_on_BitArray.h_from_zxing-1.2.0.patch | 58 +++++++ office/libreoffice/libreoffice/pspec.xml | 161 ++++++++++-------- 3 files changed, 166 insertions(+), 74 deletions(-) create mode 100644 office/libreoffice/libreoffice/files/623ea5c.diff create mode 100644 office/libreoffice/libreoffice/files/Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch diff --git a/office/libreoffice/libreoffice/files/623ea5c.diff b/office/libreoffice/libreoffice/files/623ea5c.diff new file mode 100644 index 0000000000..5ab4dbdaa3 --- /dev/null +++ b/office/libreoffice/libreoffice/files/623ea5c.diff @@ -0,0 +1,21 @@ +From 623ea5c4d2871aba2e3e5114ad7d58d6f910a2f3 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Thu, 12 Jan 2023 20:55:27 +0000 +Subject: [PATCH] Related: tdf#151898 fix gtk4 build in 7-4 + +Change-Id: I71b59b7d2eac406817c79bf6911736ad4510771c +--- + +diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx +index 8ba6409..b697b0b 100644 +--- a/vcl/unx/gtk3/gtkinst.cxx ++++ b/vcl/unx/gtk3/gtkinst.cxx +@@ -5114,7 +5114,7 @@ + + void picture_set_from_xgraphic(GtkPicture* pPicture, const css::uno::Reference& rPicture) + { +- if (auto xTempFile = getImageFile(rPicture, false)) ++ if (auto xTempFile = getImageFile(rPicture)) + gtk_picture_set_filename(pPicture, OUStringToOString(xTempFile->GetFileName(), osl_getThreadTextEncoding()).getStr()); + else + gtk_picture_set_pixbuf(pPicture, nullptr); diff --git a/office/libreoffice/libreoffice/files/Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch b/office/libreoffice/libreoffice/files/Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch new file mode 100644 index 0000000000..77d999446f --- /dev/null +++ b/office/libreoffice/libreoffice/files/Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch @@ -0,0 +1,58 @@ +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" + " - + libreoffice @@ -13,81 +13,86 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/7.4.2/libreoffice-7.4.2.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/7.4.2/libreoffice-dictionaries-7.4.2.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/7.4.2/libreoffice-help-7.4.2.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/7.4.2/libreoffice-translations-7.4.2.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/7.4.4/libreoffice-7.4.4.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/7.4.4/libreoffice-dictionaries-7.4.4.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/7.4.4/libreoffice-help-7.4.4.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/7.4.4/libreoffice-translations-7.4.4.2.tar.xz - https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz - https://dev-www.libreoffice.org/src/xmlsec1-1.2.36.tar.gz - http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz - http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2 - http://dev-www.libreoffice.org/src/collada2gltf-master-6258611a6a.tar.bz2 - http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 - https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - https://dev-www.libreoffice.org/src/62c0b97e94fe47d5e50ff605d2edf37a-hsqldb-2.3.3.zip - http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz - https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2 - http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip - http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz - https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz - https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz - https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz - https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz - http://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz - https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz - http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz - http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz - https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz - https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz - https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz - http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz - https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz - https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz - https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2 - https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2 - https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz - https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 - https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz - https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz - https://dev-www.libreoffice.org/src/ltm-1.0.zip - https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz - https://dev-www.libreoffice.org/src/dtoa-20180411.tgz - https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz - https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz - https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz - https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz - https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz - https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz - https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz - https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf - https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf - https://dev-www.libreoffice.org/src/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt + https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz + https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz + http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz + http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2 + http://dev-www.libreoffice.org/src/collada2gltf-master-6258611a6a.tar.bz2 + http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 + https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + https://dev-www.libreoffice.org/src/62c0b97e94fe47d5e50ff605d2edf37a-hsqldb-2.3.3.zip + http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz + https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2 + https://dev-www.libreoffice.org/src/liborcus-0.18.0.tar.xz + http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip + http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz + https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz + https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz + https://dev-www.libreoffice.org/src/libnumbertext-1.0.11.tar.xz + https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz + http://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz + https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz + http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz + http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz + https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz + https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz + https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz + http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz + https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz + https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz + https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2 + https://dev-www.libreoffice.org/src/pdfium-5522.tar.bz2 + https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz + https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2 + https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz + https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz + https://dev-www.libreoffice.org/src/ltm-1.0.zip + https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz + https://dev-www.libreoffice.org/src/dtoa-20180411.tgz + https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz + https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz + https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz + https://dev-www.libreoffice.org/src/zxing-cpp-1.4.0.tar.gz + https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz + https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz + https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz + https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf + https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf + https://dev-www.libreoffice.org/src/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt - http://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar - https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar - http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - https://dev-www.libreoffice.org/src/dragonbox-1.1.0.tar.gz - https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz - https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz - https://dev-www.libreoffice.org/src/tiff-4.4.0.tar.xz + http://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar + https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar + http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz + https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz + https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz + https://dev-www.libreoffice.org/src/libwebp-1.3.0-rc1.tar.gz + https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz make-pyuno-work-with-system-wide-module-install.diff + 623ea5c.diff + Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch @@ -193,6 +198,7 @@ libgpg-error-devel gpgme-devel libepoxy-devel + ccache @@ -276,8 +282,8 @@ /usr/share/appdata /usr/share/metainfo /usr/share/bash-completion - /usr/lib/libreoffice/share/numbertext/mt.sor - /usr/lib/libreoffice/share/numbertext/lg.sor + + /usr/lib/libreoffice/share/numbertext /usr/lib/python3.9 /usr/lib/libreoffice/program/scriptforge.py /usr/lib/libreoffice/program/soffice* @@ -3806,6 +3812,13 @@ + + 2023-01-15 + 7.4.4.2 + Version Bump + Kamil Atlı + suvari@pisilinux.org + 2022-11-09 7.4.2.3