aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2016-09-17 17:46:54 +0800
committerrakuco <rakuco@FreeBSD.org>2016-09-17 17:46:54 +0800
commit7fdf0da385d7c6b2b7639653af91bc8fc409f713 (patch)
treeff6682b425056cf66ba4ca415211efb1b19cc258 /textproc
parentdf8c76029e3c07b11560a8a3593db5b589718863 (diff)
downloadfreebsd-ports-gnome-7fdf0da385d7c6b2b7639653af91bc8fc409f713.tar.gz
freebsd-ports-gnome-7fdf0da385d7c6b2b7639653af91bc8fc409f713.tar.zst
freebsd-ports-gnome-7fdf0da385d7c6b2b7639653af91bc8fc409f713.zip
Update the Qt5 ports to 5.6.1.
This took longer than expected, but there are quite a few changes to the existing ports and a few new ones. General upstream changes: - Starting with Qt 5.6.2, Qt will fail at configuration time if LibreSSL is being used. According to the discussion here: https://codereview.qt-project.org/#/c/154800/ The Qt project is not opposed to LibreSSL, but does not want to mix support for it into the OpenSSL backend code, especially as they move towards supporting OpenSSL 1.1. People interested in LibreSSL support are welcome to submit a separate backend upstream, but are expected to maintain it. We (kde@) are not opposed to carrying some patches authored by others in the future, as long as they are not huge and destabilizing. - When Qt detects the compiler supports C++11, it will pass -std=gnu++11 by default (this is an upstream change). You can add "CONFIG -= c++11" to your .pro. Qt 5.7 will require C++11. - www/webkit-qt5: The QtWebKit module is deprecated upstream, and is shipped separately as a community release tarball. kde@ does not have an ETA for a qt5-webengine port, as it requires a huge effort (and number of patches) similar to maintaining www/chromium itself. - x11-toolkits/qt5-declarative has been deprecated upstream. The last release is 5.5.1. Relevant changes: - devel/qmake5: The freebsd-clang mkspec has become the default mkspec on FreeBSD, replacing the outdated freebsd-g++ one that was moved to unsupported/ (it still works though). - devel/qt5-qdoc: qdoc was moved to qttools upstream, but its data files are still in qtbase. The data files are now in the qt5-qdoc-data port. - misc/qt5-doc: Clean up and stop requiring a compiler and fumbling with mkspecs. Instead of running the `configure' script, which requires a compiler and adjustments to the mkspecs files and also ends up building a new qmake binary, we now leverage USES=qmake to generate all the Makefiles from the top-level qt.pro. Getting this to work requires some tricks, though, and qt.conf.in has a longer explanation of what's being done. Switch to USES=gmake to be able to drop MAKE_JOBS_UNSAFE=yes. New ports: - comms/qt5-serialbus - devel/qt5-qdoc-data - x11-toolkits/qt5-quickcontrols2 Big thanks to Adriaan de Groot (groot@kde.org), tcberner@ and Loise Nolden (nolden@kde.org) for the huge amount of work they put into this patch. Loise in particular also sent quite a few changes upstream that were essential for this update to work. PR: 211916
Diffstat (limited to 'textproc')
-rw-r--r--textproc/clucene-qt5/files/patch-src__src.pro7
-rw-r--r--textproc/clucene-qt5/pkg-plist1
2 files changed, 4 insertions, 4 deletions
diff --git a/textproc/clucene-qt5/files/patch-src__src.pro b/textproc/clucene-qt5/files/patch-src__src.pro
index cb146d87d743..72825f82f0ea 100644
--- a/textproc/clucene-qt5/files/patch-src__src.pro
+++ b/textproc/clucene-qt5/files/patch-src__src.pro
@@ -1,11 +1,11 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
---- src/src.pro
+--- src/src.pro.orig 2016-02-24 20:44:09 UTC
+++ src/src.pro
-@@ -1,37 +1,2 @@
+@@ -1,38 +1,3 @@
TEMPLATE = subdirs
--
+
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
@@ -20,6 +20,7 @@ missing dependencies.
-}
-
-SUBDIRS += linguist \
+- qdoc \
- qtplugininfo
-if(!android|android_app):!ios: SUBDIRS += qtpaths
-
diff --git a/textproc/clucene-qt5/pkg-plist b/textproc/clucene-qt5/pkg-plist
index 3e6752158994..6bb72a72f673 100644
--- a/textproc/clucene-qt5/pkg-plist
+++ b/textproc/clucene-qt5/pkg-plist
@@ -27,4 +27,3 @@
%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug
%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri
-libdata/pkgconfig/Qt5CLucene.pc