From owner-svn-ports-head@freebsd.org Thu Apr 12 11:04:14 2018 Return-Path: Delivered-To: svn-ports-head@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 8C91BF8A45D; Thu, 12 Apr 2018 11:04:14 +0000 (UTC) (envelope-from adridg@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 2B6B58174C; Thu, 12 Apr 2018 11:04:14 +0000 (UTC) (envelope-from adridg@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 25F81237C; Thu, 12 Apr 2018 11:04:14 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3CB4E2i048030; Thu, 12 Apr 2018 11:04:14 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3CB4E3o048029; Thu, 12 Apr 2018 11:04:14 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804121104.w3CB4E3o048029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 12 Apr 2018 11:04:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467142 - head/devel/qt5-designer X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/devel/qt5-designer X-SVN-Commit-Revision: 467142 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2018 11:04:14 -0000 Author: adridg Date: Thu Apr 12 11:04:13 2018 New Revision: 467142 URL: https://svnweb.freebsd.org/changeset/ports/467142 Log: Fix the .pc file installed by devel/qt5-designer. Followup to r466825 (fix which causes failure in devel/py-qt5-designer) and r467015 (which reverted the fix). Change only the installed .pc file, not the .pro file (which has knock-on effects for ports using qmake, like the py-qt5-designer* ones). Tested this time with poudriere bulk ... -i -C x11-toolkits/qt5-uiplugin devel/qt5-designer devel/py-qt5-designer devel/py-qt5-designerplugin devel/qscintilla2-designerplugin-qt5 Approved by: tcberner (mentor, implicit) Modified: head/devel/qt5-designer/Makefile Modified: head/devel/qt5-designer/Makefile ============================================================================== --- head/devel/qt5-designer/Makefile Thu Apr 12 10:17:03 2018 (r467141) +++ head/devel/qt5-designer/Makefile Thu Apr 12 11:04:13 2018 (r467142) @@ -2,7 +2,7 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -38,5 +38,8 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/src/designer/images/designer.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt5.png + # The generated .pc file refers to a nonexistent other .pc file + ${REINPLACE_CMD} -e '/^Requires/s/Qt5UiPlugin//' \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/Qt5Designer.pc .include