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

Accepting request 789001 from home:mgorse:factory

Browse Source 
- Add poppler-0.86.patch: fix the build with poppler 0.86.

OBS-URL: https://build.opensuse.org/request/show/789001
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=870
This commit is contained in:
Tomáš Chvátal 2020-03-27 12:51:45 +00:00 committed by Git OBS Bridge
parent 164ab0e2fe
commit f67626654b
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 27 12:04:43 UTC 2020 - Michael Gorse <mgorse@suse.com>
- Add poppler-0.86.patch: fix the build with poppler 0.86.
-------------------------------------------------------------------
Sun Mar 15 07:08:09 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

2
libreoffice.spec
View File

@ -99,6 +99,7 @@ Patch1: scp2-user-config-suse.diff
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch6: fix_old_boost_spirit_namespace.patch
Patch7: poppler-0.86.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@ -955,6 +956,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch2
%patch3
%patch6 -p1
%patch7 -p1
%patch990 -p1
%patch991 -p1

23
poppler-0.86.patch Normal file
View File

@ -0,0 +1,23 @@
From c1adc0a7559340213d754db950fd68bfe9e5a651 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <foss@martin-whitaker.me.uk>
Date: Sun, 15 Mar 2020 13:14:34 +0000
Subject: [PATCH] Fix build with poppler 0.86.0.
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
if (!(pAction && pAction->getKind() == actionURI))
return;
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
#else
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
--
2.21.1