Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2022-04-28 23:07:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Thu Apr 28 23:07:20 2022 rev:253 rq:973229 version:7.3.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2022-04-22
21:53:58.206786569 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.1538/libreoffice.changes
2022-04-28 23:07:23.812650145 +0200
@@ -1,0 +2,11 @@
+Wed Apr 27 09:22:38 UTC 2022 - Martin Li??ka <mli...@suse.cz>
+
+- Filter out binary-or-shlib-defines-rpath with $ORIGIN argument.
+ It is pretty fine and it is newly reported by rpmlint.
+
+-------------------------------------------------------------------
+Tue Apr 26 15:34:26 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com>
+
+- Add poppler-22-04-0.patch
+
+-------------------------------------------------------------------
New:
----
poppler-22-04-0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.rcoj5A/_old 2022-04-28 23:07:29.396656231 +0200
+++ /var/tmp/diff_new_pack.rcoj5A/_new 2022-04-28 23:07:29.400656235 +0200
@@ -115,6 +115,8 @@
Patch991: libreoffice-no-destdircheck.patch
# PATCH-FIX-UPSTRAM poppler-22-03-0.patch
Patch992: poppler-22-03-0.patch
+# PATCH-FIX-SUSE poppler-22-04-0.patch
+Patch993: poppler-22-04-0.patch
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
@@ -1025,6 +1027,7 @@
%patch990 -p1
%patch991 -p1
%patch992 -p1
+%patch993 -p1
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330
++++++ libreoffice-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.rcoj5A/_old 2022-04-28 23:07:29.572656423 +0200
+++ /var/tmp/diff_new_pack.rcoj5A/_new 2022-04-28 23:07:29.576656427 +0200
@@ -1,3 +1,4 @@
# libreoffice devel package is de facto called libreoffice-sdk
#addFilter("devel-file-in-non-devel-package")
+addFilter("binary-or-shlib-defines-rpath .*ORIGIN")
++++++ poppler-22-04-0.patch ++++++
Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
===================================================================
---
libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew
{
// TODO(P3): Unfortunately, need to read stream twice, since
// we must write byte count to stdout before
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
+ if ( pBuf )
+ {
+ aNewFont.isEmbedded = true;
+ nSize = pBuf->size();
+ }
+#else
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
if( pBuf )
{
aNewFont.isEmbedded = true;
gfree(pBuf);
}
+#endif
}
m_aFontMap[ nNewId ] = aNewFont;
@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont*
return;
int nSize = 0;
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
+ if ( !pBuf )
+ return;
+ nSize = pBuf->size();
+#else
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
if( !pBuf )
return;
+#endif
// ---sync point--- see SYNC STREAMS above
fflush(stdout);
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
+ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) !=
static_cast<size_t>(nSize) )
+ {
+#else
if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) !=
static_cast<size_t>(nSize) )
{
gfree(pBuf);
+#endif
exit(1); // error
}
// ---sync point--- see SYNC STREAMS above
fflush(g_binary_out);
+#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
gfree(pBuf);
+#endif
}
#if POPPLER_CHECK_VERSION(0, 83, 0)
@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta
{
assert(state);
+#if POPPLER_CHECK_VERSION(22, 04, 0)
+ std::shared_ptr<GfxFont> gfxFont = state->getFont();
+#else
GfxFont *gfxFont = state->getFont();
+#endif
if( !gfxFont )
return;
@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta
m_aFontMap.find( fontID );
if( it == m_aFontMap.end() )
{
+#if POPPLER_CHECK_VERSION(22, 04, 0)
+ nEmbedSize = parseFont( fontID, gfxFont.get(), state );
+#else
nEmbedSize = parseFont( fontID, gfxFont, state );
+#endif
it = m_aFontMap.find( fontID );
}
@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta
if (nEmbedSize)
{
+#if POPPLER_CHECK_VERSION(22, 04, 0)
+ writeFontFile(gfxFont.get());
+#else
writeFontFile(gfxFont);
+#endif
}
}
