pool/libreoffice
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=258

Browse Source
This commit is contained in:
Tomáš Chvátal
2015-04-16 13:42:18 +00:00
committed by Git OBS Bridge
parent 04ad05b0ca
commit 68dd25f360
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
0001-Make-cpp-poppler-version.h-header-optional.patch
View File

@@ -1,4 +1,4 @@
From e0d1a6ee0a54f677ce31c612e198f9c1a7dc555a Mon Sep 17 00:00:00 2001
From 20e8dfef3957e6e94677f7609543a24b60f2ebfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Thu, 16 Apr 2015 10:13:06 +0200
Subject: [PATCH] Make cpp/poppler-version.h header optional
@@ -9,12 +9,30 @@ possible working candidate and also raise the .pc check to the same.
Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
---
configure.ac | 8 +++++---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++
2 files changed, 12 insertions(+), 3 deletions(-)
config_host/config_poppler.h.in | 10 ++++++++++
configure.ac | 9 ++++++---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++
3 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 config_host/config_poppler.h.in
diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
new file mode 100644
index 0000000..458c49b
--- /dev/null
+++ b/config_host/config_poppler.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for poppler header file dection
+*/
+
+#ifndef CONFIG_POPPLER_H
+#define CONFIG_POPPLER_H
+
+#define HAVE_POPPLER_VERSION_H 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 9e8e1d2..426e909 100644
index 9e8e1d2..79effbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
@@ -31,7 +49,7 @@ index 9e8e1d2..426e909 100644
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
+ AC_CHECK_HEADER([cpp/poppler-version.h],
+ [AC_DEFINE([HAVE_POPPLER_VERSION_H])],
+ [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)],
+ [])
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
@@ -40,10 +58,18 @@ index 9e8e1d2..426e909 100644
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=
BUILD_TYPE="$BUILD_TYPE POPPLER"
+ AC_DEFINE([HAVE_POPPLER_VERSION_H])
+ AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
fi
else
AC_MSG_RESULT([no])
@@ -13002,6 +13004,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
+AC_CONFIG_HEADERS([config_host/config_poppler.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = TRUE; then
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d15491b..06a0120 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -52,7 +78,7 @@ index d15491b..06a0120 100644
class GfxPath;
class GfxFont;
class PDFDoc;
+#ifdef HAVE_POPPLER_VERSION_H
+#if HAVE_POPPLER_VERSION_H
#include <cpp/poppler-version.h>
+#else
+#define POPPLER_VERSION "0.12.3"