diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-01-07 05:30:31 +0800 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-01-07 05:30:31 +0800 |
commit | f6ceca63504679b05ea4fc24a195a301e2303d1f (patch) | |
tree | a6e116c43545a3682fe63db4bdca54e6fb24567e /print/qt5-printsupport | |
parent | 78a4d3df994a008dd752fd82307fd6d31aa18f3a (diff) | |
download | freebsd-ports-gnome-f6ceca63504679b05ea4fc24a195a301e2303d1f.tar.gz freebsd-ports-gnome-f6ceca63504679b05ea4fc24a195a301e2303d1f.tar.zst freebsd-ports-gnome-f6ceca63504679b05ea4fc24a195a301e2303d1f.zip |
Update Qt5 ports to 5.9.3.
This took quite a lot of time because Qt's own build system underwent
several changes in 5.8.0 that took a while to adapt to.
And, of course, qt5-webengine is a behemoth that we need to patch like crazy
due to its bundling of Chromium. In fact, most of the Chromium patches in
qt5-webengine have been imported with no changes from www/chromium@433510
("www/chromium: update to 56.0.2924.87").
New port: accessibility/qt5-speech
Bigger changes to Qt5 ports we had to make:
- Qt now allows using a configure.json file to define configuration options
and specify configuration checks that can be done when qmake is invoked.
However, configure.json checks done in a subdirectory only propagates to
subdirectories, and checks elsewhere will fail if all .pro files are being
parsed at once (i.e. qmake -recursive), so several ports had to switch to
USES=qmake:norecursive along with manual additional qmake invocations in
subdirectories in order to work. It's been mentioned in a few places such
as Qt's bug tracker that qmake's recursive mode is pretty much deprecated,
so we might switch to non-recursive mode by default in the future.
- Uses/qmake.mk: Introduce QMAKE_CONFIGURE_ARGS. qmake now accepts
arbitrary options such as '-foo' and '-no-bar' at the end of the
command-line. They can be specified in QMAKE_CONFIGURE_ARGS.
- graphics/qt5-wayland: The port can only be built if graphics/mesa-libs is
built with the WAYLAND option, so a corresponding option (off by default)
was added to the port.
- misc/qt5-doc: Switch to a pre-built documentation tarball. The existing
port was not working with Qt 5.9. Instead of trying to fix it, switch to
what Gentoo does and fetch a tarball that already contains all
documentation so that we do not have to build anything at all. The
tarball's name and location in download.qt.io look a bit weird, but it
seems to work fine.
- www/qt5-webengine: Use binutils from ports, Chromium's GN build system
generates a build.ninja that uses ar(1) with the @file syntax that is not
supported by BSD ar, so we need to use GNU ar from binutils.
- x11-toolkits/qt5-declarative-render2d: This port was merged into the main
Qt Declarative repository upstream, and into x11-toolkits/qt5-quick in the
ports tree.
Changes to other ports we had to make:
- biology/ugene: Drop a '#define point "."' that is not present in more
recent versions of the port. Defining a macro with such a common name
causes build issues with Qt 5.9, which uses |point| as an argument name in
methods.
- cad/qelectrotech: Fix plist with Qt 5.9. Directories are no longer
installed with `cp -f -R', but rather `qmake install qinstall', which does
not install
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/.directory
That's a local file that should not even have been part of the tarball
anyway.
- chinese/gcin-qt5: Add additional private Qt directories (which should not
be used in the first place) to get the port to build with Qt 5.9.
- devel/qtcreator: Fix plist with Qt 5.9. Something changed in qdoc and some
test classes no longer generate documentation files.
- security/keepassx-devel: Import a patch sent upstream almost a year ago to
fix the build with Qt 5.9.
Thanks to antoine for the exp-run, and tcberner and Laurent Cimon
<laurent@nuxi.ca> for landing changes in our qt-5.9 branch.
PR: 224849
Diffstat (limited to 'print/qt5-printsupport')
-rw-r--r-- | print/qt5-printsupport/Makefile | 7 | ||||
-rw-r--r-- | print/qt5-printsupport/pkg-plist | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 27afe0bb59d2..924f001d2668 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -29,11 +29,18 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups .if ${PORT_OPTIONS:MCUPS} QT_DEFINES+= CUPS QT_CONFIG+= cups +MORE_WRKSRCS+= src/plugins/printsupport .else QT_DEFINES+= -CUPS QT_CONFIG+= -cups .endif +post-configure: +.for d in src/printsupport ${MORE_WRKSRCS} + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .if ${PORT_OPTIONS:MCUPS} @cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \ diff --git a/print/qt5-printsupport/pkg-plist b/print/qt5-printsupport/pkg-plist index 3b65ee6767e9..ef82169a559a 100644 --- a/print/qt5-printsupport/pkg-plist +++ b/print/qt5-printsupport/pkg-plist @@ -11,6 +11,8 @@ %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprintengine_win_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprinter_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprinterinfo_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qtprintsupport-config_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qtprintsupportglobal_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintdevice.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintersupport.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintplugin.h @@ -33,6 +35,7 @@ %%QT_INCDIR%%/QtPrintSupport/qprinterinfo.h %%QT_INCDIR%%/QtPrintSupport/qprintpreviewdialog.h %%QT_INCDIR%%/QtPrintSupport/qprintpreviewwidget.h +%%QT_INCDIR%%/QtPrintSupport/qtprintsupport-config.h %%QT_INCDIR%%/QtPrintSupport/qtprintsupportglobal.h %%QT_INCDIR%%/QtPrintSupport/qtprintsupportversion.h %%QT_CMAKEDIR%%/Qt5PrintSupport/Qt5PrintSupportConfig.cmake |