From 2eea2ad1f0bcbdbbe4c0f774d231bca1955444e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 2 Sep 2011 13:19:30 +0100 Subject: [PATCH] Resolves: rhbz#735182 allow rebuild against poppler 0.17.3 --- ...5182-libreoffice-doesn-t-build-with-.patch | 38 +++++++++++++++++++ libreoffice.spec | 7 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch diff --git a/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch b/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch new file mode 100644 index 0000000..96541fb --- /dev/null +++ b/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch @@ -0,0 +1,38 @@ +From 911227ffc1a0f4a84afabe28f3cc5b54ab475f83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 2 Sep 2011 13:15:49 +0100 +Subject: [PATCH] Resolves: rhbz#735182 libreoffice doesn't build with + poppler-0.17.3 + +--- + .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index cf28922..3f1261c 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer ) + void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) + { + // dump JPEG file as-is ++#if POPPLER_CHECK_VERSION(0, 17, 3) ++ str = str->getBaseStream(); ++#else + str = ((DCTStream *)str)->getRawStream(); ++#endif + str->reset(); + + int c; +@@ -490,7 +494,7 @@ void PDFOutDev::endPage() + } + + #if POPPLER_CHECK_VERSION(0, 17, 0) +-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) ++void PDFOutDev::processLink(AnnotLink *link, Catalog *) + #else + void PDFOutDev::processLink(Link* link, Catalog*) + #endif +-- +1.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 82ed2d2..f5dac88 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -121,6 +121,7 @@ Patch26: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch Patch27: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch Patch28: gdb-pretty-printers.patch Patch29: 0001-Related-fdo-37195-migrationoo3-not-registered.patch +Patch30: 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -788,6 +789,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch27 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch %patch28 -p1 %patch29 -p1 -b .fdo37195-migrationoo3-not-registered.patch +%patch30 -p1 -b .rhbz735182-libreoffice-doesn-t-build-with-.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2087,6 +2089,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Fri Sep 02 2011 Caolán McNamara - 3.4.3.2-5 +- Resolves: rhbz#735182 be able to rebuild against poppler 0.17.3 + * Tue Aug 30 2011 David Tardon - 3.4.3.2-4 - Resolves: rhbz#734432 openoffice.org symlink broken