[pkgsrc/trunk]: pkgsrc/print/poppler poppler: removed unused patch; pkglint f...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1ed882abab2
branches:  trunk
changeset: 378941:a1ed882abab2
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 17 18:07:37 2018 +0000

description:
poppler: removed unused patch; pkglint fixes

diffstat:

 print/poppler/Makefile                |  17 ++++++++---------
 print/poppler/Makefile.common         |   4 ++--
 print/poppler/patches/patch-gtkdoc.py |  29 -----------------------------
 3 files changed, 10 insertions(+), 40 deletions(-)

diffs (88 lines):

diff -r 517cd8ba9067 -r a1ed882abab2 print/poppler/Makefile
--- a/print/poppler/Makefile    Tue Apr 17 16:29:51 2018 +0000
+++ b/print/poppler/Makefile    Tue Apr 17 18:07:37 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2018/04/17 18:07:37 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -13,20 +13,19 @@
 
 # TODO: Later add an option to choose Splash versus Cairo backend.
 # Build the Splash graphics backend.
-CMAKE_ARGS+=    -DENABLE_SPLASH=ON
+CMAKE_ARGS+=   -DENABLE_SPLASH=ON
 # Don't compile GTK+ test program.
-CMAKE_ARGS+=    -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+=    -DENABLE_GLIB=OFF
+CMAKE_ARGS+=   -DENABLE_GLIB=OFF
 # Don't build and install the tools
-CMAKE_ARGS+=    -DENABLE_UTILS=OFF
+CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 # Don't compile poppler cpp wrapper.
-CMAKE_ARGS+=    -DENABLE_CPP=OFF
+CMAKE_ARGS+=   -DENABLE_CPP=OFF
 # Don't compile poppler qt5 wrapper.
-CMAKE_ARGS+=    -DENABLE_QT5=OFF
+CMAKE_ARGS+=   -DENABLE_QT5=OFF
 # Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+=    -DENABLE_LIBCURL=OFF
-
+CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 517cd8ba9067 -r a1ed882abab2 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Tue Apr 17 16:29:51 2018 +0000
+++ b/print/poppler/Makefile.common     Tue Apr 17 18:07:37 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.95 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.96 2018/04/17 18:07:37 adam Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -26,7 +26,7 @@
 USE_CMAKE=             yes
 
 # Don't accidentally find libtiff
-CMAKE_ARGS+=    -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
diff -r 517cd8ba9067 -r a1ed882abab2 print/poppler/patches/patch-gtkdoc.py
--- a/print/poppler/patches/patch-gtkdoc.py     Tue Apr 17 16:29:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-gtkdoc.py,v 1.2 2017/12/10 16:02:59 bsiegert Exp $
-
---- gtkdoc.py.orig     2017-11-12 18:14:32.000000000 +0000
-+++ gtkdoc.py
-@@ -196,12 +196,12 @@ class GTKDoc(object):
-             if stdout:
-                 try:
-                     sys.stdout.write(stdout.encode("utf-8"))
--                except UnicodeDecodeError:
-+                except (TypeError, UnicodeDecodeError):
-                     sys.stdout.write(stdout)
-             if stderr:
-                 try:
-                     sys.stderr.write(stderr.encode("utf-8"))
--                except UnicodeDecodeError:
-+                except (TypeError, UnicodeDecodeError):
-                     sys.stderr.write(stderr)
- 
-         if process.returncode != 0:
-@@ -223,6 +223,9 @@ class GTKDoc(object):
-             return
- 
-         def copy_file_replacing_existing(src, dest):
-+            if src == dest:
-+               self.logger.debug('copy_file_replacing_existing not copying to itself: %s', src)
-+               return
-             if os.path.isdir(src):
-                 self.logger.debug('skipped directory %s',  src)
-                 return