From 1c09397a8638d3c1f33920e19454b80d79bef84c Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 05:34:59 +0100 Subject: [PATCH] automatic version update by autodist [release 7.3.3.2-1mamba;Wed May 04 2022] --- libreoffice-7.3.3.2-poppler-22.03.0.patch | 28 +++++++++ libreoffice-7.3.3.2-poppler-22.04.0.patch | 71 +++++++++++++++++++++++ libreoffice.spec | 29 +++++---- 3 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 libreoffice-7.3.3.2-poppler-22.03.0.patch create mode 100644 libreoffice-7.3.3.2-poppler-22.04.0.patch diff --git a/libreoffice-7.3.3.2-poppler-22.03.0.patch b/libreoffice-7.3.3.2-poppler-22.03.0.patch new file mode 100644 index 0000000..c6544b2 --- /dev/null +++ b/libreoffice-7.3.3.2-poppler-22.03.0.patch @@ -0,0 +1,28 @@ +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(pFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++ ++ PDFDoc aErrDoc( std::make_unique(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; diff --git a/libreoffice-7.3.3.2-poppler-22.04.0.patch b/libreoffice-7.3.3.2-poppler-22.04.0.patch new file mode 100644 index 0000000..9a04490 --- /dev/null +++ b/libreoffice-7.3.3.2-poppler-22.04.0.patch @@ -0,0 +1,71 @@ +# 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> 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> 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(nSize) ) ++#else ++ if( fwrite(reinterpret_cast(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast(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; + diff --git a/libreoffice.spec b/libreoffice.spec index 1797b18..2a3a4f6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,7 +19,7 @@ %define langpacks 1 Name: libreoffice -Version: 7.2.5.1 +Version: 7.3.3.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -44,12 +44,12 @@ 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-4500.tar.bz2 +Source32: http://dev-www.libreoffice.org/src/pdfium-4699.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 Source36: https://dev-www.libreoffice.org/src/dtoa-20180411.tgz -Source37: https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz +Source37: https://dev-www.libreoffice.org/src/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz Source38: https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz Patch12: libreoffice-installfix.patch Patch39: libreoffice-5.1.1.1-gcc-5.3-std-isnan.patch @@ -61,12 +61,16 @@ Patch44: libreoffice-6.4.0.3-libpoppler-0.84.0.patch Patch45: libreoffice-6.4.3.2-build-workaround-fix-deleteTestDirectory-failed-assert.patch Patch46: libreoffice-6.4.3.2-libpoppler-0.87.patch 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 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 +#ld-linux.so.2(GLIBC_2.3): .so link not found +#ld-linux.so.2: .so link not found +#liblapack.so.3: .so link not found BuildRequires: firebird-devel BuildRequires: glibc-devel -#BuildRequires: java-openjdk8 +#BuildRequires: java-openjdk8-runtime BuildRequires: libICE-devel BuildRequires: libQt5X11Extras-devel BuildRequires: libSM-devel @@ -75,6 +79,7 @@ BuildRequires: libXext-devel BuildRequires: libXinerama-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel +BuildRequires: libabseil-cpp-devel BuildRequires: libabw-devel BuildRequires: libatk-devel BuildRequires: libatlas-devel @@ -125,17 +130,18 @@ BuildRequires: libmariadb-devel BuildRequires: libmspub-devel BuildRequires: libmwaw-devel BuildRequires: libmythes-devel -BuildRequires: libneon-devel BuildRequires: libnspr-devel BuildRequires: libnss-devel BuildRequires: libnumbertext-devel BuildRequires: libodfgen-devel +BuildRequires: libopenjpeg-devel BuildRequires: libopenldap-devel BuildRequires: libopenssl-devel BuildRequires: liborcus-devel BuildRequires: libpagemaker-devel BuildRequires: libpango-devel BuildRequires: libpng-devel +BuildRequires: libpoppler-cpp-devel BuildRequires: libpoppler-devel BuildRequires: libpostgresql-devel BuildRequires: libpython39-devel @@ -221,6 +227,7 @@ BuildRequires: libqrcodegen-devel BuildRequires: libmdds-devel BuildRequires: libbonobo-devel BuildRequires: libcppunit-devel +BuildRequires: libcuckoo-devel BuildRequires: libdbus-glib-devel BuildRequires: libevolution-data-server-devel BuildRequires: libGLU-devel @@ -517,10 +524,9 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro #mv translations src -#%patch12 -p1 -b .libreoffice-installfix.patch -#%patch45 -p1 -#%patch46 -p1 -%patch47 -p1 +#%patch47 -p1 +%patch48 -p1 -b .poppler-22.03.0 +%patch49 -p0 -b .poppler-22.04.0 touch scripting/source/pyprov/delzip #touch scripting/util/provider/beanshell/delzip @@ -1036,6 +1042,9 @@ This package contains %{langname} translations and resources for LibreOffice.\ %langpack -l zu -n Zulu -F -H -Y %changelog +* Wed May 04 2022 Automatic Build System 7.3.3.2-1mamba +- automatic version update by autodist + * Tue Dec 21 2021 Automatic Build System 7.2.5.1-1mamba - automatic version update by autodist