[arch-commits] Commit in libreoffice-fresh/trunk (6 files)
Andreas Radke
andyrtr at gemini.archlinux.org
Mon Aug 1 16:10:52 UTC 2022
Date: Monday, August 1, 2022 @ 16:10:52
Author: andyrtr
Revision: 451826
upgpkg: libreoffice-fresh 7.3.5-1: upstream update 7.3.5
Added:
libreoffice-fresh/trunk/keys/
libreoffice-fresh/trunk/keys/pgp/
libreoffice-fresh/trunk/keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc
Modified:
libreoffice-fresh/trunk/PKGBUILD
Deleted:
libreoffice-fresh/trunk/poppler-22.03.0.patch
libreoffice-fresh/trunk/poppler-22.04.0.patch
-------------------------------------------------------+
PKGBUILD | 28 ++----
keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc | 1
poppler-22.03.0.patch | 28 ------
poppler-22.04.0.patch | 71 ----------------
4 files changed, 13 insertions(+), 115 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-01 16:03:18 UTC (rev 451825)
+++ PKGBUILD 2022-08-01 16:10:52 UTC (rev 451826)
@@ -10,9 +10,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.3.4.2
-pkgver=7.3.4
-pkgrel=2
+_LOver=7.3.5.2
+pkgver=7.3.5
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@@ -32,7 +32,7 @@
'libexttextcat' 'gobject-introspection' # 'libfbclient'
'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
- 'libcuckoo' 'abseil-cpp' 'zxing-cpp' 'clang'
+ 'libcuckoo' 'abseil-cpp' 'clang' #'zxing-cpp'
'libffi' 'box2d' 'git'
)
options=('!lto') # using --enable-lto (for parallel link-time optimization)
@@ -55,12 +55,11 @@
${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
${_additional_source_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
${_additional_source_url}/libcmis-0.5.2.tar.xz
+ ${_additional_source_url}/zxing-cpp-1.2.0.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
- poppler-22.03.0.patch
- poppler-22.04.0.patch
make-pyuno-work-with-system-wide-module-install.diff
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
@@ -78,6 +77,7 @@
Firebird-3.0.7.33374-0.tar.bz2
skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
libcmis-0.5.2.tar.xz
+ zxing-cpp-1.2.0.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
@@ -84,11 +84,11 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('48309056aa797eb2ae3aa3ef1b1bc49bd435fd4f2ad5770c45f4aa56fe6f0ff6'
+sha256sums=('9b3e0db1ee153330ea05f04109bd817dbac2203d2eed83ef54be54d4c741e991'
'SKIP'
- 'eef1324f1796196718973cd110c5579fa142cd4ac947d7b1b1fea87c12aa42ad'
+ '9571c1953d7297d158dee8849f7e6315b102fb0cafb2280693e6064ef8013ca2'
'SKIP'
- '9ebc0c2f666d3677d28a01d69f247a8f9fa2dd64fe3d1092058a20cfee615379'
+ 'd2fe9df14d1d7bbf16dd4c7f2fc9331622619d18caadf612d932496f52e146b2'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -104,12 +104,11 @@
'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
'97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177'
'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
+ '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
- 'e61e2a266c7a4374377475254a2f095c1ce2376980b301955a4e5a0d32d3c25b'
- 'caaef7919c6296ab93c7d02607503f91ec965387d038779c0aba9fce78b8e456'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
@@ -131,9 +130,6 @@
rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
- patch -Np1 -i "${srcdir}"/poppler-22.03.0.patch
- patch -Np0 -i "${srcdir}"/poppler-22.04.0.patch
-
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
@@ -201,7 +197,7 @@
--with-system-libetonyek \
--with-system-libfreehand \
--without-system-firebird \
- --with-system-zxing \
+ --without-system-zxing \
--with-system-libtommath \
--with-system-libatomic-ops \
--with-system-libebook \
@@ -291,7 +287,7 @@
'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient'
'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
'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'
Added: keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc
===================================================================
(Binary files differ)
Index: libreoffice-fresh/trunk/keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc
===================================================================
--- keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc 2022-08-01 16:03:18 UTC (rev 451825)
+++ keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc 2022-08-01 16:10:52 UTC (rev 451826)
Property changes on: libreoffice-fresh/trunk/keys/pgp/C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Deleted: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch 2022-08-01 16:03:18 UTC (rev 451825)
+++ poppler-22.03.0.patch 2022-08-01 16:10:52 UTC (rev 451826)
@@ -1,28 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index ad6320139..e5f6d9c68 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -138,6 +138,15 @@ int main(int argc, char **argv)
- _setmode( _fileno( g_binary_out ), _O_BINARY );
- #endif
-
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
-+ GooString(pOwnerPasswordStr),
-+ GooString(pUserPasswordStr) );
-+
-+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
-+ GooString(pOwnerPasswordStr),
-+ GooString(pUserPasswordStr) );
-+#else
- PDFDoc aDoc( pFileName,
- pOwnerPasswordStr,
- pUserPasswordStr );
-@@ -145,6 +154,7 @@ int main(int argc, char **argv)
- PDFDoc aErrDoc( pErrFileName,
- pOwnerPasswordStr,
- pUserPasswordStr );
-+#endif
-
- // Check various permissions for aDoc.
- PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
Deleted: poppler-22.04.0.patch
===================================================================
--- poppler-22.04.0.patch 2022-08-01 16:03:18 UTC (rev 451825)
+++ poppler-22.04.0.patch 2022-08-01 16:10:52 UTC (rev 451826)
@@ -1,71 +0,0 @@
-# Patch from FreeBSD (https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd)
-
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2022-04-26 16:11:01 UTC
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
- {
- // TODO(P3): Unfortunately, need to read stream twice, since
- // we must write byte count to stdout before
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-+#else
-+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+#endif
- if( pBuf )
- {
- aNewFont.isEmbedded = true;
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
- gfree(pBuf);
-+#endif
- }
- }
-
-@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
- return;
-
- int nSize = 0;
-- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
-+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-+#else
-+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+#endif
- if( !pBuf )
- return;
-
- // ---sync point--- see SYNC STREAMS above
- fflush(stdout);
--
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
- if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
-+#else
-+ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
-+#endif
- {
-- gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
-+ gfree(pBuf);
-+#endif
- exit(1); // error
- }
- // ---sync point--- see SYNC STREAMS above
- fflush(g_binary_out);
-- gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
-+ gfree(pBuf);
-+#endif
- }
-
- #if POPPLER_CHECK_VERSION(0, 83, 0)
-@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
- {
- assert(state);
-
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
- GfxFont *gfxFont = state->getFont();
-+#else
-+ GfxFont *gfxFont = state->getFont().get();
-+#endif
- if( !gfxFont )
- return;
-
More information about the arch-commits
mailing list