pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/cups-filters cups-filters: Update print/cups-fil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/36e5c68f0370
branches:  trunk
changeset: 326401:36e5c68f0370
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Dec 05 21:15:08 2018 +0000

description:
cups-filters: Update print/cups-filters to 1.21.5

pkgsrc changes:
 - Remove no more needed patch for poppler 0.71.0
 - Add a reference to upstream issue regarding (temporary) opvp
   disabled support

Changes:
1.21.5
------
 - cups-browsed: We cannot reliably determine whether a CUPS
   queue is temporary, so we apply the procedure to make a
   temporary queue permanent to any unshared queue (Debian bugs
   #910882, #905850, #908604).
 - pdftoraster, pdftopdf, pdftoijs, pdftoopvp: Do not use the
   Poppler-specific "GBool", "gFalse", "gTrue" any more, as
   Poppler has switched to standard "bool", "false", "true" in
   version 0.71.0 (Issue #69).

diffstat:

 print/cups-filters/Makefile                           |     8 +-
 print/cups-filters/distinfo                           |    11 +-
 print/cups-filters/patches/patch-poppler-0.71.0.patch |  2122 -----------------
 3 files changed, 10 insertions(+), 2131 deletions(-)

diffs (truncated from 2171 to 300 lines):

diff -r 4ad309623ae5 -r 36e5c68f0370 print/cups-filters/Makefile
--- a/print/cups-filters/Makefile       Wed Dec 05 19:49:26 2018 +0000
+++ b/print/cups-filters/Makefile       Wed Dec 05 21:15:08 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2018/12/05 18:49:39 leot Exp $
+# $NetBSD: Makefile,v 1.110 2018/12/05 21:15:08 leot Exp $
 
-DISTNAME=      cups-filters-1.21.4
+DISTNAME=      cups-filters-1.21.5
 CATEGORIES=    print
 MASTER_SITES=  http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=  .tar.xz
@@ -23,7 +23,9 @@
 CONFIGURE_ARGS+=       --disable-ldap
 CONFIGURE_ARGS+=       --disable-mutool
 CONFIGURE_ARGS+=       --enable-ijs
-# XXX: Temporary disable opvp filters: not yet ported to poppler 0.71.0
+# XXX: Temporary disable opvp filters: not yet ported to poppler 0.71.0.
+# XXX: Upstream bug report:
+# XXX:  <https://github.com/OpenPrinting/cups-filters/issues/75>
 CONFIGURE_ARGS+=       --disable-opvp
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --with-apple-raster-filter=rastertopdf
diff -r 4ad309623ae5 -r 36e5c68f0370 print/cups-filters/distinfo
--- a/print/cups-filters/distinfo       Wed Dec 05 19:49:26 2018 +0000
+++ b/print/cups-filters/distinfo       Wed Dec 05 21:15:08 2018 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.59 2018/12/05 18:49:39 leot Exp $
+$NetBSD: distinfo,v 1.60 2018/12/05 21:15:08 leot Exp $
 
-SHA1 (cups-filters-1.21.4.tar.xz) = 6f269a5b6f37260a2f80357678215106cb85d340
-RMD160 (cups-filters-1.21.4.tar.xz) = b50d134df181772316875b6707c1aabb43b5e19e
-SHA512 (cups-filters-1.21.4.tar.xz) = 6e1e20be0354ba96cf4222c05aadd4a2b3d033d730ff9b7489ba6a3b2b0e1a02ac80a1ebcf5e765b80e5baab2ae0c091c8abbdf159913b70592fb9ba0afd9a5b
-Size (cups-filters-1.21.4.tar.xz) = 1474564 bytes
+SHA1 (cups-filters-1.21.5.tar.xz) = a7b2cd60918c4a976e5aa2f1915cfdf5724eafbe
+RMD160 (cups-filters-1.21.5.tar.xz) = 840805d862141081496464a0db45f2ca01660b2b
+SHA512 (cups-filters-1.21.5.tar.xz) = 41ed3364cb0a87e8b2b2482f3c8de90eba63538682ad3fa1079908beadec5e975d9eda151d822e93f62dcc32fe2a6189cc02b6b7691640fb00434efec35c0f7a
+Size (cups-filters-1.21.5.tar.xz) = 1474388 bytes
 SHA1 (patch-Makefile.in) = 2d5b05c9dca8ef7cc51931d77dddb1b2c4d422d8
 SHA1 (patch-configure) = b55dc7dc22008351c396374aceb88d2be293d179
 SHA1 (patch-filter_gstoraster.c) = 4eef8d91d8ca26a5a874e29885b836e9670d9e5d
 SHA1 (patch-filter_mupdftoraster.c) = 4c4f7d292163657f9541c8ce454ba57d248f7ef0
 SHA1 (patch-fontembed_test__pdf.c) = 5ffb13a59ed4d860a3ae4355e364059973715290
 SHA1 (patch-fontembed_test__ps.c) = 70f9ab9c8f74ab96abe04cda926a7116386d5f2e
-SHA1 (patch-poppler-0.71.0.patch) = 96697af23130bb27e8ac3b1d204b887c923a3e6b
diff -r 4ad309623ae5 -r 36e5c68f0370 print/cups-filters/patches/patch-poppler-0.71.0.patch
--- a/print/cups-filters/patches/patch-poppler-0.71.0.patch     Wed Dec 05 19:49:26 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2122 +0,0 @@
-$NetBSD: patch-poppler-0.71.0.patch,v 1.1 2018/12/05 18:49:39 leot Exp $
-
-Backport commit 48625da3f6fc818695c0d32879236ed102f9e462
-to fix build with poppler-0.71.0.
-
---- filter/pdftoijs.cxx.orig
-+++ filter/pdftoijs.cxx
-@@ -297,7 +297,7 @@ int main(int argc, char *argv[]) {
-   int job_id;
-   enum SplashColorMode cmode;
-   int rowpad;
--  GBool reverseVideo;
-+  bool reverseVideo;
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-   setErrorCallback(::myErrorFun,NULL);
-@@ -384,7 +384,7 @@ int main(int argc, char *argv[]) {
-   /* set image's values */
-   int numChan,bitsPerSample;
-   const char *devName;
--  reverseVideo = gFalse;
-+  reverseVideo = false;
-   switch (colspace) {
-   case COL_RGB:
-     numChan=3;
-@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) {
-     paperColor[2] = 255;
-     break;
-   case COL_BLACK1:
--    reverseVideo = gTrue;
-+    reverseVideo = true;
-   case COL_WHITE1:
-     numChan=1;
-     bitsPerSample=1;
-@@ -409,7 +409,7 @@ int main(int argc, char *argv[]) {
-     rowpad = 1;
-     break;
-   case COL_BLACK8:
--    reverseVideo = gTrue;
-+    reverseVideo = true;
-   case COL_WHITE8:
-     numChan=1;
-     bitsPerSample=8;
-@@ -440,9 +440,9 @@ int main(int argc, char *argv[]) {
-   }
- 
-   out = new SplashOutputDev(cmode,rowpad/* row padding */,
--    reverseVideo,paperColor,gTrue
-+    reverseVideo,paperColor,true
- #if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
--    ,gFalse
-+    ,false
- #endif
-     );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-@@ -471,7 +471,7 @@ int main(int argc, char *argv[]) {
-     SplashBitmap *bitmap;
-     unsigned int size;
- 
--    doc->displayPage(out,i,resolution[0],resolution[1],0,gFalse,gFalse,gFalse);
-+    doc->displayPage(out,i,resolution[0],resolution[1],0,false,false,false);
-     bitmap = out->getBitmap();
- 
-     /* set page parameters */
---- filter/pdftoopvp/OPVPOutputDev.cxx.orig
-+++ filter/pdftoopvp/OPVPOutputDev.cxx
-@@ -70,7 +70,7 @@ class SplashOutFontFileID: public SplashFontFileID {
- 
-   ~SplashOutFontFileID() {}
- 
--  GBool matches(SplashFontFileID *id) {
-+  bool matches(SplashFontFileID *id) {
-     return ((SplashOutFontFileID *)id)->r.num == r.num &&
-            ((SplashOutFontFileID *)id)->r.gen == r.gen;
-   }
-@@ -99,9 +99,9 @@ class T3FontCache {
-   T3FontCache(Ref *fontID, double m11A, double m12A,
-             double m21A, double m22A,
-             int glyphXA, int glyphYA, int glyphWA, int glyphHA,
--            GBool aa);
-+            bool aa);
-   ~T3FontCache();
--  GBool matches(Ref *idA, double m11A, double m12A,
-+  bool matches(Ref *idA, double m11A, double m12A,
-               double m21A, double m22A)
-     { return fontID.num == idA->num && fontID.gen == idA->gen &&
-            m11 == m11A && m12 == m12A && m21 == m21A && m22 == m22A; }
-@@ -120,7 +120,7 @@ class T3FontCache {
- T3FontCache::T3FontCache(Ref *fontIDA, double m11A, double m12A,
-                        double m21A, double m22A,
-                        int glyphXA, int glyphYA, int glyphWA, int glyphHA,
--                       GBool aa) {
-+                       bool aa) {
-   int i;
- 
-   fontID = *fontIDA;
-@@ -189,7 +189,7 @@ OPVPOutputDev::OPVPOutputDev()
-   nT3Fonts = 0;
-   t3GlyphStack = 0;
-   font = NULL;
--  needFontUpdate = gFalse;
-+  needFontUpdate = false;
-   textClipPath = 0;
-   underlayCbk = 0;
-   underlayCbkData = 0;
-@@ -216,8 +216,8 @@ void OPVPOutputDev::setScale(double w, double h,
- }
- 
- int OPVPOutputDev::init(SplashColorMode colorModeA,
--                               GBool colorProfile,
--                               GBool reverseVideoA,
-+                               bool colorProfile,
-+                               bool reverseVideoA,
-                                SplashColor paperColorA,
-                                  const char *driverName,
-                                int outputFD,
-@@ -275,13 +275,13 @@ void OPVPOutputDev::startDoc(XRef *xrefA) {
- #endif
- #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
-                                   globalParams->getEnableFreeType(),
--                                  gFalse,
--                                    gFalse,
-+                                  false,
-+                                    false,
- #endif
- #if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
-                                   globalParams->getAntialias());
- #else
--                                    gFalse);
-+                                    false);
- #endif
-   for (i = 0; i < nT3Fonts; ++i) {
-     delete t3FontCache[i];
-@@ -337,7 +337,7 @@ void OPVPOutputDev::saveState(GfxState *state) {
- 
- void OPVPOutputDev::restoreState(GfxState *state) {
-   oprs->restoreState();
--  needFontUpdate = gTrue;
-+  needFontUpdate = true;
- }
- 
- void OPVPOutputDev::updateAll(GfxState *state) {
-@@ -349,7 +349,7 @@ void OPVPOutputDev::updateAll(GfxState *state) {
-   updateMiterLimit(state);
-   updateFillColor(state);
-   updateStrokeColor(state);
--  needFontUpdate = gTrue;
-+  needFontUpdate = true;
- }
- 
- void OPVPOutputDev::updateCTM(GfxState *state, double m11, double m12,
-@@ -490,7 +490,7 @@ SplashPattern *OPVPOutputDev::getColor(GfxGray gray, GfxRGB *rgb) {
- }
- 
- void OPVPOutputDev::updateFont(GfxState *state) {
--    needFontUpdate = gTrue;
-+    needFontUpdate = true;
- }
- 
- void OPVPOutputDev::doUpdateFont(GfxState *state) {
-@@ -513,9 +513,9 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
-   double m11, m12, m21, m22;
-   int n;
-   int faceIndex = 0;
--  GBool recreateFont = gFalse;
-+  bool recreateFont = false;
- 
--  needFontUpdate = gFalse;
-+  needFontUpdate = false;
-   font = NULL;
-   fileName = NULL;
-   tmpBuf = NULL;
-@@ -594,9 +594,9 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
- 
-     fontsrc = new SplashFontSrc;
-     if (fileName)
--      fontsrc->setFile(fileName, gFalse);
-+      fontsrc->setFile(fileName, false);
-     else
--      fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
-+      fontsrc->setBuf(tmpBuf, tmpBufLen, true);
- 
-     // load the font file
-     switch (fontType) {
-@@ -742,7 +742,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
-       // this shouldn't happen
-       goto err2;
-     }
--    fontFile->doAdjustMatrix = gTrue;
-+    fontFile->doAdjustMatrix = true;
-   }
- 
-   // get the font matrix
-@@ -777,7 +777,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
-           w1 /= w2;
-           m11 *= w1;
-           m21 *= w1;
--          recreateFont = gTrue;
-+          recreateFont = true;
-         }
-       }
-     }
-@@ -836,7 +836,7 @@ void OPVPOutputDev::fill(GfxState *state) {
-   }
- 
-   path = convertPath(state, state->getPath());
--  oprs->fill(path, gFalse);
-+  oprs->fill(path, false);
-   delete path;
- }
- 
-@@ -855,7 +855,7 @@ void OPVPOutputDev::eoFill(GfxState *state) {
-   }
- 
-   path = convertPath(state, state->getPath());
--  oprs->fill(path, gTrue);
-+  oprs->fill(path, true);
-   delete path;
- }
- 
-@@ -863,7 +863,7 @@ void OPVPOutputDev::clip(GfxState *state) {
-   OPVPSplashPath *path;
- 
-   path = convertPath(state, state->getPath());
--  oprs->clipToPath(path, gFalse);
-+  oprs->clipToPath(path, false);
-   delete path;
- }
- 
-@@ -871,7 +871,7 @@ void OPVPOutputDev::eoClip(GfxState *state) {
-   OPVPSplashPath *path;
- 
-   path = convertPath(state, state->getPath());
--  oprs->clipToPath(path, gTrue);
-+  oprs->clipToPath(path, true);
-   delete path;
- }
- 
-@@ -918,8 +918,8 @@ void OPVPOutputDev::clipToStrokePath(GfxState *state) {
- 
-   // use splash for makeStrokePath
-   // create dummy bitmap for creating splash
--  tbitmap = new SplashBitmap(1, 1, 1, splashModeMono1, gFalse);
--  tsplash = new Splash(tbitmap, gFalse);
-+  tbitmap = new SplashBitmap(1, 1, 1, splashModeMono1, false);
-+  tsplash = new Splash(tbitmap, false);
-   // set line parameters
-   //  except colors
-   updateSplashLineDash(state, tsplash);
-@@ -939,7 +939,7 @@ void OPVPOutputDev::clipToStrokePath(GfxState *state) {
-   delete path;



Home | Main Index | Thread Index | Old Index