rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 973229 from LibreOffice:Factory

Browse Source 
- Filter out binary-or-shlib-defines-rpath with $ORIGIN argument.
  It is pretty fine and it is newly reported by rpmlint.

- Add poppler-22-04-0.patch

OBS-URL: https://build.opensuse.org/request/show/973229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=253
This commit is contained in:
Dominique Leuenberger 2022-04-28 21:07:20 +00:00 committed by Git OBS Bridge
commit 25c7033656
4 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libreoffice-rpmlintrc
View File

@ -1,2 +1,3 @@
# libreoffice devel package is de facto called libreoffice-sdk # libreoffice devel package is de facto called libreoffice-sdk
#addFilter("devel-file-in-non-devel-package") #addFilter("devel-file-in-non-devel-package")
addFilter("binary-or-shlib-defines-rpath .*ORIGIN")

11
libreoffice.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Apr 27 09:22:38 UTC 2022 - Martin Liška <mliska@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.spinella@suse.com>
- Add poppler-22-04-0.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com> Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

3
libreoffice.spec
View File

@ -115,6 +115,8 @@ Patch990: install-with-hardlinks.diff
Patch991: libreoffice-no-destdircheck.patch Patch991: libreoffice-no-destdircheck.patch
# PATCH-FIX-UPSTRAM poppler-22-03-0.patch # PATCH-FIX-UPSTRAM poppler-22-03-0.patch
Patch992: 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: %{name}-share-linker
BuildRequires: ant BuildRequires: ant
BuildRequires: autoconf BuildRequires: autoconf
@ -1025,6 +1027,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1
%patch992 -p1 %patch992 -p1
%patch993 -p1
# Disable some of the failing tests (some are random) # Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330

98
poppler-22-04-0.patch Normal file
View File

@ -0,0 +1,98 @@
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
}
}