cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with poppler-0.72.0.

Browse Source
This commit is contained in:
kili 2019-01-04 21:17:58 +00:00
parent 67a36501a9
commit 06a527c1c5
2 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
graphics/gdcm/patches/patch-Applications_Cxx_gdcminfo_cxx Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-Applications_Cxx_gdcminfo_cxx,v 1.1 2019/01/04 21:17:58 kili Exp $
Fix for newer poppler.
Index: Applications/Cxx/gdcminfo.cxx
--- Applications/Cxx/gdcminfo.cxx.orig
+++ Applications/Cxx/gdcminfo.cxx
@@ -202,7 +202,7 @@ static std::string getInfoDate(Dict *infoDict, const c
#endif
{
const GooString* gs = obj.getString();
- s = gs->getCString();
+ s = gs->c_str();
if (s[0] == 'D' && s[1] == ':')
{
s += 2;
@@ -258,7 +258,7 @@ static std::string getInfoString(Dict *infoDict, const
{
Object obj;
const GooString *s1;
- GBool isUnicode;
+ bool isUnicode;
Unicode u;
char buf[8];
int i, n;
@@ -274,12 +274,12 @@ static std::string getInfoString(Dict *infoDict, const
if ((s1->getChar(0) & 0xff) == 0xfe &&
(s1->getChar(1) & 0xff) == 0xff)
{
- isUnicode = gTrue;
+ isUnicode = true;
i = 2;
}
else
{
- isUnicode = gFalse;
+ isUnicode = false;
i = 0;
}
while (i < obj.getString()->getLength())

54
graphics/gdcm/patches/patch-Applications_Cxx_gdcmpdf_cxx Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-Applications_Cxx_gdcmpdf_cxx,v 1.1 2019/01/04 21:17:58 kili Exp $
Fix for newer poppler.
Index: Applications/Cxx/gdcmpdf.cxx
--- Applications/Cxx/gdcmpdf.cxx.orig
+++ Applications/Cxx/gdcmpdf.cxx
@@ -50,7 +50,7 @@ static std::string getInfoDate(Dict *infoDict, const c
#endif
{
const GooString* gs = obj.getString();
- s = gs->getCString();
+ s = gs->c_str();
if (s[0] == 'D' && s[1] == ':')
{
s += 2;
@@ -102,11 +102,11 @@ static std::string getInfoDate(Dict *infoDict, const c
return out;
}
-static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode)
+static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, bool & unicode)
{
Object obj;
const GooString *s1;
- GBool isUnicode = gFalse;
+ bool isUnicode = false;
Unicode u;
char buf[8];
int i, n;
@@ -122,12 +122,12 @@ static std::string getInfoString(Dict *infoDict, const
if ((s1->getChar(0) & 0xff) == 0xfe &&
(s1->getChar(1) & 0xff) == 0xff)
{
- isUnicode = gTrue;
+ isUnicode = true;
i = 2;
}
else
{
- isUnicode = gFalse;
+ isUnicode = false;
i = 0;
}
while (i < obj.getString()->getLength())
@@ -398,7 +398,7 @@ http://msdn.microsoft.com/en-us/library/078sfkak(VS.80
std::string creationdate;
std::string moddate;
- GBool isUnicode = gFalse;
+ bool isUnicode = false;
if (doc->isOk())
{
#ifdef LIBPOPPLER_NEW_OBJECT_API