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

Accepting request 959715 from home:iznogood:factory

Browse Source 
Fix build with poppler 22.03.0. 
Staging M please when forwarded to Factory

OBS-URL: https://build.opensuse.org/request/show/959715
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=994
This commit is contained in:
Danilo Spinella 2022-03-07 09:35:12 +00:00 committed by Git OBS Bridge
parent 627900c2b0
commit a1b41309db
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch
lifted from arch linux.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com> Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

3
libreoffice.spec
View File

@ -112,6 +112,8 @@ Patch101: 0001-Revert-java-9-changes.patch
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep # save time by relying on rpm check rather than doing stupid find+grep
Patch991: libreoffice-no-destdircheck.patch Patch991: libreoffice-no-destdircheck.patch
# PATCH-FIX-UPSTRAM poppler-22-03-0.patch
Patch992: poppler-22-03-0.patch
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
BuildRequires: ant BuildRequires: ant
BuildRequires: autoconf BuildRequires: autoconf
@ -1015,6 +1017,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif %endif
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1
%patch992 -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

29
poppler-22-03-0.patch Normal file
View File

@ -0,0 +1,29 @@
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;