diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-16 14:49:16 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-16 14:49:16 +0000 |
| commit | ea792330aae305de936d512889687975b4ed54f8 (patch) | |
| tree | 2b231d528e66a11feb68225205543979636e6a63 /x11-toolkits/qt5-uiplugin | |
| parent | 243026d1e9c3910bdb786aa4c8b9d8b84c7a575b (diff) | |
Update Qt5 to 5.12.0
http://blog.qt.io/blog/2018/12/06/qt-5-12-lts-released/
- This breaks support for libressl again. Patches are welcome.
PR: 233705
Exp-run by: antoine
Diffstat (limited to 'x11-toolkits/qt5-uiplugin')
| -rw-r--r-- | x11-toolkits/qt5-uiplugin/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt5-uiplugin/files/patch-src__src.pro | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile index 421bb08003b9..f4b752497d29 100644 --- a/x11-toolkits/qt5-uiplugin/Makefile +++ b/x11-toolkits/qt5-uiplugin/Makefile @@ -8,8 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Custom Qt widget plugin interface for Qt Designer -USE_QT= core gui widgets USES= qmake qt-dist:5,tools +USE_QT= core gui widgets BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro index 21e43eea13df..56a603d27a1f 100644 --- a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro +++ b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro @@ -1,19 +1,23 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2018-09-21 17:35:47 UTC +--- src/src.pro.orig 2018-10-16 20:12:06 UTC +++ src/src.pro -@@ -1,48 +1,3 @@ +@@ -1,52 +1,3 @@ TEMPLATE = subdirs -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { -- SUBDIRS = assistant \ -- pixeltool \ -- designer -- -- linguist.depends = designer +- QT_FOR_CONFIG += widgets +- qtConfig(pushbutton):qtConfig(toolbutton) { +- SUBDIRS = assistant \ +- designer \ +- pixeltool +- +- linguist.depends = designer +- } +- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator - } -} - @@ -24,11 +28,11 @@ missing dependencies. - !android|android_app: SUBDIRS += qtplugininfo -} - --config_clang: SUBDIRS += qdoc +-config_clang: qtConfig(thread): SUBDIRS += qdoc - --if(!android|android_app):!uikit: SUBDIRS += qtpaths +-!android|android_app: SUBDIRS += qtpaths - --mac { +-macos { - SUBDIRS += macdeployqt -} - @@ -39,8 +43,8 @@ missing dependencies. -qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ +- distancefieldgenerator \ - pixeltool \ -- macdeployqt \ -) - -# This is necessary to avoid a race condition between toolchain.prf |