Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1571541142146950"
MIME-Version: 1.0
Date: Sun, 20 Oct 2019 03:12:22 +0000
From: "Mark Davies" <markd@netbsd.org>
Subject: CVS commit: pkgsrc/print
To: pkgsrc-changes@NetBSD.org
Reply-To: markd@netbsd.org
Message-Id: <20191020031222.8410BFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1571541142146950
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	markd
Date:		Sun Oct 20 03:12:22 UTC 2019

Modified Files:
	pkgsrc/print/poppler: distinfo
	pkgsrc/print/poppler-qt5: Makefile
Added Files:
	pkgsrc/print/poppler/patches: patch-qt5_src_poppler-page.cc

Log Message:
poppler-qt5: dont build splash backend as per other bits of poppler.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/print/poppler-qt5/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/poppler/patches/patch-qt5_src_poppler-page.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1571541142146950
Content-Disposition: inline
Content-Length: 2597
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.140 pkgsrc/print/poppler/distinfo:1.141
--- pkgsrc/print/poppler/distinfo:1.140	Sat Oct 19 12:37:04 2019
+++ pkgsrc/print/poppler/distinfo	Sun Oct 20 03:12:22 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.140 2019/10/19 12:37:04 nia Exp $
+$NetBSD: distinfo,v 1.141 2019/10/20 03:12:22 markd Exp $
 
 SHA1 (poppler-0.81.0.tar.xz) = 3b3e5b5a29ab88d573eaa35148a4eb242f41dc1c
 RMD160 (poppler-0.81.0.tar.xz) = 3eb610e4dd3f7b2baca949c99c4425f24a552cf0
 SHA512 (poppler-0.81.0.tar.xz) = 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b
 Size (poppler-0.81.0.tar.xz) = 1548944 bytes
 SHA1 (patch-poppler_CMap.cc) = d37745ea4cbeae76ad43c4ac74e942531f7b7dd8
+SHA1 (patch-qt5_src_poppler-page.cc) = b4f076c0417d8fbd342a1d9918a52369b2ddc952

Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.33 pkgsrc/print/poppler-qt5/Makefile:1.34
--- pkgsrc/print/poppler-qt5/Makefile:1.33	Sat Oct 19 12:37:05 2019
+++ pkgsrc/print/poppler-qt5/Makefile	Sun Oct 20 03:12:22 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2019/10/19 12:37:05 nia Exp $
+# $NetBSD: Makefile,v 1.34 2019/10/20 03:12:22 markd Exp $
 
 .include "../../print/poppler/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	poppler-qt5-${POPPLER_VERS}
 COMMENT=	PDF rendering library (QT5 wrapper)
@@ -8,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 
 CMAKE_ARGS+=	-DBUILD_GTK_TESTS=OFF
 CMAKE_ARGS+=	-DENABLE_GLIB=OFF
+CMAKE_ARGS+=	-DENABLE_SPLASH=OFF
 CMAKE_ARGS+=	-DENABLE_UTILS=OFF
 CMAKE_ARGS+=	-DENABLE_CPP=OFF
 CMAKE_ARGS+=	-DENABLE_QT5=ON

Added files:

Index: pkgsrc/print/poppler/patches/patch-qt5_src_poppler-page.cc
diff -u /dev/null pkgsrc/print/poppler/patches/patch-qt5_src_poppler-page.cc:1.1
--- /dev/null	Sun Oct 20 03:12:22 2019
+++ pkgsrc/print/poppler/patches/patch-qt5_src_poppler-page.cc	Sun Oct 20 03:12:22 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-qt5_src_poppler-page.cc,v 1.1 2019/10/20 03:12:22 markd Exp $
+
+conditionalise defining splash related class
+
+--- qt5/src/poppler-page.cc.orig	2019-09-22 15:56:22.000000000 +0000
++++ qt5/src/poppler-page.cc
+@@ -103,6 +103,7 @@ public:
+   QVariant payload;
+ };
+ 
++#if defined(HAVE_SPLASH)
+ class Qt5SplashOutputDev : public SplashOutputDev, public OutputDevCallbackHelper
+ {
+ public:
+@@ -169,6 +170,7 @@ public:
+ private:
+   bool ignorePaperColor;
+ };
++#endif
+ 
+ 
+ class QImageDumpingArthurOutputDev : public ArthurOutputDev, public OutputDevCallbackHelper


--_----------=_1571541142146950--