Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Apr 2018 11:04:14 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467142 - head/devel/qt5-designer
Message-ID:  <201804121104.w3CB4E3o048029@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804121104.w3CB4E3o048029>