1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
Description: Fix build with poppler 0.85
Author: Peter Michael Green <plugwash@raspbian.org>
Forwarded: not-needed
Last-Update: 2020-09-20
---
Index: popplerkit.framework-0.0.20051227svn/bindings/GNUmakefile
===================================================================
--- popplerkit.framework-0.0.20051227svn.orig/bindings/GNUmakefile
+++ popplerkit.framework-0.0.20051227svn/bindings/GNUmakefile
@@ -57,4 +57,8 @@ ifeq ($(POPPLER_0_20), YES)
bindings_CCFLAGS += -DPOPPLER_0_20
endif
+ifeq ($(POPPLER_0_85), YES)
+ bindings_CCFLAGS += -DPOPPLER_0_20 -DPOPPLER_0_85
+endif
+
include $(GNUSTEP_MAKEFILES)/subproject.make
Index: popplerkit.framework-0.0.20051227svn/bindings/poppler.cc
===================================================================
--- popplerkit.framework-0.0.20051227svn.orig/bindings/poppler.cc
+++ popplerkit.framework-0.0.20051227svn/bindings/poppler.cc
@@ -125,6 +125,8 @@ int poppler_init(const unsigned char* fc
#ifdef POPPLER_0_6
globalParams = new GlobalParams();
+#elif POPPLER_0_85
+ globalParams = std::make_unique<GlobalParams>(nullptr);
#else
globalParams = new GlobalParams(NULL);
#endif
Index: popplerkit.framework-0.0.20051227svn/config.sh
===================================================================
--- popplerkit.framework-0.0.20051227svn.orig/config.sh
+++ popplerkit.framework-0.0.20051227svn/config.sh
@@ -69,6 +69,11 @@ if [ $? -eq 0 ]; then
POPPLER_VERSION="POPPLER_0_20"
fi
+${PKG_CONFIG} --atleast-version=0.85.0 poppler
+if [ $? -eq 0 ]; then
+ POPPLER_VERSION="POPPLER_0_85"
+fi
+
echo $POPPLER_VERSION
# include freetype, just to be sure
|
