diff -Nru popplerkit.framework-0.0.20051227svn/debian/changelog popplerkit.framework-0.0.20051227svn/debian/changelog --- popplerkit.framework-0.0.20051227svn/debian/changelog 2018-12-12 15:40:57.000000000 +0000 +++ popplerkit.framework-0.0.20051227svn/debian/changelog 2020-08-20 15:17:50.000000000 +0000 @@ -1,3 +1,9 @@ +popplerkit.framework (0.0.20051227svn-8+rpi1) bullseye-staging; urgency=medium + + * Fix build with poppler 0.85 + + -- Peter Michael Green Thu, 20 Aug 2020 15:17:50 +0000 + popplerkit.framework (0.0.20051227svn-8) unstable; urgency=medium [ Sebastien Bacher ] diff -Nru popplerkit.framework-0.0.20051227svn/debian/patches/build_poppler85.patch popplerkit.framework-0.0.20051227svn/debian/patches/build_poppler85.patch --- popplerkit.framework-0.0.20051227svn/debian/patches/build_poppler85.patch 1970-01-01 00:00:00.000000000 +0000 +++ popplerkit.framework-0.0.20051227svn/debian/patches/build_poppler85.patch 2020-08-20 15:17:50.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Fix build with poppler 0.85 +Author: Peter Michael Green + +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(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 diff -Nru popplerkit.framework-0.0.20051227svn/debian/patches/series popplerkit.framework-0.0.20051227svn/debian/patches/series --- popplerkit.framework-0.0.20051227svn/debian/patches/series 2018-12-12 15:40:57.000000000 +0000 +++ popplerkit.framework-0.0.20051227svn/debian/patches/series 2020-08-20 15:17:50.000000000 +0000 @@ -3,3 +3,4 @@ C++-compilation.patch poppler020.patch build_poppler71.patch +build_poppler85.patch