From owner-svn-ports-all@freebsd.org Wed Jun 13 05:24:29 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E914E1004423; Wed, 13 Jun 2018 05:24:28 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 87FDA6C85F; Wed, 13 Jun 2018 05:24:28 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6548A1519A; Wed, 13 Jun 2018 05:24:28 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5D5OSLa086916; Wed, 13 Jun 2018 05:24:28 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5D5ORcS086913; Wed, 13 Jun 2018 05:24:27 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201806130524.w5D5ORcS086913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 13 Jun 2018 05:24:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472285 - in head/converters/wkhtmltopdf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/converters/wkhtmltopdf: . files X-SVN-Commit-Revision: 472285 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 05:24:29 -0000 Author: pi Date: Wed Jun 13 05:24:27 2018 New Revision: 472285 URL: https://svnweb.freebsd.org/changeset/ports/472285 Log: converters/wkhtmltopdf: update 0.12.4 -> 0.12.5, unbreak - take maintainer PR: 228968, 228732 Submitted by: truckman, pi Reviewed by: Ashish Kulkarni (upstream) Approved by: mm (maintainer) Relnotes: https://github.com/wkhtmltopdf/wkhtmltopdf/releases Deleted: head/converters/wkhtmltopdf/files/patch-clientcert head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Modified: head/converters/wkhtmltopdf/Makefile head/converters/wkhtmltopdf/distinfo head/converters/wkhtmltopdf/pkg-plist Modified: head/converters/wkhtmltopdf/Makefile ============================================================================== --- head/converters/wkhtmltopdf/Makefile Wed Jun 13 04:58:31 2018 (r472284) +++ head/converters/wkhtmltopdf/Makefile Wed Jun 13 05:24:27 2018 (r472285) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= wkhtmltopdf -PORTVERSION= 0.12.4 +PORTVERSION= 0.12.5 CATEGORIES= converters -MAINTAINER= mm@FreeBSD.org +MAINTAINER= pi@FreeBSD.org COMMENT= Convert HTML (or live webpages) to PDF or image LICENSE= LGPL3 @@ -28,8 +28,9 @@ USE_XORG= x11 xext xrender USE_PERL5= build USE_LDCONFIG= yes USE_GITHUB= yes -WKQT_TAGNAME= c0cfa03 +WKQT_TAGNAME= 5db36ec GH_TUPLE= ${PORTNAME}:qt:${WKQT_TAGNAME}:qt +USE_CXXSTD= gnu++98 HAS_CONFIGURE= yes PATCH_WRKSRC= ${WRKSRC}/qt @@ -58,24 +59,26 @@ CONFIGURE_ARGS= -prefix ${WRKSRC}/build/qt \ MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}${PREFIX}" pre-patch: - @${RMDIR} ${WRKSRC}/qt - @${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt + ${RMDIR} ${WRKSRC}/qt + ${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6/include|${LOCALBASE}/include/X11|g' \ -e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \ ${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf - @${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ + ${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ ${PATCH_WRKSRC}/mkspecs/common/g++-base.conf - @${REINPLACE_CMD} -e "s|share/man|man|g" \ + ${REINPLACE_CMD} -e "s|share/man|man|g" \ ${WRKSRC}/src/image/image.pro \ ${WRKSRC}/src/pdf/pdf.pro - @${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ + ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/image/image.pro + ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro + ${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ ${WRKSRC}/build/wkhtmltox post-build: - @cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \ + cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \ ../qt/bin/qmake ../../wkhtmltopdf.pro && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \ @@ -84,14 +87,6 @@ post-build: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wkhtmltoimage \ ${STAGEDIR}${PREFIX}/bin/wkhtmltopdf \ - ${STAGEDIR}${PREFIX}/lib/libwkhtmltox.so.0.12.4 + ${STAGEDIR}${PREFIX}/lib/libwkhtmltox.so.${PORTVERSION} -.include - -.if ${OPSYS} == FreeBSD -.if ${COMPILER_TYPE:Mclang} && ${COMPILER_VERSION} >= 60 -BROKEN= Does not build -.endif -.endif - -.include +.include Modified: head/converters/wkhtmltopdf/distinfo ============================================================================== --- head/converters/wkhtmltopdf/distinfo Wed Jun 13 04:58:31 2018 (r472284) +++ head/converters/wkhtmltopdf/distinfo Wed Jun 13 05:24:27 2018 (r472285) @@ -1,5 +1,5 @@ -TIMESTAMP = 1489939659 -SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.4_GH0.tar.gz) = dd466f5c2504670459f3b8265de5697b9054f077e2f3e392e5172b5133080edf -SIZE (wkhtmltopdf-wkhtmltopdf-0.12.4_GH0.tar.gz) = 128695 -SHA256 (wkhtmltopdf-qt-c0cfa03_GH0.tar.gz) = f313fdf8e0b7630f47a6bfba749bea128234379b311a8c609b1da450027eb4ee -SIZE (wkhtmltopdf-qt-c0cfa03_GH0.tar.gz) = 172992697 +TIMESTAMP = 1528798989 +SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621 +SIZE (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 511181 +SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1 +SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377 Modified: head/converters/wkhtmltopdf/pkg-plist ============================================================================== --- head/converters/wkhtmltopdf/pkg-plist Wed Jun 13 04:58:31 2018 (r472284) +++ head/converters/wkhtmltopdf/pkg-plist Wed Jun 13 05:24:27 2018 (r472285) @@ -7,6 +7,6 @@ include/wkhtmltox/pdf.h lib/libwkhtmltox.so lib/libwkhtmltox.so.0 lib/libwkhtmltox.so.0.12 -lib/libwkhtmltox.so.0.12.4 +lib/libwkhtmltox.so.0.12.5 man/man1/wkhtmltoimage.1.gz man/man1/wkhtmltopdf.1.gz