summaryrefslogtreecommitdiff
path: root/sysutils/qt5-qtpaths
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2020-07-06 06:43:37 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2020-07-06 06:43:37 +0000
commit5f34284e7c01f03ee6735e7fcd3ec5783ab11777 (patch)
tree46cfcccc197bb0d79ee8c9868007fd48adf2470d /sysutils/qt5-qtpaths
parenttextproc/py-ocrmypdf: Update to 10.2.0 (diff)
Update Qt5 to 5.15
This is a major upgrade of the Qt libraries [1], [2]. * People that use upgrading mechanisms with incomplete dependency handling (portmaster & Co) should make sure to manually remove the existing Qt packages to guarantee a safe upgrade. Keep in mind, that Qt does not like if you have an incomplete upgrade. * This version of Qt drops support for OpenSSL 1.0 -- this means that there won't be any binary packages for Qt5 provided by the FreeBSD package builders for FreeBSD 11.x anymore -- and the same for *all* the ports depending on net/qt5-network [3]. If you cannot upgrade to a more recent FreeBSD version (12.x, 13.x), you will need to build Qt5 from ports while switching to an SSL implementation from ports. Big thanks are due for * kai@ for updating webengine (also mikael@) * Felix Palmen for providing LibreSSL support patches * adridg@ and lbartoletti@ for helping me fix the fallout [1] https://www.qt.io/blog/qt-5.15-released [2] https://wiki.qt.io/New_Features_in_Qt_5.15 [3] https://www.freshports.org/net/qt5-network PR: 247010 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=541318
Diffstat (limited to 'sysutils/qt5-qtpaths')
-rw-r--r--sysutils/qt5-qtpaths/Makefile11
-rw-r--r--sysutils/qt5-qtpaths/files/patch-src_src.pro58
-rw-r--r--sysutils/qt5-qtpaths/pkg-plist2
3 files changed, 60 insertions, 11 deletions
diff --git a/sysutils/qt5-qtpaths/Makefile b/sysutils/qt5-qtpaths/Makefile
index 2ae61bbe340c..319a0b653198 100644
--- a/sysutils/qt5-qtpaths/Makefile
+++ b/sysutils/qt5-qtpaths/Makefile
@@ -11,17 +11,6 @@ COMMENT= Command line client to QStandardPaths
USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
USE_QT= core
-PLIST_FILES= ${QT_BINDIR}/qtpaths
-
-# Similarly to x11/qt5-qev, it makes more sense to just run the build system
-# from the qtpaths directory. If we run it from the top of the source tree, it
-# will look for a lot more dependencies for other tools such as lupdate, which
-# we do not really have to depend on.
-WRKSRC_SUBDIR= src/${PORTNAME}
-
QT_BINARIES= yes
-post-patch:
- ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
-
.include <bsd.port.mk>
diff --git a/sysutils/qt5-qtpaths/files/patch-src_src.pro b/sysutils/qt5-qtpaths/files/patch-src_src.pro
new file mode 100644
index 000000000000..0d759da395aa
--- /dev/null
+++ b/sysutils/qt5-qtpaths/files/patch-src_src.pro
@@ -0,0 +1,58 @@
+--- src/src.pro.orig 2020-04-12 20:15:00 UTC
++++ src/src.pro
+@@ -1,54 +1,3 @@
+ TEMPLATE = subdirs
+
+-qtHaveModule(widgets) {
+- no-png {
+- message("Some graphics-related tools are unavailable without PNG support")
+- } else {
+- QT_FOR_CONFIG += widgets
+- qtConfig(pushbutton):qtConfig(toolbutton) {
+- SUBDIRS = assistant \
+- designer \
+- pixeltool
+-
+- linguist.depends = designer
+- }
+- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
+- }
+-}
+-
+-SUBDIRS += linguist \
+- qtattributionsscanner
+-
+-qtConfig(library) {
+- !android|android_app: SUBDIRS += qtplugininfo
+-}
+-
+-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+-QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
+-
+-!android|android_app: SUBDIRS += qtpaths
+-
+-macos {
+- SUBDIRS += macdeployqt
+-}
+-
+-qtHaveModule(dbus): SUBDIRS += qdbus
+-
+-win32|winrt:SUBDIRS += windeployqt
+-winrt:SUBDIRS += winrtrunner
+-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+-
+-qtNomakeTools( \
+- distancefieldgenerator \
+- pixeltool \
+-)
+-
+-# This is necessary to avoid a race condition between toolchain.prf
+-# invocations in a module-by-module cross-build.
+-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
+- qdoc.depends += qtattributionsscanner
+- windeployqt.depends += qtattributionsscanner
+- winrtrunner.depends += qtattributionsscanner
+- linguist.depends += qtattributionsscanner
+-}
++SUBDIRS = qtpaths
diff --git a/sysutils/qt5-qtpaths/pkg-plist b/sysutils/qt5-qtpaths/pkg-plist
new file mode 100644
index 000000000000..6a5b89e9c63d
--- /dev/null
+++ b/sysutils/qt5-qtpaths/pkg-plist
@@ -0,0 +1,2 @@
+%%QT_BINDIR%%/qtpaths
+%%DEBUG%%%%QT_BINDIR%%/qtpaths.debug