diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-02-18 19:48:05 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-02-18 19:48:05 +0000 |
commit | f3c180c3431372077934f7658922b8a244419bdf (patch) | |
tree | 4d04227f02c7fda007ad74be01e1393168277b0b /www/qt5-webkit/files/patch-Source__QtWebKit.pro | |
parent | Upgrade from 2.2 to 2.3. (diff) |
Update Qt5 to 5.7.1, and unify the Qt4 and Qt5 ports some more
* Update Qt5 to 5.7.1
* Move Qt4 binaries to lib/qt4/bin
* Move Qt5 libraries to lib/qt5/lib
By moving the libraries we should finally be able to get rid of the inplace
upgrade bug (see ports bugs 194088, 195105 and 198720): when Qt5's libraries
were lying in /usr/local/lib, which would often get added by pkgconfig to the
linker paths via dependencies, the already installed libraries were linked
against, instead of the ones that were being built. This forced us to make
sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the
linker flags. With this change this should no longer be the case.
* Rename some ports to match the rest (foo-qtX -> qtX-foo)
* Depend on new port misc/qtchooser [see UPDATING & CHANGES]
There are several new Qt5 ports which all have been created by Marie Loise Nolden
<nolden@kde.org>. Thanks again.
PR: 216797
Exp-Run by: antoine
Reviewed by: rakuco, mat, groot_kde.org
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D9213
Diffstat (limited to 'www/qt5-webkit/files/patch-Source__QtWebKit.pro')
-rw-r--r-- | www/qt5-webkit/files/patch-Source__QtWebKit.pro | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/www/qt5-webkit/files/patch-Source__QtWebKit.pro b/www/qt5-webkit/files/patch-Source__QtWebKit.pro new file mode 100644 index 000000000000..b2afeae43ceb --- /dev/null +++ b/www/qt5-webkit/files/patch-Source__QtWebKit.pro @@ -0,0 +1,17 @@ +Do not go into the examples/ directory, which contains only platformplugin/. + +Even though it is not part of the default target, it is included in `make +install', and platformplugin's .pro file has a DESTDIR setting that causes the +file system to be touched even though there is nothing to build or install. +--- Source/QtWebKit.pro ++++ Source/QtWebKit.pro +@@ -38,9 +38,4 @@ build?(webkit1) { + tests.file = tests.pri + SUBDIRS += tests + } +- +- examples.file = WebKit/qt/examples/examples.pro +- examples.CONFIG += no_default_target +- examples.makefile = Makefile +- SUBDIRS += examples + } |