pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix build with poppler-0.72
details: https://anonhg.NetBSD.org/pkgsrc/rev/853abe657645
branches: trunk
changeset: 316383:853abe657645
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Tue Dec 11 12:59:49 2018 +0000
description:
Fix build with poppler-0.72
diffstat:
misc/libreoffice/distinfo | 4 +-
misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx | 20 ++-
print/luatex/distinfo | 6 +-
print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w | 10 +-
print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc | 76 +++++++++-
print/web2c/distinfo | 6 +-
print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc | 13 +-
print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc | 29 +++-
8 files changed, 143 insertions(+), 21 deletions(-)
diffs (truncated from 356 to 300 lines):
diff -r 34e322bcb12e -r 853abe657645 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Tue Dec 11 12:41:02 2018 +0000
+++ b/misc/libreoffice/distinfo Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2018/12/04 12:56:48 ryoon Exp $
+$NetBSD: distinfo,v 1.67 2018/12/11 12:59:49 ryoon Exp $
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -236,7 +236,7 @@
SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
SHA1 (patch-mysqlc_Library__mysqlc.mk) = c5560b4739cf54b8207c7d9dfa2a22ffeeee8cfd
SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 3797e214235ca1b196bf634e2200b2f9e67f5381
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 1910ebf571181b2f6a973e2f6537baf67edbcb4a
SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 15a5d9708a5349f6584231dcf787537618371cb0
SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx) = f2ecf16e731bebc88639598c5e63b05998317f8a
SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
diff -r 34e322bcb12e -r 853abe657645 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx Tue Dec 11 12:41:02 2018 +0000
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.6 2018/12/04 12:56:49 ryoon Exp $
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.7 2018/12/11 12:59:49 ryoon Exp $
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-29 19:55:29.000000000 +0000
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -11,6 +11,15 @@
m_bSkipImages(false)
{
}
+@@ -555,7 +555,7 @@ void PDFOutDev::processLink(Link* link,
+ LinkAction* pAction = link->getAction();
+ if (pAction && pAction->getKind() == actionURI)
+ {
+- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+
+ std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+
@@ -578,7 +578,7 @@ void PDFOutDev::restoreState(GfxState*)
printf( "restoreState\n" );
}
@@ -20,6 +29,15 @@
{
assert(pMat);
+@@ -753,7 +753,7 @@ void PDFOutDev::updateFont(GfxState *sta
+
+ aFont = it->second;
+
+- std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+ printf( " %d %d %d %d %f %d %s",
+ aFont.isEmbedded,
+ aFont.isBold,
@@ -939,11 +939,11 @@ void PDFOutDev::endTextObject(GfxState*)
}
diff -r 34e322bcb12e -r 853abe657645 print/luatex/distinfo
--- a/print/luatex/distinfo Tue Dec 11 12:41:02 2018 +0000
+++ b/print/luatex/distinfo Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2018/12/04 13:00:41 ryoon Exp $
+$NetBSD: distinfo,v 1.33 2018/12/11 13:35:11 ryoon Exp $
SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
@@ -8,5 +8,5 @@
SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
SHA1 (patch-texk_web2c_luatexdir_font_writet1.w) = c5d9b0bf411ff67028cbeee629bebc95f05c94e3
-SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = fde688aeb1bc27dcdc7a1db959429e9200de41cf
-SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 9f624ea72bbe83efc4aba8fcef1c92f034830a5c
+SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = e0c03f51151389e89c4a9a2cc8bf7d25051df2b7
+SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 5af405d312f7042cf3620bd92039ae3b92ce4d83
diff -r 34e322bcb12e -r 853abe657645 print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w Tue Dec 11 12:41:02 2018 +0000
+++ b/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.6 2018/12/04 13:00:42 ryoon Exp $
+$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.7 2018/12/11 13:35:12 ryoon Exp $
--- texk/web2c/luatexdir/image/pdftoepdf.w.orig 2018-01-17 18:00:12.000000000 +0000
+++ texk/web2c/luatexdir/image/pdftoepdf.w
@@ -11,7 +11,7 @@
/* Maintain AVL tree of all PDF files for embedding */
-@@ -361,9 +361,9 @@ void copyReal(PDF pdf, double d)
+@@ -361,12 +361,12 @@ void copyReal(PDF pdf, double d)
pdf->cave = true;
}
@@ -22,7 +22,11 @@
+ const char *p;
unsigned char c;
size_t i, l;
- p = string->getCString();
+- p = string->getCString();
++ p = string->c_str();
+ l = (size_t) string->getLength();
+ if (pdf->cave)
+ pdf_out(pdf, ' ');
@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooStrin
pdf->cave = true;
}
diff -r 34e322bcb12e -r 853abe657645 print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc Tue Dec 11 12:41:02 2018 +0000
+++ b/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.6 2018/12/04 13:00:42 ryoon Exp $
+$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.7 2018/12/11 13:35:12 ryoon Exp $
--- texk/web2c/luatexdir/lua/lepdflib.cc.orig 2018-02-14 14:44:38.000000000 +0000
+++ texk/web2c/luatexdir/lua/lepdflib.cc
@@ -47,7 +47,7 @@
uout->pc = uin->pc; \
uout->pd = uin->pd; \
} else \
-@@ -669,7 +671,7 @@ static int m_##in##_##function(lua_State
+@@ -669,14 +671,14 @@ static int m_##in##_##function(lua_State
#define m_poppler_get_GOOSTRING(in, function) \
static int m_##in##_##function(lua_State * L) \
{ \
@@ -56,6 +56,32 @@
udstruct *uin; \
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
+ pdfdoc_changed_error(L); \
+ gs = ((in *) uin->d)->function(); \
+ if (gs != NULL) \
+- lua_pushlstring(L, gs->getCString(), gs->getLength()); \
++ lua_pushlstring(L, gs->c_str(), gs->getLength()); \
+ else \
+ lua_pushnil(L); \
+ return 1; \
+@@ -911,7 +913,7 @@ static int m_Array_getString(lua_State *
+ if (i > 0 && i <= len) {
+ gs = new GooString();
+ if (((Array *) uin->d)->getString(i - 1, gs))
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ delete gs;
+@@ -1063,7 +1065,7 @@ static int m_Catalog_getJS(lua_State * L
+ if (i > 0 && i <= len) {
+ gs = ((Catalog *) uin->d)->getJS(i - 1);
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ delete gs;
@@ -1125,7 +1127,7 @@ m_poppler_get_INT(Dict, getLength);
static int m_Dict_add(lua_State * L)
@@ -65,6 +91,15 @@
udstruct *uin, *uobj;
uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -1378,7 +1380,7 @@ static int m_GooString__tostring(lua_Sta
+ uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
+ pdfdoc_changed_error(L);
+- lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
++ lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
+ ((GooString *) uin->d)->getLength());
+ return 1;
+ }
@@ -1527,9 +1529,9 @@ static int m_Object_initBool(lua_State *
pdfdoc_changed_error(L);
luaL_checktype(L, 2, LUA_TBOOLEAN);
@@ -77,7 +112,7 @@
return 0;
}
-@@ -1807,7 +1809,7 @@ static int m_Object_getNum(lua_State * L
+@@ -1807,14 +1809,14 @@ static int m_Object_getNum(lua_State * L
static int m_Object_getString(lua_State * L)
{
@@ -86,6 +121,14 @@
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
+ pdfdoc_changed_error(L);
+ if (((Object *) uin->d)->isString()) {
+ gs = ((Object *) uin->d)->getString();
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ } else
+ lua_pushnil(L);
+ return 1;
@@ -2051,7 +2053,7 @@ static int m_Object_dictAdd(lua_State *
pdfdoc_changed_error(L);
if (!((Object *) uin->d)->isDict())
@@ -95,7 +138,7 @@
return 0;
}
-@@ -2465,7 +2467,7 @@ m_PDFDoc_INT(getErrorCode);
+@@ -2465,14 +2467,14 @@ m_PDFDoc_INT(getErrorCode);
static int m_PDFDoc_getFileName(lua_State * L)
{
@@ -104,6 +147,14 @@
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
+ pdfdoc_changed_error(L);
+ gs = ((PdfDocument *) uin->d)->doc->getFileName();
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ return 1;
@@ -2553,7 +2555,7 @@ m_PDFDoc_INT(getNumPages);
static int m_PDFDoc_readMetadata(lua_State * L)
@@ -113,6 +164,15 @@
udstruct *uin;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -2561,7 +2563,7 @@ static int m_PDFDoc_readMetadata(lua_Sta
+ if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+ gs = ((PdfDocument *) uin->d)->doc->readMetadata();
+ if (gs != NULL)
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ } else
@@ -2571,7 +2573,7 @@ static int m_PDFDoc_readMetadata(lua_Sta
static int m_PDFDoc_getStructTreeRoot(lua_State * L)
@@ -155,7 +215,7 @@
Ref *r;
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
-@@ -3226,13 +3228,13 @@ static int m_StructElement_setRevision(l
+@@ -3226,16 +3228,16 @@ static int m_StructElement_setRevision(l
static int m_StructElement_getText(lua_State * L)
{
@@ -170,7 +230,11 @@
+ i = (bool) lua_toboolean(L, 2);
gs = ((StructElement *) uin->d)->getText(i);
if (gs != NULL)
- lua_pushlstring(L, gs->getCString(), gs->getLength());
+- lua_pushlstring(L, gs->getCString(), gs->getLength());
++ lua_pushlstring(L, gs->c_str(), gs->getLength());
+ else
+ lua_pushnil(L);
+ return 1;
@@ -3321,7 +3323,7 @@ static int m_StructElement_findAttribute
{
Attribute::Type t;
diff -r 34e322bcb12e -r 853abe657645 print/web2c/distinfo
--- a/print/web2c/distinfo Tue Dec 11 12:41:02 2018 +0000
+++ b/print/web2c/distinfo Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2018/12/04 13:01:44 ryoon Exp $
+$NetBSD: distinfo,v 1.30 2018/12/11 13:59:04 ryoon Exp $
SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
@@ -7,7 +7,7 @@
SHA1 (patch-Makefile.in) = 28e7ad00f3796b49f92c5cc3eb3c94bdf38b1364
SHA1 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
SHA1 (patch-pdftexdir_pdftex-common.h) = 59f32828de5dd032307467d83e43f21382a39330
-SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = a2a177c8ad40fe0fce1b8cb88703e01b995eac97
-SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 720471f420cbf1caf241e84be233e51c9237e8a3
+SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = 0fcd475d4dce7778e3f49fb7eb66f79d61f5ba10
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = bacaac68c6685fb9b09226e91e3f3a33ab10937a
SHA1 (patch-pdftexdir_writeenc.c) = daf41fec97d3d3e46063d8cf4c559d96e1ec69bf
SHA1 (patch-pdftexdir_writet1.c) = 7d00d5d5d3f884bc1f9946cb3fbcaa7f224df9de
diff -r 34e322bcb12e -r 853abe657645 print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
--- a/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc Tue Dec 11 12:41:02 2018 +0000
+++ b/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.2 2018/12/04 13:01:44 ryoon Exp $
+$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.3 2018/12/11 13:59:04 ryoon Exp $
--- pdftexdir/pdftoepdf-newpoppler.cc.orig 2018-04-04 04:08:11.000000000 +0000
+++ pdftexdir/pdftoepdf-newpoppler.cc
@@ -52,7 +52,7 @@
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
-+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
++ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -76,6 +76,15 @@
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
Home |
Main Index |
Thread Index |
Old Index