fix graphics/pdf2djvu with poppler-0.73.0

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

fix graphics/pdf2djvu with poppler-0.73.0

Matthias Kilian
Hi,

goo/gtypes.h has been removed from poppler, the Goffset typedef
(which is the only one used by pdf2djvu) moved to goo/gfile.h (and
I wonder when *this* one will be removed).

To be committed *after* the update to poppler-0.73.0.

ok?

Ciao,
        Kili

Index: patches/patch-pdf-backend_cc
===================================================================
RCS file: /cvs/ports/graphics/pdf2djvu/patches/patch-pdf-backend_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pdf-backend_cc
--- patches/patch-pdf-backend_cc 28 Dec 2018 19:59:50 -0000 1.1
+++ patches/patch-pdf-backend_cc 10 Jan 2019 22:18:50 -0000
@@ -2,11 +2,21 @@ $OpenBSD: patch-pdf-backend_cc,v 1.1 201
 
 Fix with newer poppler.
 
-From upstream commit 82699eee6b071c1f80682987d6842f4b61d024be.
+From upstream commit 82699eee6b071c1f80682987d6842f4b61d024be,
+gtypes/gfile replacement local to our tree.
 
 Index: pdf-backend.cc
 --- pdf-backend.cc.orig
 +++ pdf-backend.cc
+@@ -32,7 +32,7 @@
+ #include <GlobalParams.h>
+ #include <PDFDoc.h>
+ #include <goo/GooString.h>
+-#include <goo/gtypes.h>
++#include <goo/gfile.h>
+ #include <splash/SplashClip.h>
+ #include <splash/SplashTypes.h>
+
 @@ -226,7 +226,7 @@ const std::string pdf::Document::get_xmp()
    mstring.reset(this->readMetadata());
    if (mstring.get() == nullptr)
Index: patches/patch-pdf-backend_hh
===================================================================
RCS file: /cvs/ports/graphics/pdf2djvu/patches/patch-pdf-backend_hh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pdf-backend_hh
--- patches/patch-pdf-backend_hh 28 Dec 2018 19:59:50 -0000 1.1
+++ patches/patch-pdf-backend_hh 10 Jan 2019 22:18:50 -0000
@@ -2,15 +2,26 @@ $OpenBSD: patch-pdf-backend_hh,v 1.1 201
 
 Fix with newer poppler.
 
-From upstream commit 82699eee6b071c1f80682987d6842f4b61d024be.
+From upstream commit 82699eee6b071c1f80682987d6842f4b61d024be,
+gtypes/gfile replacement local to our tree.
 
 Index: pdf-backend.hh
 --- pdf-backend.hh.orig
 +++ pdf-backend.hh
-@@ -433,6 +433,14 @@ namespace pdf
+@@ -40,7 +40,7 @@
+ #include <SplashOutputDev.h>
+ #include <Stream.h>
+ #include <goo/GooString.h>
+-#include <goo/gtypes.h>
++#include <goo/gfile.h>
+ #include <splash/Splash.h>
+ #include <splash/SplashBitmap.h>
+ #include <splash/SplashClip.h>
+@@ -432,6 +432,14 @@ namespace pdf
+  */
 
    double get_path_area(pdf::splash::Path &path);
-
++
 +  const char * get_c_string(const pdf::String &str);
 +
 +  inline const char * get_c_string(const pdf::String *str)
@@ -18,7 +29,6 @@ Index: pdf-backend.hh
 +    return get_c_string(*str);
 +  }
 +
-+
+
  }
 
- #endif