diff --git a/libreoffice-rhel6poppler.patch b/libreoffice-rhel6poppler.patch new file mode 100644 index 0000000..046ad4f --- /dev/null +++ b/libreoffice-rhel6poppler.patch @@ -0,0 +1,38 @@ +--- configure.in 2011-11-10 13:22:02.062474990 +0000 ++++ configure.in 2011-11-10 13:22:35.072472880 +0000 +@@ -6354,16 +6354,6 @@ + AC_MSG_RESULT([external]) + SYSTEM_POPPLER=YES + PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) +- AC_LANG_PUSH([C++]) +- save_CXXFLAGS=$CXXFLAGS +- save_CPPFLAGS=$CPPFLAGS +- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS" +- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" +- AC_CHECK_HEADER([cpp/poppler-version.h], [], +- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], []) +- CXXFLAGS=$save_CXXFLAGS +- CPPFLAGS=$save_CPPFLAGS +- AC_LANG_POP([C++]) + else + AC_MSG_RESULT([internal]) + SYSTEM_POPPLER=NO +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:22:11.949473646 +0000 ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:23:24.889473889 +0000 +@@ -64,16 +64,8 @@ + class GfxPath; + class GfxFont; + class PDFDoc; +-#ifndef SYSTEM_POPPLER + #define POPPLER_CHECK_VERSION(major,minor,micro) (0) + typedef GString GooString; +-#else +-#include +-#define POPPLER_CHECK_VERSION(major,minor,micro) \ +- (POPPLER_VERSION_MAJOR > (major) || \ +- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ +- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro))) +-#endif + + namespace pdfi + { diff --git a/libreoffice.spec b/libreoffice.spec index 4a6b1f6..bcc966c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -137,6 +137,7 @@ Patch32: libreoffice-libwpd08-1.patch Patch33: libreoffice-libwpd08-2.patch Patch34: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch Patch35: libreoffice-gcj.patch +Patch36: libreoffice-rhel6poppler.patch %endif %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -814,10 +815,11 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch30 -p1 -b .fdo32665-handle-that-FreeSerif-lacks-some-.patch %patch31 -p1 -b .Backport-reading-AES-encrypted-ODF-1.2-documents.patch %if 0%{?rhel} -%patch32 -p1 -b .libreoffice-libwpd08-1.patch +%patch32 -p1 -b .libwpd08-1.patch %patch33 -p1 -R -b .libreoffice-libwpd08-2.patch %patch34 -p1 -R -b .wpsimport -%patch35 -p1 -b .libreoffice-gcj.patch +%patch35 -p1 -b .gcj.patch +%patch36 -p0 -b .rhel6poppler.patch %endif # these are horribly incomplete--empty translations and copied english