Received: by mail.netbsd.org (Postfix, from userid 605) id 1429C84EA4; Fri, 9 Nov 2018 13:45:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 09BC984EA2 for ; Fri, 9 Nov 2018 13:45:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id b2lVZUPSxtdD for ; Fri, 9 Nov 2018 13:45:00 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4190B84CDA for ; Fri, 9 Nov 2018 13:45:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 39F84FB1F; Fri, 9 Nov 2018 13:45:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1541771100178900" MIME-Version: 1.0 Date: Fri, 9 Nov 2018 13:45:00 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/x11/qt5-qtwebkit To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20181109134500.39F84FB1F@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. --_----------=_1541771100178900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Nov 9 13:45:00 UTC 2018 Modified Files: pkgsrc/x11/qt5-qtwebkit: Makefile distinfo Log Message: Fix pkg-config usage. This applies two commits from upstream. Reported by Bastian Germann in PR pkg/53603, thanks! (Build untested, as one of the dependencies did not build for me. But "make patch" works.) To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/qt5-qtwebkit/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt5-qtwebkit/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1541771100178900 Content-Disposition: inline Content-Length: 2644 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtwebkit/Makefile diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.56 pkgsrc/x11/qt5-qtwebkit/Makefile:1.57 --- pkgsrc/x11/qt5-qtwebkit/Makefile:1.56 Wed Aug 22 09:48:05 2018 +++ pkgsrc/x11/qt5-qtwebkit/Makefile Fri Nov 9 13:45:00 2018 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.56 2018/08/22 09:48:05 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2018/11/09 13:45:00 bsiegert Exp $ DISTNAME= qtwebkit-${QTWKVERSION} PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./} -PKGREVISION= 9 +PKGREVISION= 10 MASTER_SITES= ${MASTER_SITE_GITHUB:=annulen/} GITHUB_PROJECT= webkit GITHUB_RELEASE= ${DISTNAME} -#MASTER_SITES= https://github.com/annulen/webkit/releases/download/qtwebkit-${QTWKVERSION}/ CATEGORIES= x11 MAINTAINER= pkgsrc-users@NetBSD.org @@ -17,7 +16,11 @@ EXTRACT_SUFX= .tar.xz QTWKVERSION= 5.212.0-alpha2 -PYTHON_VERSIONS_ACCEPTED= 27 # as if 5.212.0-alpha2 +PATCHFILES= 0325d51c4a2a05fb.patch 6c7b0f61c12d28cc.patch +PATCH_SITES= https://github.com/annulen/webkit/commit/ +PATCH_DIST_STRIP= -p1 + +PYTHON_VERSIONS_ACCEPTED= 27 # as of 5.212.0-alpha2 .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} Index: pkgsrc/x11/qt5-qtwebkit/distinfo diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.12 pkgsrc/x11/qt5-qtwebkit/distinfo:1.13 --- pkgsrc/x11/qt5-qtwebkit/distinfo:1.12 Wed Aug 1 15:01:08 2018 +++ pkgsrc/x11/qt5-qtwebkit/distinfo Fri Nov 9 13:45:00 2018 @@ -1,5 +1,13 @@ -$NetBSD: distinfo,v 1.12 2018/08/01 15:01:08 maya Exp $ +$NetBSD: distinfo,v 1.13 2018/11/09 13:45:00 bsiegert Exp $ +SHA1 (0325d51c4a2a05fb.patch) = f92b975fdebefe2184be1bf7f334e73459293a00 +RMD160 (0325d51c4a2a05fb.patch) = 94110d0252f314e4a26db0b44ea7d9f380f1cfb4 +SHA512 (0325d51c4a2a05fb.patch) = eba1fd73330d69ddc080154a557ba5e9ba545e3dfad7b8ec7450663548f030f1d5b2c79b170bbd37798328827cfd8fe57224f824b8a2cf627e3ce6e44d63b6a8 +Size (0325d51c4a2a05fb.patch) = 7134 bytes +SHA1 (6c7b0f61c12d28cc.patch) = bb4c649709496ccdcb539152d0d591c91a0df5a8 +RMD160 (6c7b0f61c12d28cc.patch) = 0624bf894107908f7a27228fb1c51a68aadcf57f +SHA512 (6c7b0f61c12d28cc.patch) = 7df1df77c6d817d4185e4b318c7dbaf5ecb9980948bf3d5760df8d204fd0df1c3075b31cb5106a436f0580344ede9ff2330d5460e13fe8578ba95c84ab3702fb +Size (6c7b0f61c12d28cc.patch) = 1164 bytes SHA1 (qtwebkit-5.212.0-alpha2.tar.xz) = 6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8 RMD160 (qtwebkit-5.212.0-alpha2.tar.xz) = 33c3f7c68090fa16f72950ef85c20978432cc058 SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 --_----------=_1541771100178900--