Received: by mail.netbsd.org (Postfix, from userid 605) id 804F584E2F; Sun, 28 Jun 2020 14:55:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 03EF184E2A for ; Sun, 28 Jun 2020 14:55:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id aq6cNpTxaoWx for ; Sun, 28 Jun 2020 14:55:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6D08284E1E for ; Sun, 28 Jun 2020 14:55:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5A760FB28; Sun, 28 Jun 2020 14:55:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15933561172680" MIME-Version: 1.0 Date: Sun, 28 Jun 2020 14:55:17 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/print/qpdfview To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200628145517.5A760FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15933561172680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Jun 28 14:55:17 UTC 2020 Modified Files: pkgsrc/print/qpdfview: Makefile distinfo Added Files: pkgsrc/print/qpdfview/patches: patch-sources_model.h Log Message: qpdfview: Fix build with latest Qt. Use libcups. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 pkgsrc/print/qpdfview/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/qpdfview/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/print/qpdfview/patches/patch-sources_model.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15933561172680 Content-Disposition: inline Content-Length: 2571 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/qpdfview/Makefile diff -u pkgsrc/print/qpdfview/Makefile:1.90 pkgsrc/print/qpdfview/Makefile:1.91 --- pkgsrc/print/qpdfview/Makefile:1.90 Tue Jun 2 08:24:38 2020 +++ pkgsrc/print/qpdfview/Makefile Sun Jun 28 14:55:17 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.90 2020/06/02 08:24:38 adam Exp $ +# $NetBSD: Makefile,v 1.91 2020/06/28 14:55:17 nia Exp $ DISTNAME= qpdfview-0.4.18 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= print MASTER_SITES= https://launchpad.net/qpdfview/trunk/${PKGVERSION_NOREV}/+download/ @@ -25,7 +25,7 @@ do-configure: .include "../../graphics/djvulibre-lib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.include "../../print/cups-base/buildlink3.mk" +.include "../../print/libcups/buildlink3.mk" .include "../../print/libspectre/buildlink3.mk" .include "../../print/poppler-qt5/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" Index: pkgsrc/print/qpdfview/distinfo diff -u pkgsrc/print/qpdfview/distinfo:1.6 pkgsrc/print/qpdfview/distinfo:1.7 --- pkgsrc/print/qpdfview/distinfo:1.6 Fri Nov 8 13:38:48 2019 +++ pkgsrc/print/qpdfview/distinfo Sun Jun 28 14:55:17 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2019/11/08 13:38:48 nia Exp $ +$NetBSD: distinfo,v 1.7 2020/06/28 14:55:17 nia Exp $ SHA1 (qpdfview-0.4.18.tar.gz) = 670c762436927a37980159206472d5a7a194da70 RMD160 (qpdfview-0.4.18.tar.gz) = 28d6676a7fc76b38f23b867b0d34a92d5002cec4 @@ -6,4 +6,5 @@ SHA512 (qpdfview-0.4.18.tar.gz) = 387415 Size (qpdfview-0.4.18.tar.gz) = 786577 bytes SHA1 (patch-application.pro) = 11dd983ed4814f1c4913663b0bca13170fd8edfe SHA1 (patch-qpdfview.pri) = d569e92af7ee8baa80eec93df46d927f9bde3374 +SHA1 (patch-sources_model.h) = 9638186f83b3ebb311ef15a89a3be44530abd9db SHA1 (patch-sources_pdfmodel.cpp) = a718b01601d69bd4dfc4d3c4da0a19cd3f3f21ad Added files: Index: pkgsrc/print/qpdfview/patches/patch-sources_model.h diff -u /dev/null pkgsrc/print/qpdfview/patches/patch-sources_model.h:1.1 --- /dev/null Sun Jun 28 14:55:17 2020 +++ pkgsrc/print/qpdfview/patches/patch-sources_model.h Sun Jun 28 14:55:17 2020 @@ -0,0 +1,14 @@ +$NetBSD: patch-sources_model.h,v 1.1 2020/06/28 14:55:17 nia Exp $ + +Fix Qt 5.15 fallout. + +--- sources/model.h.orig 2019-07-24 19:18:33.000000000 +0000 ++++ sources/model.h +@@ -24,6 +24,7 @@ along with qpdfview. If not, see ++#include + #include + #include + #include --_----------=_15933561172680--