diff --git a/inkscape/.footprint b/inkscape/.footprint index 9a876c7b7..05fcfec3e 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -905,8 +905,6 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.ru.png -rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.sk.png -rw-r--r-- root/root usr/share/inkscape/tutorials/pixelart-dialog.zh_TW.png --rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.be.png --rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.ca.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.de.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.el.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.en.png @@ -926,7 +924,6 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.sk.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.sl.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.vi.png --rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.zh_CN.png -rw-r--r-- root/root usr/share/inkscape/tutorials/potrace.zh_TW.png -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.ca.svg @@ -937,6 +934,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.eu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.fa.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.fr.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.gl.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.hu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.id.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.it.svg @@ -991,6 +989,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.eu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.fa.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.fr.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.gl.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.hu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.id.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.ja.svg @@ -1012,6 +1011,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.eu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.fa.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.fr.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.gl.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.hu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.id.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.it.svg @@ -1029,6 +1029,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.de.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.el.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.fr.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.gl.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.hu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.ja.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.nl.svg @@ -1074,6 +1075,7 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.eu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.fa.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.fr.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.gl.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.hu.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.id.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.it.svg diff --git a/inkscape/.md5sum b/inkscape/.md5sum index 636a1d9e2..ace575344 100644 --- a/inkscape/.md5sum +++ b/inkscape/.md5sum @@ -1,2 +1,2 @@ -6f6bcbd0237ecd064460315465467b04 inkscape-0.92.2.tar.bz2 -2d82a8b53fbab1b0a7de01e1444dfbfe poppler-0.58.patch +4ef7171cc1de9e1608d8c49b77fed99e inkscape-0.92.3.tar.bz2 +a40e58c35338bd6435467657a071cecd noconst.patch diff --git a/inkscape/.signature b/inkscape/.signature index f0ff999a0..f5fa77c0d 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xm43TrvZPh8N4SkMYKpmRBofHLR/FJ9RXp5uk+8GgQsp2LHYGqZU/JKlVngm0sFaVG2Qbzu9D5AI2SMT4RIZgc= -SHA256 (Pkgfile) = 986a7ecd3d453eaf292a658c5475b22e34d631f9af121609117675e93d5235e0 -SHA256 (.footprint) = da1084baa092a6172ffe78b59a8eea7f1faf1f947f902217f55c891e43c8c7e2 -SHA256 (inkscape-0.92.2.tar.bz2) = a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3 -SHA256 (poppler-0.58.patch) = 0505f49cf69ad51159cda5aa5f497f001fe9d10f34d59e6ad704a1b1e1dc50c1 +RWSagIOpLGJF3/QgDfhcsrrJ9WLSxfgHOsT12rIdi/EA7lhR7YK9DwufYGb8mblWAiHIRtAmIoy1CKJrcjTulCmkFXsS7XJQ5g0= +SHA256 (Pkgfile) = 35738ec598d3df3b2293ccb527a938df988befcaf16e7da606721d47184f20df +SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b +SHA256 (inkscape-0.92.3.tar.bz2) = 063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2 +SHA256 (noconst.patch) = 2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index fa45016e2..7b9b366f8 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -2,18 +2,19 @@ # URL: https://www.inkscape.org/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: boehm-gc boost gsl gtkmm poppler-glib popt +# Optional: rtmpdump openldap libexif openjade gtk-doc gtkspell brotli name=inkscape -version=0.92.2 -release=2 +version=0.92.3 +release=1 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2 - poppler-0.58.patch) + noconst.patch) build() { cd $name-$version - # https://gitlab.com/inkscape/inkscape/commit/93ccf03162cd2e46d962822d5507865f3451168c - patch -p1 -i $SRC/poppler-0.58.patch + patch -p1 -i $SRC/noconst.patch + sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp CXXFLAGS+=' -std=c++11' diff --git a/inkscape/noconst.patch b/inkscape/noconst.patch new file mode 100644 index 000000000..020949455 --- /dev/null +++ b/inkscape/noconst.patch @@ -0,0 +1,60 @@ +diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp +--- old/src/extension/internal/pdfinput/pdf-parser.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2018-04-21 08:55:27.901218709 -1000 +@@ -2490,7 +2490,7 @@ + builder->updateFont(state); + fontChanged = gFalse; + } +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2511,7 +2511,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[0].getString()); ++ doShowText((GooString *)args[0].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2534,7 +2534,7 @@ + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + builder->updateTextPosition(tx, ty); +- doShowText(args[2].getString()); ++ doShowText((GooString *)args[2].getString()); + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2572,7 +2572,7 @@ + } + builder->updateTextShift(state, obj.getNum()); + } else if (obj.isString()) { +- doShowText(obj.getString()); ++ doShowText((GooString *)obj.getString()); + } else { + error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); + } +@@ -2732,7 +2732,7 @@ + { + Object obj1, obj2, obj3, refObj; + +- char *name = args[0].getName(); ++ char *name = (char *)args[0].getName(); + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp +--- old/src/extension/internal/pdfinput/svg-builder.cpp 2018-03-11 10:38:09.000000000 -1000 ++++ new/src/extension/internal/pdfinput/svg-builder.cpp 2018-04-21 10:14:49.821436417 -1000 +@@ -1020,7 +1020,7 @@ + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = (char *)font->getName()->getCString(); + } else { + _font_specification = (char*) "Arial"; + } diff --git a/inkscape/poppler-0.58.patch b/inkscape/poppler-0.58.patch deleted file mode 100644 index 212bde5db..000000000 --- a/inkscape/poppler-0.58.patch +++ /dev/null @@ -1,1430 +0,0 @@ -diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake -index 836cfd9..c33a3bf 100644 ---- a/CMakeScripts/DefineDependsandFlags.cmake -+++ b/CMakeScripts/DefineDependsandFlags.cmake -@@ -124,6 +124,10 @@ if(ENABLE_POPPLER) - POPPLER_VERSION VERSION_EQUAL "0.29.0") - set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) - endif() -+ if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR -+ POPPLER_VERSION VERSION_EQUAL "0.58.0") -+ set(POPPLER_NEW_OBJECT_API ON) -+ endif() - else() - set(ENABLE_POPPLER_CAIRO OFF) - endif() -diff --git a/config.h.cmake b/config.h.cmake -index 00d6fb8..7af7da8 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -149,6 +149,9 @@ - /* Use color space API from Poppler >= 0.29.0 */ - #cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 - -+/* Use object API from Poppler >= 0.58.0 */ -+#cmakedefine POPPLER_NEW_OBJECT_API 1 -+ - /* Define to 1 if you have the `pow' function. */ - #cmakedefine HAVE_POW 1 - -diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp -index c1940b1..e311562 100644 ---- a/src/extension/internal/pdfinput/pdf-input.cpp -+++ b/src/extension/internal/pdfinput/pdf-input.cpp -@@ -840,14 +840,20 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - } - - // Parse the document structure -+#if defined(POPPLER_NEW_OBJECT_API) -+ Object obj = page->getContents(); -+#else - Object obj; - page->getContents(&obj); -+#endif - if (!obj.isNull()) { - pdf_parser->parse(&obj); - } - - // Cleanup -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - delete pdf_parser; - delete builder; - g_free(docname); -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index 5ede59b..604b7f8 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -414,13 +414,21 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - - if (obj->isArray()) { - for (int i = 0; i < obj->arrayGetLength(); ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj->arrayGet(i); -+#else - obj->arrayGet(i, &obj2); -+#endif - if (!obj2.isStream()) { - error(errInternal, -1, "Weird page contents"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - return; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } else if (!obj->isStream()) { - error(errInternal, -1, "Weird page contents"); -@@ -439,7 +447,11 @@ void PdfParser::go(GBool /*topLevel*/) - - // scan a sequence of objects - int numArgs = 0; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - parser->getObj(&obj); -+#endif - while (!obj.isEOF()) { - - // got a command - execute it -@@ -457,14 +469,20 @@ void PdfParser::go(GBool /*topLevel*/) - // Run the operation - execOp(&obj, args, numArgs); - -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); - for (int i = 0; i < numArgs; ++i) - args[i].free(); -+#endif - numArgs = 0; - - // got an argument - save it - } else if (numArgs < maxArgs) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ args[numArgs++] = std::move(obj); -+#else - args[numArgs++] = obj; -+#endif - - // too many arguments - something is wrong - } else { -@@ -475,13 +493,21 @@ void PdfParser::go(GBool /*topLevel*/) - printf("\n"); - fflush(stdout); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } - - // grab the next object -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - parser->getObj(&obj); -+#endif - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - - // args at end with no command - if (numArgs > 0) { -@@ -495,8 +521,10 @@ void PdfParser::go(GBool /*topLevel*/) - printf("\n"); - fflush(stdout); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - for (int i = 0; i < numArgs; ++i) - args[i].free(); -+#endif - } - } - -@@ -692,9 +720,13 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - if (length != 0) { - dash = (double *)gmallocn(length, sizeof(double)); - for (int i = 0; i < length; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ dash[i] = a->get(i).getNum(); -+#else - Object obj; - dash[i] = a->get(i, &obj)->getNum(); - obj.free(); -+#endif - } - } - state->setLineDash(dash, length, args[1].getNum()); -@@ -744,12 +776,18 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - GBool haveBackdropColor = gFalse; - GBool alpha = gFalse; - -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = res->lookupGState(args[0].getName())).isNull()) { -+#else - if (!res->lookupGState(args[0].getName(), &obj1)) { -+#endif - return; - } - if (!obj1.isDict()) { - error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type"), args[0].getName(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - return; - } - if (printCommands) { -@@ -759,7 +797,11 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } - - // transparency support: blend mode, fill/stroke opacity -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj2 = obj1.dictLookup(const_cast("BM"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast("BM"), &obj2)->isNull()) { -+#endif - GfxBlendMode mode = gfxBlendNormal; - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); -@@ -767,40 +809,71 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState"); - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast("ca"))).isNum()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast("ca"), &obj2)->isNum()) { -+#endif - state->setFillOpacity(obj2.getNum()); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast("CA"))).isNum()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast("CA"), &obj2)->isNum()) { -+#endif - state->setStrokeOpacity(obj2.getNum()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // fill/stroke overprint - GBool haveFillOP = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast("op"))).isBool())) { -+#else - if ((haveFillOP = (obj1.dictLookup(const_cast("op"), &obj2)->isBool()))) { -+#endif - state->setFillOverprint(obj2.getBool()); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast("OP"))).isBool()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast("OP"), &obj2)->isBool()) { -+#endif - state->setStrokeOverprint(obj2.getBool()); - if (!haveFillOP) { - state->setFillOverprint(obj2.getBool()); - } - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // stroke adjust -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast("SA"))).isBool()) { -+#else - if (obj1.dictLookup(const_cast("SA"), &obj2)->isBool()) { -+#endif - state->setStrokeAdjust(obj2.getBool()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // transfer function -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast("TR2"))).isNull()) { -+ obj2 = obj1.dictLookup(const_cast("TR")); -+#else - if (obj1.dictLookup(const_cast("TR2"), &obj2)->isNull()) { - obj2.free(); - obj1.dictLookup(const_cast("TR"), &obj2); -+#endif - } - if (obj2.isName(const_cast("Default")) || - obj2.isName(const_cast("Identity"))) { -@@ -809,9 +882,15 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else if (obj2.isArray() && obj2.arrayGetLength() == 4) { - int pos = 4; - for (int i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj3 = obj2.arrayGet(i); -+#else - obj2.arrayGet(i, &obj3); -+#endif - funcs[i] = Function::parse(&obj3); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - if (!funcs[i]) { - pos = i; - break; -@@ -828,21 +907,37 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else if (!obj2.isNull()) { - error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // soft mask -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj2 = obj1.dictLookup(const_cast("SMask"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast("SMask"), &obj2)->isNull()) { -+#endif - if (obj2.isName(const_cast("None"))) { - builder->clearSoftMask(state); - } else if (obj2.isDict()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj2.dictLookup(const_cast("S"))).isName(const_cast("Alpha"))) { -+#else - if (obj2.dictLookup(const_cast("S"), &obj3)->isName(const_cast("Alpha"))) { -+#endif - alpha = gTrue; - } else { // "Luminosity" - alpha = gFalse; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - funcs[0] = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj3 = obj2.dictLookup(const_cast("TR"))).isNull())) { -+#else - if (!obj2.dictLookup(const_cast("TR"), &obj3)->isNull()) { -+#endif - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -@@ -851,26 +946,45 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - funcs[0] = NULL; - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((haveBackdropColor = (obj3 = obj2.dictLookup(const_cast("BC"))).isArray())) { -+#else - obj3.free(); - if ((haveBackdropColor = obj2.dictLookup(const_cast("BC"), &obj3)->isArray())) { -+#endif - for (int i = 0; i < gfxColorMaxComps; ++i) { - backdropColor.c[i] = 0; - } - for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj4 = obj3.arrayGet(i); -+#else - obj3.arrayGet(i, &obj4); -+#endif - if (obj4.isNum()) { - backdropColor.c[i] = dblToCol(obj4.getNum()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj4.free(); -+#endif - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj2.dictLookup(const_cast("G"))).isStream()) { -+ if ((obj4 = obj3.streamGetDict()->lookup(const_cast("Group"))).isDict()) { -+#else - obj3.free(); - if (obj2.dictLookup(const_cast("G"), &obj3)->isStream()) { - if (obj3.streamGetDict()->lookup(const_cast("Group"), &obj4)->isDict()) { -+#endif - GfxColorSpace *blendingColorSpace = 0; - GBool isolated = gFalse; - GBool knockout = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj5 = obj4.dictLookup(const_cast("CS"))).isNull())) { -+#else - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); - #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -@@ -879,15 +993,25 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); - #endif - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj5 = obj4.dictLookup(const_cast("I"))).isBool()) { -+#else - obj5.free(); - if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { -+#endif - isolated = obj5.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj5 = obj4.dictLookup(const_cast("K"))).isBool()) { -+#else - obj5.free(); - if (obj4.dictLookup(const_cast("K"), &obj5)->isBool()) { -+#endif - knockout = obj5.getBool(); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj5.free(); -+#endif - if (!haveBackdropColor) { - if (blendingColorSpace) { - blendingColorSpace->getDefaultColor(&backdropColor); -@@ -906,18 +1030,24 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj4.free(); -+#endif - } else { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - } else if (!obj2.isNull()) { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState"); - } - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); - - obj1.free(); -+#endif - } - - void PdfParser::doSoftMask(Object *str, GBool alpha, -@@ -938,43 +1068,79 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, - dict = str->streamGetDict(); - - // check form type -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("FormType")); -+#else - dict->lookup(const_cast("FormType"), &obj1); -+#endif - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { - error(errSyntaxError, getPos(), "Unknown form type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get bounding box -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("BBox")); -+#else - dict->lookup(const_cast("BBox"), &obj1); -+#endif - if (!obj1.isArray()) { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - error(errSyntaxError, getPos(), "Bad form bounding box"); - return; - } - for (i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(i); -+#else - obj1.arrayGet(i, &obj2); -+#endif - bbox[i] = obj2.getNum(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+#else - obj2.free(); - } - obj1.free(); -+#endif - - // get matrix -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Matrix")); -+#else - dict->lookup(const_cast("Matrix"), &obj1); -+#endif - if (obj1.isArray()) { - for (i = 0; i < 6; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(i); -+#else - obj1.arrayGet(i, &obj2); -+#endif - m[i] = obj2.getNum(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } else { - m[0] = 1; m[1] = 0; - m[2] = 0; m[3] = 1; - m[4] = 0; m[5] = 0; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get resources -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Resources")); -+#else - dict->lookup(const_cast("Resources"), &obj1); -+#endif - resDict = obj1.isDict() ? obj1.getDict() : (Dict *)NULL; - - // draw it -@@ -987,7 +1153,9 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, - if (blendingColorSpace) { - delete blendingColorSpace; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - - void PdfParser::opSetRenderingIntent(Object /*args*/[], int /*numArgs*/) -@@ -1084,7 +1252,11 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) - Object obj; - - state->setFillPattern(NULL); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = res->lookupColorSpace(args[0].getName()); -+#else - res->lookupColorSpace(args[0].getName(), &obj); -+#endif - - GfxColorSpace *colorSpace = 0; - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -@@ -1106,7 +1278,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) - colorSpace = GfxColorSpace::parse(&obj, NULL); - } - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - if (colorSpace) { - GfxColor color; - state->setFillColorSpace(colorSpace); -@@ -1125,7 +1299,11 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) - GfxColorSpace *colorSpace = 0; - - state->setStrokePattern(NULL); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = res->lookupColorSpace(args[0].getName()); -+#else - res->lookupColorSpace(args[0].getName(), &obj); -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -@@ -1145,7 +1323,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) - colorSpace = GfxColorSpace::parse(&obj, NULL); - } - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - if (colorSpace) { - GfxColor color; - state->setStrokeColorSpace(colorSpace); -@@ -2375,7 +2555,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) - wMode = state->getFont()->getWMode(); - a = args[0].getArray(); - for (int i = 0; i < a->getLength(); ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = a->get(i); -+#else - a->get(i, &obj); -+#endif - if (obj.isNum()) { - // this uses the absolute value of the font size to match - // Acrobat's behavior -@@ -2392,7 +2576,9 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } - } - -@@ -2465,7 +2651,11 @@ void PdfParser::doShowText(GooString *s) { - //out->updateCTM(state, 1, 0, 0, 1, 0, 0); - if (0){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy, - code, u, uLen)) {*/ -+#if defined(POPPLER_NEW_OBJECT_API) -+ charProc = ((Gfx8BitFont *)font)->getCharProc(code); -+#else - ((Gfx8BitFont *)font)->getCharProc(code, &charProc); -+#endif - if ((resDict = ((Gfx8BitFont *)font)->getResources())) { - pushResources(resDict); - } -@@ -2478,7 +2668,9 @@ void PdfParser::doShowText(GooString *s) { - if (resDict) { - popResources(); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - charProc.free(); -+#endif - } - restoreState(); - // GfxState::restore() does *not* restore the current position, -@@ -2541,23 +2733,43 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) - Object obj1, obj2, obj3, refObj; - - char *name = args[0].getName(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = res->lookupXObject(name)).isNull()) { -+#else - if (!res->lookupXObject(name, &obj1)) { -+#endif - return; - } - if (!obj1.isStream()) { - error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - return; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.streamGetDict()->lookup(const_cast("Subtype")); -+#else - obj1.streamGetDict()->lookup(const_cast("Subtype"), &obj2); -+#endif - if (obj2.isName(const_cast("Image"))) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ refObj = res->lookupXObjectNF(name); -+#else - res->lookupXObjectNF(name, &refObj); -+#endif - doImage(&refObj, obj1.getStream(), gFalse); -+#if !defined(POPPLER_NEW_OBJECT_API) - refObj.free(); -+#endif - } else if (obj2.isName(const_cast("Form"))) { - doForm(&obj1); - } else if (obj2.isName(const_cast("PS"))) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj3 = obj1.streamGetDict()->lookup(const_cast("Level1")); -+#else - obj1.streamGetDict()->lookup(const_cast("Level1"), &obj3); -+#endif - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -@@ -2565,8 +2777,10 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); - obj1.free(); -+#endif - } - - void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) -@@ -2593,10 +2807,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - dict = str->getDict(); - - // get size -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Width")); -+#else - dict->lookup(const_cast("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("W")); -+#else - obj1.free(); - dict->lookup(const_cast("W"), &obj1); -+#endif - } - if (obj1.isInt()){ - width = obj1.getInt(); -@@ -2607,11 +2829,19 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else { - goto err2; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Height")); -+#else - obj1.free(); - dict->lookup(const_cast("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("H")); -+#else - obj1.free(); - dict->lookup(const_cast("H"), &obj1); -+#endif - } - if (obj1.isInt()) { - height = obj1.getInt(); -@@ -2622,26 +2852,46 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // image interpolation -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup("Interpolate"); -+#else - dict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup("I"); -+#else - obj1.free(); - dict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - interpolate = obj1.getBool(); - else - interpolate = gFalse; -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - maskInterpolate = gFalse; - - // image or mask? -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("ImageMask")); -+#else - dict->lookup(const_cast("ImageMask"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("IM")); -+#else - obj1.free(); - dict->lookup(const_cast("IM"), &obj1); -+#endif - } - mask = gFalse; - if (obj1.isBool()) { -@@ -2650,14 +2900,24 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // bit depth - if (bits == 0) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("BitsPerComponent")); -+#else - dict->lookup(const_cast("BitsPerComponent"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("BPC")); -+#else - obj1.free(); - dict->lookup(const_cast("BPC"), &obj1); -+#endif - } - if (obj1.isInt()) { - bits = obj1.getInt(); -@@ -2666,7 +2926,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - - // display a mask -@@ -2676,21 +2938,37 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - goto err1; - } - invert = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Decode")); -+#else - dict->lookup(const_cast("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("D")); -+#else - obj1.free(); - dict->lookup(const_cast("D"), &obj1); -+#endif - } - if (obj1.isArray()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(0); -+#else - obj1.arrayGet(0, &obj2); -+#endif - if (obj2.isInt() && obj2.getInt() == 1) { - invert = gTrue; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // draw it - builder->addImageMask(state, str, width, height, invert, interpolate); -@@ -2698,18 +2976,36 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - // get color space and color map - GfxColorSpace *colorSpace; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("ColorSpace")); -+#else - dict->lookup(const_cast("ColorSpace"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("CS")); -+#else - obj1.free(); - dict->lookup(const_cast("CS"), &obj1); -+#endif - } - if (obj1.isName()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = res->lookupColorSpace(obj1.getName()); -+#else - res->lookupColorSpace(obj1.getName(), &obj2); -+#endif - if (!obj2.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = std::move(obj2); -+#else - obj1.free(); - obj1 = obj2; -+#endif - } else { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } - if (!obj1.isNull()) { -@@ -2729,17 +3025,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - colorSpace = NULL; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!colorSpace) { - goto err1; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("Decode")); -+#else - dict->lookup(const_cast("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("D")); -+#else - obj1.free(); - dict->lookup(const_cast("D"), &obj1); -+#endif - } - GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, colorSpace); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!colorMap->isOk()) { - delete colorMap; - goto err1; -@@ -2753,8 +3061,13 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - int maskHeight = 0; - maskInvert = gFalse; - GfxImageColorMap *maskColorMap = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ maskObj = dict->lookup(const_cast("Mask")); -+ smaskObj = dict->lookup(const_cast("SMask")); -+#else - dict->lookup(const_cast("Mask"), &maskObj); - dict->lookup(const_cast("SMask"), &smaskObj); -+#endif - Dict* maskDict; - if (smaskObj.isStream()) { - // soft mask -@@ -2763,58 +3076,108 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - maskStr = smaskObj.getStream(); - maskDict = smaskObj.streamGetDict(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Width")); -+#else - maskDict->lookup(const_cast("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("W")); -+#else - obj1.free(); - maskDict->lookup(const_cast("W"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskWidth = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Height")); -+#else - obj1.free(); - maskDict->lookup(const_cast("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("H")); -+#else - obj1.free(); - maskDict->lookup(const_cast("H"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskHeight = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("BitsPerComponent")); -+#else - obj1.free(); - maskDict->lookup(const_cast("BitsPerComponent"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("BPC")); -+#else - obj1.free(); - maskDict->lookup(const_cast("BPC"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - int maskBits = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Interpolate")); -+#else - obj1.free(); - maskDict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("I")); -+#else - obj1.free(); - maskDict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - maskInterpolate = obj1.getBool(); - else - maskInterpolate = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("ColorSpace")); -+#else - obj1.free(); - maskDict->lookup(const_cast("ColorSpace"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("CS")); -+#else - obj1.free(); - maskDict->lookup(const_cast("CS"), &obj1); -+#endif - } - if (obj1.isName()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = res->lookupColorSpace(obj1.getName()); -+#else - res->lookupColorSpace(obj1.getName(), &obj2); -+#endif - if (!obj2.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = std::move(obj2); -+#else - obj1.free(); - obj1 = obj2; -+#endif - } else { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -@@ -2824,17 +3187,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - #else - GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL); - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Decode")); -+#else - maskDict->lookup(const_cast("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("D")); -+#else - obj1.free(); - maskDict->lookup(const_cast("D"), &obj1); -+#endif - } - maskColorMap = new GfxImageColorMap(maskBits, &obj1, maskColorSpace); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!maskColorMap->isOk()) { - delete maskColorMap; - goto err1; -@@ -2845,9 +3220,15 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - // color key mask - int i; - for (i = 0; i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskObj.arrayGet(i); -+#else - maskObj.arrayGet(i, &obj1); -+#endif - maskColors[i] = obj1.getInt(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - haveColorKeyMask = gTrue; - } else if (maskObj.isStream()) { -@@ -2857,61 +3238,111 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - maskStr = maskObj.getStream(); - maskDict = maskObj.streamGetDict(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Width")); -+#else - maskDict->lookup(const_cast("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("W")); -+#else - obj1.free(); - maskDict->lookup(const_cast("W"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskWidth = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Height")); -+#else - obj1.free(); - maskDict->lookup(const_cast("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("H")); -+#else - obj1.free(); - maskDict->lookup(const_cast("H"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskHeight = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("ImageMask")); -+#else - obj1.free(); - maskDict->lookup(const_cast("ImageMask"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("IM")); -+#else - obj1.free(); - maskDict->lookup(const_cast("IM"), &obj1); -+#endif - } - if (!obj1.isBool() || !obj1.getBool()) { - goto err2; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup("Interpolate"); -+#else - obj1.free(); - maskDict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup("I"); -+#else - obj1.free(); - maskDict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - maskInterpolate = obj1.getBool(); - else - maskInterpolate = gFalse; -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - maskInvert = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("Decode")); -+#else - maskDict->lookup(const_cast("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast("D")); -+#else - obj1.free(); - maskDict->lookup(const_cast("D"), &obj1); -+#endif - } - if (obj1.isArray()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(0); -+#else - obj1.arrayGet(0, &obj2); -+#endif - if (obj2.isInt() && obj2.getInt() == 1) { - maskInvert = gTrue; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - haveExplicitMask = gTrue; - } - -@@ -2929,14 +3360,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - delete colorMap; - -+#if !defined(POPPLER_NEW_OBJECT_API) - maskObj.free(); - smaskObj.free(); -+#endif - } - - return; - - err2: -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - err1: - error(errSyntaxError, getPos(), "Bad image parameters"); - } -@@ -2961,52 +3396,97 @@ void PdfParser::doForm(Object *str) { - dict = str->streamGetDict(); - - // check form type -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast("FormType")); -+#else - dict->lookup(const_cast("FormType"), &obj1); -+#endif - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { - error(errSyntaxError, getPos(), "Unknown form type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get bounding box -+#if defined(POPPLER_NEW_OBJECT_API) -+ bboxObj = dict->lookup(const_cast("BBox")); -+#else - dict->lookup(const_cast("BBox"), &bboxObj); -+#endif - if (!bboxObj.isArray()) { -+#if !defined(POPPLER_NEW_OBJECT_API) - bboxObj.free(); -+#endif - error(errSyntaxError, getPos(), "Bad form bounding box"); - return; - } - for (i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = bboxObj.arrayGet(i); -+#else - bboxObj.arrayGet(i, &obj1); -+#endif - bbox[i] = obj1.getNum(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+#else - obj1.free(); - } - bboxObj.free(); -+#endif - - // get matrix -+#if defined(POPPLER_NEW_OBJECT_API) -+ matrixObj = dict->lookup(const_cast("Matrix")); -+#else - dict->lookup(const_cast("Matrix"), &matrixObj); -+#endif - if (matrixObj.isArray()) { - for (i = 0; i < 6; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = matrixObj.arrayGet(i); -+#else - matrixObj.arrayGet(i, &obj1); -+#endif - m[i] = obj1.getNum(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - } else { - m[0] = 1; m[1] = 0; - m[2] = 0; m[3] = 1; - m[4] = 0; m[5] = 0; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - matrixObj.free(); -+#endif - - // get resources -+#if defined(POPPLER_NEW_OBJECT_API) -+ resObj = dict->lookup(const_cast("Resources")); -+#else - dict->lookup(const_cast("Resources"), &resObj); -+#endif - resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL; - - // check for a transparency group - transpGroup = isolated = knockout = gFalse; - blendingColorSpace = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = dict->lookup(const_cast("Group"))).isDict()) { -+ if ((obj2 = obj1.dictLookup(const_cast("S"))).isName(const_cast("Transparency"))) { -+#else - if (dict->lookup(const_cast("Group"), &obj1)->isDict()) { - if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { -+#endif - transpGroup = gTrue; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj3 = obj1.dictLookup(const_cast("CS"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); - #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -@@ -3015,19 +3495,32 @@ void PdfParser::doForm(Object *str) { - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); - #endif - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj1.dictLookup(const_cast("I"))).isBool()) { -+#else - obj3.free(); - if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { -+#endif - isolated = obj3.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj1.dictLookup(const_cast("K"))).isBool()) { -+#else - obj3.free(); - if (obj1.dictLookup(const_cast("K"), &obj3)->isBool()) { -+#endif - knockout = obj3.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+ } -+#else - obj3.free(); - } - obj2.free(); - } - obj1.free(); -+#endif - - // draw it - ++formDepth; -@@ -3038,7 +3531,9 @@ void PdfParser::doForm(Object *str) { - if (blendingColorSpace) { - delete blendingColorSpace; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - resObj.free(); -+#endif - } - - void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, -@@ -3166,35 +3661,61 @@ Stream *PdfParser::buildImageStream() { - Stream *str; - - // build dictionary -+#if defined(POPPLER_NEW_OBJECT_API) -+ dict = Object(new Dict(xref)); -+ obj = parser->getObj(); -+#else - dict.initDict(xref); - parser->getObj(&obj); -+#endif - while (!obj.isCmd(const_cast("ID")) && !obj.isEOF()) { - if (!obj.isName()) { - error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } else { - key = copyString(obj.getName()); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - obj.free(); - parser->getObj(&obj); -+#endif - if (obj.isEOF() || obj.isError()) { - gfree(key); - break; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ dict.dictAdd(key, std::move(obj)); -+ } -+ obj = parser->getObj(); -+#else - dict.dictAdd(key, &obj); - } - parser->getObj(&obj); -+#endif - } - if (obj.isEOF()) { - error(errSyntaxError, getPos(), "End of file in inline image"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); - dict.free(); -+#endif - return NULL; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - - // make stream -+#if defined(POPPLER_NEW_OBJECT_API) -+ str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0); -+ str = str->addFilters(dict.getDict()); -+#else - str = new EmbedStream(parser->getStream(), &dict, gFalse, 0); - str = str->addFilters(&dict); -+#endif - - return str; - } - -diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml -index 29ade0e..769f168 100644 ---- a/build-x64-gtk3.xml -+++ b/build-x64-gtk3.xml -@@ -393,6 +393,7 @@ - -DPOPPLER_NEW_ERRORAPI - -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API - -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API -+ -DPOPPLER_NEW_OBJECT_API - - -DGLIBMM_DISABLE_DEPRECATED - -DG_DISABLE_DEPRECATED -diff --git a/build-x64.xml b/build-x64.xml -index 7176723..abe230d 100644 ---- a/build-x64.xml -+++ b/build-x64.xml -@@ -388,6 +388,7 @@ - -DPOPPLER_NEW_ERRORAPI - -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API - -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API -+ -DPOPPLER_NEW_OBJECT_API - - -DGLIBMM_DISABLE_DEPRECATED - -DG_DISABLE_DEPRECATED -diff --git a/build.xml b/build.xml -index 90ba74d..1070aa9 100644 ---- a/build.xml -+++ b/build.xml -@@ -388,6 +388,7 @@ - -DPOPPLER_NEW_ERRORAPI - -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API - -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API -+ -DPOPPLER_NEW_OBJECT_API - - -DGLIBMM_DISABLE_DEPRECATED - -DG_DISABLE_DEPRECATED -diff --git a/configure.ac b/configure.ac -index 2454012..ff55553 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -454,6 +454,11 @@ if test "x$popplernewernewcolorspaceapi" = "xyes"; then - AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0]) - fi - -+PKG_CHECK_MODULES(POPPLER_NEW_OBJECT_API, poppler >= 0.58.0, popplernewobjectapi=yes, popplernewobjectapi=no) -+if test "x$popplernewobjectapi" = "xyes"; then -+ AC_DEFINE(POPPLER_NEW_OBJECT_API, 1, [Use new object API from Poppler >= 0.58.0]) -+fi -+ - CPPFLAGS=$ink_svd_CPPFLAGS - LIBS=$ink_svd_LIBS - - diff --git a/libsamplerate/.md5sum b/libsamplerate/.md5sum index 67bf740b3..778850cf4 100644 --- a/libsamplerate/.md5sum +++ b/libsamplerate/.md5sum @@ -1 +1 @@ -1c7fb25191b4e6e3628d198a66a84f47 libsamplerate-0.1.8.tar.gz +2b78ae9fe63b36b9fbb6267fad93f259 libsamplerate-0.1.9.tar.gz diff --git a/libsamplerate/.signature b/libsamplerate/.signature index 466619296..ed8bb3ea1 100644 --- a/libsamplerate/.signature +++ b/libsamplerate/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wWpWiU7tdfxF8yFQItDARbGLIhyan0I0vN2CDMmVpE5r6c95ACAfkRWemzXkMdQ3NmHFspxHqoiRWajpgrfBQ8= -SHA256 (Pkgfile) = 9987ca9e998787131d5aa0306d21d1990df4946e8d3fda0d149ea569e64b677b +RWSagIOpLGJF3wBoY3m9Dti17Pd8T973yLBsoQcFPsOZDIHXL8zUuvupaD1A0U3OIVPRLwSX5/2QUWHZyqjePsJDO58xgIKMPQA= +SHA256 (Pkgfile) = f5eb08e8f02c168e72f092dc3faf95202926d1164c1d01834f60d7e64369d665 SHA256 (.footprint) = e0e28c5eecd971a6f1f12566b00b284dffb3da90550baf9644851ee3d1d8fc51 -SHA256 (libsamplerate-0.1.8.tar.gz) = 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 +SHA256 (libsamplerate-0.1.9.tar.gz) = 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 diff --git a/libsamplerate/Pkgfile b/libsamplerate/Pkgfile index 704cbd7b3..9af473a4a 100644 --- a/libsamplerate/Pkgfile +++ b/libsamplerate/Pkgfile @@ -1,12 +1,11 @@ # Description: Sound sample rate conversion library. # URL: http://www.mega-nerd.com/SRC/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Martin Opel, mo at obbl-net dot de # Depends on: libsndfile # Optional: fftw name=libsamplerate -version=0.1.8 +version=0.1.9 release=1 source=(http://www.mega-nerd.com/SRC/$name-$version.tar.gz) @@ -15,7 +14,6 @@ build() { ./configure \ --prefix=/usr \ - --mandir=/usr/man \ --disable-gcc-pipe \ --disable-dependency-tracking diff --git a/python-zope-interface/.footprint b/python-zope-interface/.footprint index 99cb0b229..37798f3d2 100644 --- a/python-zope-interface/.footprint +++ b/python-zope-interface/.footprint @@ -2,16 +2,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7-nspkg.pth -drwxr-xr-x root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/namespace_packages.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/pbr.json --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.4.3-py2.7.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7-nspkg.pth +drwxr-xr-x root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/namespace_packages.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/zope.interface-4.5.0-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/zope/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/zope/interface/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/zope/interface/__init__.py diff --git a/python-zope-interface/.md5sum b/python-zope-interface/.md5sum index 6ac9d3025..7ceae2fa1 100644 --- a/python-zope-interface/.md5sum +++ b/python-zope-interface/.md5sum @@ -1 +1 @@ -8700a4f527c1203b34b10c2b4e7a6912 zope.interface-4.4.3.tar.gz +7b669cd692d817772c61d2e3ad0f1e71 zope.interface-4.5.0.tar.gz diff --git a/python-zope-interface/.signature b/python-zope-interface/.signature index f1c232803..7c5492770 100644 --- a/python-zope-interface/.signature +++ b/python-zope-interface/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xyiUdmLk/1Cwy2KMgjMIkLZjhkFePBdr3pnnWs2E2/rWEyiYXSSyzFqMoBS49EYW6W50dBhGY8TU5fVsxzY3gk= -SHA256 (Pkgfile) = 9910fb061068298fbd5894a13964fcd043c990e973147029d62efc78a2fd113f -SHA256 (.footprint) = cbffe1fb26e7635f394b7af56601b6d32575b7abf491c923d5719776064b902a -SHA256 (zope.interface-4.4.3.tar.gz) = d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce +RWSagIOpLGJF3+YigWcVq63r4Z+pvvWAa7U4tkXtVdY9psIgPYwiRxvVmzfhxD/KMw+1JK82rHTTEd/xiJXDK+fgeSnvfAqmCgU= +SHA256 (Pkgfile) = 5e9b97ac33312f0874d76ffc394fd13c329cabdc1331275aa6f3c3d7d04c8644 +SHA256 (.footprint) = 3f60ea844fb2447c55c8556554681bba25df2033d7e07dc7f05193311e39cd1b +SHA256 (zope.interface-4.5.0.tar.gz) = 57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c diff --git a/python-zope-interface/Pkgfile b/python-zope-interface/Pkgfile index 9de0e19ff..45f0a674f 100644 --- a/python-zope-interface/Pkgfile +++ b/python-zope-interface/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python-setuptools name=python-zope-interface -version=4.4.3 +version=4.5.0 release=1 source=(https://pypi.io/packages/source/z/zope.interface/zope.interface-$version.tar.gz) diff --git a/python3-pycryptodome/.footprint b/python3-pycryptodome/.footprint index 61f65eaa3..ed22ae18b 100644 --- a/python3-pycryptodome/.footprint +++ b/python3-pycryptodome/.footprint @@ -424,6 +424,10 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/TDES/TOFBsubtab.rsp -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/TDES/TOFBvarkey.rsp -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/TDES/TOFBvartext.rsp +drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/wycheproof/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/wycheproof/aes_eax_test.json +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/wycheproof/aes_gcm_test.json +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Cipher/test_vectors/wycheproof/aes_siv_cmac_test.json drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/__init__.py drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/__pycache__/ @@ -522,6 +526,8 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_v -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_vectors/keccak/ShortMsgKAT_384.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_vectors/keccak/ShortMsgKAT_512.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_vectors/keccak/readme.txt +drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_vectors/wycheproof/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Hash/test_vectors/wycheproof/aes_cmac_test.json drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/IO/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/IO/__init__.py drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/IO/__pycache__/ @@ -648,6 +654,11 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/t -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/PKCS1-v1.5/SigGen15_186-2.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/PKCS1-v1.5/SigGen15_186-3.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/PKCS1-v1.5/SigVer15_186-3.rsp +drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/wycheproof/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/wycheproof/dsa_test.json +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/wycheproof/ecdsa_secp256r1_sha256_test.json +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/wycheproof/ecdsa_test.json +-rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Signature/test_vectors/wycheproof/rsa_signature_test.json drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Util/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Util/__init__.py drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/SelfTest/Util/__pycache__/ @@ -743,9 +754,9 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/Util/__pycache__/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/Crypto/__pycache__/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/__pycache__/__init__.cpython-36.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/Crypto/__pycache__/__init__.cpython-36.pyc -drwxr-xr-x root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/ --rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/PKG-INFO --rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/SOURCES.txt --rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/dependency_links.txt --rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/not-zip-safe --rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.0-py3.6.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/ +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/PKG-INFO +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/SOURCES.txt +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/dependency_links.txt +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/not-zip-safe +-rw-rw-r-- root/root usr/lib/python3.6/site-packages/pycryptodome-3.6.1-py3.6.egg-info/top_level.txt diff --git a/python3-pycryptodome/.md5sum b/python3-pycryptodome/.md5sum index 5a4942a87..dfbaa5e7a 100644 --- a/python3-pycryptodome/.md5sum +++ b/python3-pycryptodome/.md5sum @@ -1 +1 @@ -28feef0737dcb33be7a498ef300d3659 pycryptodome-3.6.0.tar.gz +eed64fdb7ac5c91ac218d2bac564cd93 pycryptodome-3.6.1.tar.gz diff --git a/python3-pycryptodome/.signature b/python3-pycryptodome/.signature index b3827fa6f..74e7a7d82 100644 --- a/python3-pycryptodome/.signature +++ b/python3-pycryptodome/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+jtY+IZIdvn6XMETNsZ7OcBkBv07SV777AfIEKE1INPKc+NwiYtIU7Tl03bFdW6kltGDe1/mDg5Rti6qBPL8gc= -SHA256 (Pkgfile) = 29daaf00e036f2d5549e2193e3e034c4da2fbe576ce449d41a52d7e0ca4aecb1 -SHA256 (.footprint) = 8458461ad53bf834322c36dd42b892dc2c9e35e7aa37db3a8675d24a7d7bbadc -SHA256 (pycryptodome-3.6.0.tar.gz) = c06398137f95539468f46197b46bbb193c1e07d51852ca194b1142f88a38c8be +RWSagIOpLGJF350G2ZcgSXCNcttKDcAlQK63r+hRJG2QjA61GZCtMfrXYbrQAaUQsT8Je9CyR3vxvjjvzlBItr5lZGFrqqa0Wgc= +SHA256 (Pkgfile) = 0b0b1c92335e92a3778498860c740ab361e750443c3183c4551fc28f74e90e2e +SHA256 (.footprint) = 764adf116f5cfd3a122d8dc41586243020a45861b97dd94e2a37cb290e1b6ab2 +SHA256 (pycryptodome-3.6.1.tar.gz) = 15013007e393d0cc0e69f4329a47c4c8597b7f3d02c12c03f805405542f70c71 diff --git a/python3-pycryptodome/Pkgfile b/python3-pycryptodome/Pkgfile index 1be878b1e..e7a6838ef 100644 --- a/python3-pycryptodome/Pkgfile +++ b/python3-pycryptodome/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-pycryptodome -version=3.6.0 +version=3.6.1 release=1 source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz) diff --git a/python3-zope-interface/.footprint b/python3-zope-interface/.footprint index 4772d3ee9..9200d40ab 100644 --- a/python3-zope-interface/.footprint +++ b/python3-zope-interface/.footprint @@ -2,16 +2,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.6/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/ --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6-nspkg.pth -drwxr-xr-x root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/ --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/namespace_packages.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/pbr.json --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.4.3-py3.6.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6-nspkg.pth +drwxr-xr-x root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/ +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/namespace_packages.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.6/site-packages/zope.interface-4.5.0-py3.6.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.6/site-packages/zope/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/zope/interface/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/zope/interface/__init__.py diff --git a/python3-zope-interface/.md5sum b/python3-zope-interface/.md5sum index 6ac9d3025..7ceae2fa1 100644 --- a/python3-zope-interface/.md5sum +++ b/python3-zope-interface/.md5sum @@ -1 +1 @@ -8700a4f527c1203b34b10c2b4e7a6912 zope.interface-4.4.3.tar.gz +7b669cd692d817772c61d2e3ad0f1e71 zope.interface-4.5.0.tar.gz diff --git a/python3-zope-interface/.signature b/python3-zope-interface/.signature index e131a0310..2ff9af64c 100644 --- a/python3-zope-interface/.signature +++ b/python3-zope-interface/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xt/32nS9WNs6ccL/Zg9aKYLAOR8USDAk8JsbZMZqzHoLQgnpsWyvBSSIylZsctx9B4YmB+jHvHzcYmzKCXGpws= -SHA256 (Pkgfile) = 449c578d722c0f7efca0de00e25342feb2aac9cd41b720c2b5f74443b6d3f410 -SHA256 (.footprint) = 240b492591c94cf8f673a0112d9f52551355d223da44ca1eb155959776e24d2e -SHA256 (zope.interface-4.4.3.tar.gz) = d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce +RWSagIOpLGJF34NXQtr3nyxHQQGns5hTQKGoR7nVGfES8pnxTpV8fpy+yvfdjrIfLnFDLoTgJCLN4qWRW5Zj87aJme44F8n6QQY= +SHA256 (Pkgfile) = 2913a26e921c52c60f1548a37c34500e2539c2e94dbfb9bb82cbc449f463d1de +SHA256 (.footprint) = e29fa37e238aa24feba1522f830924ae5269433ff445a5ad46b50f4c1c4ffb6d +SHA256 (zope.interface-4.5.0.tar.gz) = 57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c diff --git a/python3-zope-interface/Pkgfile b/python3-zope-interface/Pkgfile index 1069fda37..68ed990d3 100644 --- a/python3-zope-interface/Pkgfile +++ b/python3-zope-interface/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-zope-interface -version=4.4.3 +version=4.5.0 release=1 source=(https://pypi.io/packages/source/z/zope.interface/zope.interface-$version.tar.gz) diff --git a/youtube-dl/.footprint b/youtube-dl/.footprint index 83591bb5a..ff8fb1cf8 100644 --- a/youtube-dl/.footprint +++ b/youtube-dl/.footprint @@ -586,9 +586,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/esri.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/esri.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/esri.pyo --rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/etonline.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/etonline.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/etonline.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/europa.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/europa.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/europa.pyo @@ -1387,6 +1384,9 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/photobucket.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/photobucket.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/photobucket.pyo +-rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/picarto.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/picarto.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/picarto.pyo -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/piksel.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/piksel.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/youtube_dl/extractor/piksel.pyo diff --git a/youtube-dl/.md5sum b/youtube-dl/.md5sum index 4a4d43d38..43a52396b 100644 --- a/youtube-dl/.md5sum +++ b/youtube-dl/.md5sum @@ -1 +1 @@ -dd4286bfdbd22bc645e2c98706f47172 youtube-dl-2018.04.09.tar.gz +1cd00475fad9222f6fe52d2e1ec89a97 youtube-dl-2018.04.25.tar.gz diff --git a/youtube-dl/.signature b/youtube-dl/.signature index 624f052ad..17ca47d11 100644 --- a/youtube-dl/.signature +++ b/youtube-dl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+NF0StzyhrsrOW75pZqwMa4749k10m+bPQbc5f5XDPgh2kOtGOFf3KmLkTgH2pmKG2E9qeQiQ0ubB7V/Z/fEQ4= -SHA256 (Pkgfile) = d76fc43bec98ae6c0eab251266a30156b975fbcdee2cf0406cefe3c59d83fc72 -SHA256 (.footprint) = 929f5f0ed785829a9e8a3470d72303ec6279e03cdecce4430420c76af04326e2 -SHA256 (youtube-dl-2018.04.09.tar.gz) = 263b40801c7baedc0ee7008543977c14d4d7315c159c8f21f0fc24a3656826d8 +RWSagIOpLGJF31dqu79pgsVLEiKdN7PvnbOHh7V4IgbtPXalqa7M6Bl/eew257q7ltSPB2xAaU+s/83JTjCPjMlXUUy0Bjm8PA0= +SHA256 (Pkgfile) = 30f4c27d89b1fd3549240fc8623e1dde858b46775ee589ecd5e7777070707f39 +SHA256 (.footprint) = 7e6468fc25bcf2a0ab06991501f9be1de444ecdf7e9ae09ebb3e090b999b3f8a +SHA256 (youtube-dl-2018.04.25.tar.gz) = 7ced20712c1c4ef98d748cdd0f7cdd4f94f88b1300bed67d7b861dcf1c7ffd9f diff --git a/youtube-dl/Pkgfile b/youtube-dl/Pkgfile index 1c599630b..b375b71e3 100644 --- a/youtube-dl/Pkgfile +++ b/youtube-dl/Pkgfile @@ -5,7 +5,7 @@ # Optional: python-setuptools name=youtube-dl -version=2018.04.09 +version=2018.04.25 release=1 source=(https://youtube-dl.org/downloads/$version/$name-$version.tar.gz)