Re: Qt5 fix for testing

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

On Fri, Dec 20, 2013 at 01:33:44PM +0100, Thomas Klausner wrote:
> > Index: x11/qt5-qtbase/Makefile.common
> > ==================================================================
> > --- x11/qt5-qtbase/Makefile.common
> > +++ x11/qt5-qtbase/Makefile.common
> > @@ -43,11 +43,11 @@
> >  BUILDLINK_TRANSFORM+=      opt:-ldl:${BUILDLINK_LDADD.dl:M*}
> >  
> >  HAS_CONFIGURE=             yes
> >  USE_LANGUAGES=             c c++
> >  USE_LIBTOOL=               yes
> > -USE_TOOLS+=                gmake perl:build
> > +USE_TOOLS+=                gmake perl:build pkg-config
> >  
> >  CONFIG_SHELL=              ${PERL5}
> >  
> >  REPLACE_PERL+=             qtbase/bin/syncqt.pl
> >  REPLACE_PERL+=             
> > qtwebkit/Source/WebKit2/Scripts/generate-forwarding-headers.pl
> > @@ -182,11 +182,12 @@
> >  
> >  .if empty(PKGNAME:Mqt5-qtbase*) && empty(PKGNAME:Mqt5-sqlite3*) \
> >     && empty(PKGNAME:Mqt5-mysql*) && empty(PKGNAME:Mqt5-psql*) \
> >     && empty(PKGNAME:Mqt5-odbc*)
> >  post-configure:
> > -   cd ${WRKSRC}/${BUILD_DIRS} && ${QTPREFIX}/bin/qmake -o Makefile
> > +   cd ${WRKSRC}/${BUILD_DIRS} && \
> > +   ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${QTPREFIX}/bin/qmake -o 
> > Makefile
> >  .endif
> >  
> >  .include "../../devel/zlib/buildlink3.mk"
> >  .include "../../devel/gettext-lib/buildlink3.mk"
> >  .include "../../devel/glib2/buildlink3.mk"
> > 
> 
> I took this part of the changes to try and fix my qt5-qtwebkit build
> breakage, but didn't see a change:
> 
> gmake[2]: Leaving directory 
> '/scratch/x11/qt5-qtwebkit/work/qt-everywhere-opensource-src-5.2.0/qtwebkit/Source/WebCore'
> gmake[1]: Leaving directory 
> '/scratch/x11/qt5-qtwebkit/work/qt-everywhere-opensource-src-5.2.0/qtwebkit/Source/WebCore'
> cd Source/WebKit/ && ( test -e Makefile.WebKit1 || /usr/pkg/qt5/bin/qmake 
> /scratch/x11/qt5-qtwebkit/work/qt-everywhere-opensource-src-5.2.0/qtwebkit/Source/WebKit/WebKit1.pro
>  -o Makefile.WebKit1 ) && /usr/pkg/bin/gmake -f Makefile.WebKit1 all
> Project ERROR: Package x11 not found
> Makefile:223: recipe for target 'sub-Source-WebKit-WebKit1-pro-all-ordered' 
> failed
> gmake: *** [sub-Source-WebKit-WebKit1-pro-all-ordered] Error 3
> *** Error code 2
> 
> Stop.
> 
> Do you have a suggestion for that as well?

You must rebuild qt5-qtbase. The pkg-config availability is hard-coded
in the spec config.

Joerg