Date: Thursday, January 12, 2023 @ 22:19:00
Author: andyrtr
Revision: 466412
upgpkg: libreoffice-fresh 7.4.4-1: upstream update 7.4.4 - build with system
zxing again
Added:
libreoffice-fresh/trunk/0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch
libreoffice-fresh/trunk/623ea5c.diff
Modified:
libreoffice-fresh/trunk/PKGBUILD
-------------------------------------------------------------+
0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch | 59 ++++++++++
623ea5c.diff | 21 +++
PKGBUILD | 37 +++---
3 files changed, 102 insertions(+), 15 deletions(-)
Added: 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch
===================================================================
--- 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch
(rev 0)
+++ 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch 2023-01-12
22:19:00 UTC (rev 466412)
@@ -0,0 +1,59 @@
+From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <[email protected]>
+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 <[email protected]>
+Reviewed-by: René Engelhard <[email protected]>
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <[email protected]>
+---
+ 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
+
Added: 623ea5c.diff
===================================================================
--- 623ea5c.diff (rev 0)
+++ 623ea5c.diff 2023-01-12 22:19:00 UTC (rev 466412)
@@ -0,0 +1,21 @@
+From 623ea5c4d2871aba2e3e5114ad7d58d6f910a2f3 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <[email protected]>
+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<css::graphic::XGraphic>& 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);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-12 22:14:57 UTC (rev 466411)
+++ PKGBUILD 2023-01-12 22:19:00 UTC (rev 466412)
@@ -10,9 +10,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.4.3.2
-pkgver=7.4.3
-pkgrel=4
+_LOver=7.4.4.2
+pkgver=7.4.4
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/";
@@ -31,7 +31,7 @@
'libexttextcat' 'gobject-introspection' # 'libfbclient' 'libcmis'
'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost'
'libnumbertext'
- 'abseil-cpp' 'clang' #'zxing-cpp'
+ 'abseil-cpp' 'clang' 'zxing-cpp'
'libffi' 'box2d' 'git'
)
options=('!lto') # using --enable-lto (for parallel link-time optimization)
@@ -54,13 +54,14 @@
${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
${_additional_source_url}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
${_additional_source_url}/libcmis-0.5.2.tar.xz
- ${_additional_source_url}/zxing-cpp-1.2.0.tar.gz
- ${_additional_source_url}/dragonbox-1.1.0.tar.gz
+ ${_additional_source_url}/dragonbox-1.1.3.tar.gz
${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
# for test suite
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# for test suite
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
+ 0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch
+ 623ea5c.diff
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -77,8 +78,7 @@
Firebird-3.0.7.33374-0.tar.bz2
skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
libcmis-0.5.2.tar.xz
- zxing-cpp-1.2.0.tar.gz
- dragonbox-1.1.0.tar.gz
+ dragonbox-1.1.3.tar.gz
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar #
for test suite
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# for test suite
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
@@ -85,11 +85,11 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build
Team (CODE SIGNING KEY) <[email protected]>
-sha256sums=('ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b'
+sha256sums=('8ae1d9a91fab98d9601ee5e256389e3da26c6ad9836930b151504b742e729d0b'
'SKIP'
- 'd08f4a2f16fb375903270facab527e28de57deb9ba452f9d449d5271d0f118a2'
+ '301efcc2bf9f2f946486796c7275188880940d41d04089991fefae03280fe85d'
'SKIP'
- 'd034df36118844f9958dc775069b3b8b08d11cbb8b4b27531449bc6543bccd20'
+ '866efac11ce41fe77b8f3f92550bad35abd3db6d06644018b98efae3f9f08ffc'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -105,13 +105,14 @@
'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
'c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9'
'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
- '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a'
- '293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20'
+ '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ 'fa0073dee8fc0519b84ed6af6fa9769b88abb24e694c314344c4606478101547'
+ '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e'
'66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff')
@@ -135,6 +136,12 @@
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i
"${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
+ # allow build with recent syytem xzing
+ patch -Np1 -i
"${srcdir}"/0001_Remove_dependency_on_BitArray.h_from_zxing-1.2.0.patch
+
+ # fix build - https://gerrit.libreoffice.org/c/core/+/145421
+ patch -Np1 -i "${srcdir}"/623ea5c.diff
+
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@@ -203,7 +210,7 @@
--with-system-libetonyek \
--with-system-libfreehand \
--without-system-firebird \
- --without-system-zxing \
+ --with-system-zxing \
--with-system-libtommath \
--with-system-libatomic-ops \
--with-system-libebook \
@@ -292,7 +299,7 @@
'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' #
'libfbclient' 'libcmis'
'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext'
'gpgme'
'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy'
'box2d'
- #'zxing-cpp'
+ 'zxing-cpp'
'xdg-utils')
optdepends=('java-runtime: adds java support'
'java-environment: required by extension-wiki-publisher and
extension-nlpsolver'
