Re: Fix missing private includes in Qt5-base

[Vadim Zhukov]

2017-11-04 11:55 GMT+03:00 Rafael Sadowski :
> Hi all,
>
> some upcoming KDE applications use the internal private Qt headers.  The
> diff below will fix the (..qt5/cmake/Qt5*/Qt*Config.cmake) cmake files
> to detect private headers like this:
>
> find_package(Qt5Core ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- Makefile24 Oct 2017 10:12:19 -  1.15
> +++ Makefile4 Nov 2017 08:50:12 -
> @@ -15,6 +15,7 @@ PKGNAME-global =  qt5-global-${VERSION}
>  PKGNAME-psql = qt5-postgresql-${VERSION}
>  PKGNAME-sqlite2 =  qt5-sqlite2-${VERSION}
>  PKGNAME-tds =  qt5-tds-${VERSION}
> +REVISION-main =0
>
>  PKG_ARCH-global =  *
>  PKG_ARCH-examples =*
> @@ -222,6 +223,8 @@ post-extract:
> cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h 
> ${WRKDIST}/mkspecs/openbsd-clang/
>
>  pre-configure:
> +   # Fix missing private includes 
> https://bugreports.qt.io/browse/QTBUG-37417
> +   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
> ${WRKSRC}/mkspecs/features/create_cmake.prf
> @gccbasedir=`ecpp -print-search-dirs | awk '/^install:/{print $$2}'`; 
> \
> perl ${PORTSDIR}/infrastructure/bin/pkg_subst \
> -D OPENBSD_INCDIR_PREPEND="$${gccbasedir}include" \
>

First, this is somewhat complex change. I'd okay it only if it will be
well-tested. This means removing all qt5 stuff and cleaning all Qt5
and KDE5 ports, and rebuilding all of them from scratch.

Second, we already patch create_cmake.prf, so it's better to change
tweak create_cmake.prf and then make update-patches.

I think there should be a better option but I don't see it myself and
I can't force you (or somewhere else) to dig better. :)

--
  WBR,
  Vadim Zhukov

Re: Fix missing private includes in Qt5-base

[Rafael Sadowski]

Any objections?

On Sat Nov 04, 2017 at 09:55:19AM +0100, Rafael Sadowski wrote:
> Hi all,
> 
> some upcoming KDE applications use the internal private Qt headers.  The
> diff below will fix the (..qt5/cmake/Qt5*/Qt*Config.cmake) cmake files
> to detect private headers like this:
> 
> find_package(Qt5Core ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)
> 
> Ok?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- Makefile  24 Oct 2017 10:12:19 -  1.15
> +++ Makefile  4 Nov 2017 08:50:12 -
> @@ -15,6 +15,7 @@ PKGNAME-global =qt5-global-${VERSION}
>  PKGNAME-psql =   qt5-postgresql-${VERSION}
>  PKGNAME-sqlite2 =qt5-sqlite2-${VERSION}
>  PKGNAME-tds =qt5-tds-${VERSION}
> +REVISION-main =  0
>  
>  PKG_ARCH-global =*
>  PKG_ARCH-examples =  *
> @@ -222,6 +223,8 @@ post-extract:
>   cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h 
> ${WRKDIST}/mkspecs/openbsd-clang/
>  
>  pre-configure:
> + # Fix missing private includes 
> https://bugreports.qt.io/browse/QTBUG-37417
> + sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
> ${WRKSRC}/mkspecs/features/create_cmake.prf
>   @gccbasedir=`ecpp -print-search-dirs | awk '/^install:/{print $$2}'`; \
>   perl ${PORTSDIR}/infrastructure/bin/pkg_subst \
>   -D OPENBSD_INCDIR_PREPEND="$${gccbasedir}include" \
> 

Fix missing private includes in Qt5-base

[Rafael Sadowski]

Hi all,

some upcoming KDE applications use the internal private Qt headers.  The
diff below will fix the (..qt5/cmake/Qt5*/Qt*Config.cmake) cmake files
to detect private headers like this:

find_package(Qt5Core ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)

Ok?

Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile24 Oct 2017 10:12:19 -  1.15
+++ Makefile4 Nov 2017 08:50:12 -
@@ -15,6 +15,7 @@ PKGNAME-global =  qt5-global-${VERSION}
 PKGNAME-psql = qt5-postgresql-${VERSION}
 PKGNAME-sqlite2 =  qt5-sqlite2-${VERSION}
 PKGNAME-tds =  qt5-tds-${VERSION}
+REVISION-main =0
 
 PKG_ARCH-global =  *
 PKG_ARCH-examples =*
@@ -222,6 +223,8 @@ post-extract:
cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h 
${WRKDIST}/mkspecs/openbsd-clang/
 
 pre-configure:
+   # Fix missing private includes 
https://bugreports.qt.io/browse/QTBUG-37417
+   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
${WRKSRC}/mkspecs/features/create_cmake.prf
@gccbasedir=`ecpp -print-search-dirs | awk '/^install:/{print $$2}'`; \
perl ${PORTSDIR}/infrastructure/bin/pkg_subst \
-D OPENBSD_INCDIR_PREPEND="$${gccbasedir}include" \