diff options
97 files changed, 1229 insertions, 476 deletions
@@ -7176,3 +7176,4 @@ deskutils/babytrans||2014-10-31|Has expired: Abandonware, dictionaries unavailab www/rt38||2014-10-31|Has expired: Has expired: End of Life March 2014 textproc/libmwaw|textproc/libmwaw03|2014-10-31|Replaced by newer version databases/pecl-yac|devel/pecl-yac|2014-11-04|Duplicate port +devel/qt5-qmldevtools||2014-11-05|Merged into lang/qt5-qml diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index b9ee08afa208..f7322b305a3c 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -49,6 +49,19 @@ IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized USE_QT${_QT_VERSION:R:R}+= qmake_build .endif +.if ${_QT_VERSION:M5*} +# We deliberately do not pass -I${LOCALBASE}/include and -L${LOCALBASE}/lib +# in the FreeBSD mkspecs because in Qt5 they are always added before the +# paths in ${WRKSRC}. In other words, if one is upgrading an existing +# installation the old headers and libraries will always be picked up. +# Those directories to be passed though, they just need to be passed last. +# See QTBUG-40825 and ports/194088 for more information. +CONFIGURE_ENV+= CPATH=${LOCALBASE}/include \ + LIBRARY_PATH=${LOCALBASE}/lib +MAKE_ENV+= CPATH=${LOCALBASE}/include \ + LIBRARY_PATH=${LOCALBASE}/lib +.endif # ${_QT_VERSION:M5*} + # QMAKESPEC belongs to bsd.qt.mk. QMAKE_ENV?= ${CONFIGURE_ENV} QMAKE_ARGS+= -spec ${QMAKESPEC} \ diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 76ac28b42672..a49b25ac45b4 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.6 -QT5_VERSION?= 5.2.1 +QT5_VERSION?= 5.3.2 QT_PREFIX?= ${LOCALBASE} @@ -103,12 +103,15 @@ QT_DIST= base declarative doc graphicaleffects imageformats \ # Qt configure requires pkg-config to detect dependencies. USES+= pkgconfig -# Use mkspecs installed in QMAKEPATH/mkspecs when building qtbase. -CONFIGURE_ENV+= QMAKEPATH="${QT_MKSPECDIR:H}" -MAKE_ENV+= QMAKEPATH="${QT_MKSPECDIR:H}" +# Set QMAKESPEC when building qtbase so that qmake (called by the configure +# script) can find the mkspecs we create ourselves in devel/qmake5. +CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" +MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" . endif -# -nomake flags aren't enough. +# -nomake is only used by qtbase's configure script. +# Other ports from other Qt modules will automatically build examples and +# tests if the directories exist because of mkspecs/features/qt_parts.prf. EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ ${DISTNAME:S,$,/tests,:S,^,--exclude ,} . endif # ! ${_QT_VERSION:M4*} @@ -137,8 +140,7 @@ CONFIGURE_ARGS+=-fast \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else -CONFIGURE_ARGS+=-dont-process \ - -nomake examples -nomake tests \ +CONFIGURE_ARGS+=-nomake examples -nomake tests \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ @@ -169,9 +171,7 @@ CONFIGURE_ARGS+=-verbose EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool -. if ${_QT_VERSION:M5*} -EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp -. elif ${_QT_VERSION:M4*} +. if ${_QT_VERSION:M4*} EXTRA_PATCHES?= ${EXTRA_PATCHES} \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h . endif @@ -297,8 +297,8 @@ _USE_QT4_ONLY= accessible assistant-adp assistantclient codecs-cn codecs-jp \ qtestlib qvfb rcc uic uic3 xmlpatterns-tool _USE_QT5_ONLY= buildtools concurrent core graphicaleffects linguisttools \ - printsupport qdbus qdoc qev qml qmldevtools quick \ - quickcontrols uitools widgets x11extras + printsupport qdbus qdoc qev qml quick \ + quickcontrols serialport uitools widgets x11extras accessible_PORT= accessibility/${_QT_RELNAME}-accessible accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so @@ -438,9 +438,6 @@ qmake_PATH= ${QMAKE} qml_PORT= lang/${_QT_RELNAME}-qml qml_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Qml.so -qmldevtools_PORT= devel/${_QT_RELNAME}-qmldevtools -qmldevtools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}QmlDevTools.a - qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer qmlviewer_PATH= ${QT_BINDIR}/qmlviewer @@ -471,6 +468,9 @@ script_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Script.so scripttools_PORT= devel/${_QT_RELNAME}-scripttools scripttools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}ScriptTools.so +serialport_PORT= comms/${_QT_RELNAME}-serialport +serialport_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}SerialPort.so + sql_PORT= databases/${_QT_RELNAME}-sql sql_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Sql.so @@ -551,7 +551,10 @@ _QT_TOOLS= # empty _QT_TOOLS+= ${QMAKE} . endif . if ${PORTNAME} != "buildtools" -_QT_TOOLS+= ${MOC} qdoc ${RCC} +_QT_TOOLS+= ${MOC} ${RCC} +. endif +. if ${PORTNAME} != "qdoc" +_QT_TOOLS+= qdoc . endif . if ${PORTNAME} != "dbus" _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp @@ -562,26 +565,39 @@ _QT_TOOLS+= ${UIC} pre-configure: qtbase-pre-configure qtbase-pre-configure: -. if ${PORTNAME} != "qmake" - @(cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}) -# @${RM} -rf ${CONFIGURE_WRKSRC}/mkspecs -# @${MKDIR} ${CONFIGURE_WRKSRC}/mkspecs -. endif . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${TRUE} . endfor +# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out +# certain paths from pkg-config calls (see the explanation in +# devel/qt5/files/patch-configure) as well as for setting +# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for +# ports/194088. +post-patch: qtbase-post-patch +qtbase-post-patch: + ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \ + ${WRKSRC}/configure + . if ${PORTNAME} != "qmake" -_QMAKE_WRKSRC= ${BUILD_WRKSRC} -QMAKE_SOURCE_PATH= ${_QMAKE_WRKSRC} _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake post-configure: qmake-configure . endif . endif # ${QT_DIST} == "base" +# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that +# requires tests/auto/cmake to be present, otherwise the configure stage will +# fail. +# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same +# time, we have to disable the check in a cache file (the only way to get this +# value through to the configure script in qtbase). +pre-configure: qt5-pre-configure +qt5-pre-configure: + ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${WRKSRC}/.qmake.cache + pre-install: qt-pre-install qt-pre-install: # Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not diff --git a/comms/qt5-serialport/Makefile b/comms/qt5-serialport/Makefile new file mode 100644 index 000000000000..55ba42ccafbd --- /dev/null +++ b/comms/qt5-serialport/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= serialport +DISTVERSION= ${QT5_VERSION} +CATEGORIES= comms +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt functions to access serial ports + +USE_QT5= core buildtools_build +QT_DIST= serialport +USES= qmake +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/comms/qt5-serialport/pkg-plist b/comms/qt5-serialport/pkg-plist new file mode 100644 index 000000000000..36e347a5705c --- /dev/null +++ b/comms/qt5-serialport/pkg-plist @@ -0,0 +1,34 @@ +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_mac_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_unix_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qlockfile_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qringbuffer_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_symbian_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_unix_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_win_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_wince_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h +%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h +%%QT_INCDIR%%/QtSerialPort/QLockFile +%%QT_INCDIR%%/QtSerialPort/QSerialPort +%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo +%%QT_INCDIR%%/QtSerialPort/QWinEventNotifier +%%QT_INCDIR%%/QtSerialPort/QtSerialPort +%%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends +%%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion +%%QT_INCDIR%%/QtSerialPort/qlockfile.h +%%QT_INCDIR%%/QtSerialPort/qserialport.h +%%QT_INCDIR%%/QtSerialPort/qserialportglobal.h +%%QT_INCDIR%%/QtSerialPort/qserialportinfo.h +%%QT_INCDIR%%/QtSerialPort/qtserialportversion.h +%%QT_INCDIR%%/QtSerialPort/qwineventnotifier.h +%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake +%%QT_LIBDIR%%/libQt5SerialPort.prl +%%QT_LIBDIR%%/libQt5SerialPort.so +%%QT_LIBDIR%%/libQt5SerialPort.so.5 +%%QT_LIBDIR%%/libQt5SerialPort.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5SerialPort.so.%%FULLVER%% +%%QT_MKSPECDIR%%/modules/qt_lib_serialport.pri +%%QT_MKSPECDIR%%/modules/qt_lib_serialport_private.pri +%%QT_LIBDIR%%data/pkgconfig/Qt5SerialPort.pc diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile index e6eb5a6bd86c..06f907b07ff0 100644 --- a/databases/qt5-sql/Makefile +++ b/databases/qt5-sql/Makefile @@ -2,7 +2,6 @@ PORTNAME= sql DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt5- diff --git a/databases/qt5-sqldrivers-odbc/Makefile b/databases/qt5-sqldrivers-odbc/Makefile index 21024bee4968..9d8472a729c0 100644 --- a/databases/qt5-sqldrivers-odbc/Makefile +++ b/databases/qt5-sqldrivers-odbc/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ COMMENT= Qt ${DB_DESC} plugin -PORTREVISION= 2 DB= ODBC DB_DESC= Open Database Connectivity diff --git a/databases/qt5-sqldrivers-sqlite2/Makefile b/databases/qt5-sqldrivers-sqlite2/Makefile index a5e3f0c25bc3..09812cbcbed1 100644 --- a/databases/qt5-sqldrivers-sqlite2/Makefile +++ b/databases/qt5-sqldrivers-sqlite2/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -PORTREVISION= 1 - DB= SQLite2 DB_DESC= SQLite 2 diff --git a/databases/qt5-sqldrivers-sqlite3/Makefile b/databases/qt5-sqldrivers-sqlite3/Makefile index 636906fbac50..3af4eb38e930 100644 --- a/databases/qt5-sqldrivers-sqlite3/Makefile +++ b/databases/qt5-sqldrivers-sqlite3/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTREVISION= 1 DB= SQLite DB_DESC= SQLite 3 diff --git a/devel/dbus-qt5/Makefile b/devel/dbus-qt5/Makefile index 03bb69df455a..505cadaee2c0 100644 --- a/devel/dbus-qt5/Makefile +++ b/devel/dbus-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile index 8d71a95e48e4..be24b9c148cd 100644 --- a/devel/qmake5/Makefile +++ b/devel/qmake5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -26,30 +25,26 @@ INSTALL_TARGET= install_qmake install_mkspecs BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -.include <bsd.port.pre.mk> - -# Needs bsd.port.pre.mk to override -dont-process from bsd.qt.mk. -CONFIGURE_ARGS+=-process - post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure - @${RM} ${WRKSRC}/mkspecs/*/*.orig - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf -# Add mkspec for Clang. - @${CP} -a ${WRKSRC}/mkspecs/freebsd-g++ \ +# Add mkspec for Clang. For now, this means adjusting the existing +# unsupported/freebsd-clang mkspec while we get it into shape upstream. + @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ ${WRKSRC}/mkspecs/freebsd-clang - @${REINPLACE_CMD} -e 's|g++|clang|g' \ - -e '/gcc-base-unix.conf/d' \ + @${REINPLACE_CMD} -e 's|(../|(|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf + @${REINPLACE_CMD} -e 's|"../|"|g' \ + ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h + @${RM} ${WRKSRC}/mkspecs/*/*.orig @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 post-build: @@ -62,4 +57,4 @@ post-build: @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ ${WRKSRC}/mkspecs/qmodule.pri -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf b/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf deleted file mode 100644 index d9e30f819903..000000000000 --- a/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf +++ /dev/null @@ -1,18 +0,0 @@ ---- ./mkspecs/common/clang-unix.conf.orig 2013-12-05 17:44:20.215196720 +0000 -+++ ./mkspecs/common/clang-unix.conf 2013-12-05 17:47:19.015202020 +0000 -@@ -0,0 +1,15 @@ -+# -+# Qmake configuration for the Clang compiler on *nix-systems -+# -+# Before making changes to this file, please read the comment in -+# gcc-base.conf, to make sure the change goes in the right place. -+# -+# To verify that your change has the desired effect on the final configuration -+# you can use the manual test in tests/manual/mkspecs. -+# -+ -+include(gcc-base-unix.conf) -+include(clang.conf) -+ -+QMAKE_LFLAGS_RELEASE += -Wl,-O1 -+QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined diff --git a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf index 871c3a63241d..ebc4e3b7f931 100644 --- a/devel/qmake5/files/patch-mkspecs__common__freebsd.conf +++ b/devel/qmake5/files/patch-mkspecs__common__freebsd.conf @@ -1,6 +1,6 @@ --- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 +++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,38 @@ +@@ -0,0 +1,30 @@ +# +# qmake configuration for FreeBSD +# @@ -12,14 +12,6 @@ + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + -+# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = $$[QT_INSTALL_HEADERS] /usr/local/include -+QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] /usr/local/lib -+QMAKE_INCDIR_X11 = /usr/local/include -+QMAKE_LIBDIR_X11 = /usr/local/lib -+QMAKE_INCDIR_OPENGL = /usr/local/include -+QMAKE_LIBDIR_OPENGL = /usr/local/lib -+ +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = diff --git a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf b/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf index 3e335d3953bb..7a1529de8699 100644 --- a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf +++ b/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf @@ -1,11 +1,16 @@ +To setup a tool, qtPrepareTool() doesn't fallback anymore (compared to Qt4) to +the build directory (/get paths), but relies instead on QT_TOOL.* variables set +before in the configure stage, which our split configuration doesn't generate. +With this patch, it's back to the previous behavior (which, by the way, has no +effect on anything but Qt builds). --- ./mkspecs/features/qt_functions.prf.orig 2013-10-22 01:49:28.000000000 -0700 +++ ./mkspecs/features/qt_functions.prf 2013-11-04 07:50:44.835414343 -0800 @@ -193,7 +193,7 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) - isEmpty($$1) { -- $$1 = $$[QT_HOST_BINS]/$$2 -+ $$1 = $$[QT_HOST_BINS/get]/$$2 - exists($$eval($$1).pl) { - $$1 = perl -w $$eval($$1).pl + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$[QT_HOST_BINS/get]/$$2 + exists($${cmd}.pl) { + cmd = perl -w $$system_path($${cmd}.pl) } else: contains(QMAKE_HOST.os, Windows) { diff --git a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf b/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf index ec7fe28649b8..ce325ed178e3 100644 --- a/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf +++ b/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf @@ -1,13 +1,12 @@ ---- ./mkspecs/freebsd-g++/qmake.conf.orig 2013-12-05 17:39:41.510199000 +0000 -+++ ./mkspecs/freebsd-g++/qmake.conf 2013-12-05 17:40:05.441200135 +0000 -@@ -2,36 +2,9 @@ +--- mkspecs/freebsd-g++/qmake.conf.orig ++++ mkspecs/freebsd-g++/qmake.conf +@@ -2,31 +2,7 @@ # qmake configuration for freebsd-g++ # -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - CONFIG += gdb_dwarf_index - +- -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -15,10 +14,6 @@ -# Addon software goes into /usr/local on the BSDs, by default we will look there -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -QMAKE_LFLAGS_THREAD = -pthread - diff --git a/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf b/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf new file mode 100644 index 000000000000..4b4eb71234ed --- /dev/null +++ b/devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf @@ -0,0 +1,37 @@ +--- mkspecs/unsupported/freebsd-clang/qmake.conf ++++ mkspecs/unsupported/freebsd-clang/qmake.conf +@@ -2,31 +2,6 @@ + # qmake configuration for freebsd-clang + # + +-MAKEFILE_GENERATOR = UNIX +-QMAKE_PLATFORM = freebsd bsd +- +-QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE +- +-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +- +-# Addon software goes into /usr/local on the BSDs, by default we will look there +-QMAKE_INCDIR = /usr/local/include +-QMAKE_LIBDIR = /usr/local/lib +- +-QMAKE_LFLAGS_THREAD = -pthread +- +-QMAKE_LIBS = +-QMAKE_LIBS_DYNLOAD = +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_OPENGL = -lGL +-QMAKE_LIBS_THREAD = +- +-QMAKE_AR = ar cqs +-QMAKE_OBJCOPY = objcopy +-QMAKE_NM = nm -P +-QMAKE_RANLIB = +- +-include(../../common/unix.conf) +-include(../../common/gcc-base-unix.conf) +-include(../../common/g++-unix.conf) +-include(../../common/clang.conf) ++include(../../common/freebsd.conf) ++include(../../common/gcc-base-unix.conf) ++include(../../common/clang.conf) diff --git a/devel/qmake5/pkg-plist b/devel/qmake5/pkg-plist index b4d98566011d..01d1efdb03a3 100644 --- a/devel/qmake5/pkg-plist +++ b/devel/qmake5/pkg-plist @@ -20,7 +20,6 @@ %%QT_MKSPECDIR%%/common/armcc.conf %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf -%%QT_MKSPECDIR%%/common/clang-unix.conf %%QT_MKSPECDIR%%/common/clang.conf %%QT_MKSPECDIR%%/common/freebsd.conf %%QT_MKSPECDIR%%/common/g++-base.conf @@ -54,7 +53,22 @@ %%QT_MKSPECDIR%%/common/unix.conf %%QT_MKSPECDIR%%/common/wince/qmake.conf %%QT_MKSPECDIR%%/common/wince/qplatformdefs.h +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_44x44.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_480x800.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_71x71.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_large.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_medium.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_small.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_splash.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_store.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_medium.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_small.png +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in %%QT_MKSPECDIR%%/common/winrt_winphone/qmake.conf +%%QT_MKSPECDIR%%/common/winrt_winphone/qplatformdefs.h %%QT_MKSPECDIR%%/cygwin-g++/qmake.conf %%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h %%QT_MKSPECDIR%%/darwin-g++/qmake.conf @@ -73,6 +87,9 @@ %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf @@ -140,8 +157,9 @@ %%QT_MKSPECDIR%%/features/mac/sdk.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf -%%QT_MKSPECDIR%%/features/opengles1.prf +%%QT_MKSPECDIR%%/features/precompile_header.prf %%QT_MKSPECDIR%%/features/qfeatures.prf +%%QT_MKSPECDIR%%/features/qlalr.prf %%QT_MKSPECDIR%%/features/qml1_module.prf %%QT_MKSPECDIR%%/features/qml1_plugin.prf %%QT_MKSPECDIR%%/features/qml_debug.prf @@ -162,6 +180,7 @@ %%QT_MKSPECDIR%%/features/qt_example_installs.prf %%QT_MKSPECDIR%%/features/qt_functions.prf %%QT_MKSPECDIR%%/features/qt_headersclean.prf +%%QT_MKSPECDIR%%/features/qt_helper_lib.prf %%QT_MKSPECDIR%%/features/qt_installs.prf %%QT_MKSPECDIR%%/features/qt_module.prf %%QT_MKSPECDIR%%/features/qt_module_headers.prf @@ -184,7 +203,6 @@ %%QT_MKSPECDIR%%/features/uic.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf %%QT_MKSPECDIR%%/features/unix/dylib.prf -%%QT_MKSPECDIR%%/features/unix/gdb_dwarf_index.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf %%QT_MKSPECDIR%%/features/unix/largefile.prf %%QT_MKSPECDIR%%/features/unix/opengl.prf @@ -208,12 +226,17 @@ %%QT_MKSPECDIR%%/features/win32/msvc_mp.prf %%QT_MKSPECDIR%%/features/win32/opengl.prf %%QT_MKSPECDIR%%/features/win32/openvg.prf +%%QT_MKSPECDIR%%/features/win32/qt_config.prf %%QT_MKSPECDIR%%/features/win32/qt_dll.prf %%QT_MKSPECDIR%%/features/win32/rtti.prf %%QT_MKSPECDIR%%/features/win32/rtti_off.prf %%QT_MKSPECDIR%%/features/win32/stl.prf %%QT_MKSPECDIR%%/features/win32/stl_off.prf +%%QT_MKSPECDIR%%/features/win32/windeployqt.prf %%QT_MKSPECDIR%%/features/win32/windows.prf +%%QT_MKSPECDIR%%/features/winrt/console.prf +%%QT_MKSPECDIR%%/features/winrt/font_deployment.prf +%%QT_MKSPECDIR%%/features/winrt/package_manifest.prf %%QT_MKSPECDIR%%/features/yacc.prf %%QT_MKSPECDIR%%/freebsd-clang/qmake.conf %%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h @@ -314,6 +337,7 @@ %%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf %%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf +%%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh @@ -331,6 +355,8 @@ %%QT_MKSPECDIR%%/qdevice.pri %%QT_MKSPECDIR%%/qfeatures.pri %%QT_MKSPECDIR%%/qmodule.pri +%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf +%%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-armv7le-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-armv7le-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf @@ -368,6 +394,8 @@ %%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qmake.conf +%%QT_MKSPECDIR%%/unsupported/linux-libc++-clang/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/nacl-g++/qmake.conf @@ -410,11 +438,21 @@ %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-arm-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winphone-arm-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winphone-arm-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winphone-arm-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-x86-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winphone-x86-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winphone-x86-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winphone-x86-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-arm-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-arm-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x64-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-x64-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x64-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-x64-msvc2013/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x86-msvc2012/qmake.conf %%QT_MKSPECDIR%%/winrt-x86-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x86-msvc2013/qmake.conf +%%QT_MKSPECDIR%%/winrt-x86-msvc2013/qplatformdefs.h diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile index d5a4af116089..c4d6c0a749f6 100644 --- a/devel/qt5-assistant/Makefile +++ b/devel/qt5-assistant/Makefile @@ -2,7 +2,6 @@ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -19,10 +18,8 @@ DESKTOP_ENTRIES="Qt 5 Assistant" "" \ "${PREFIX}/${QT_BINDIR_REL}/assistant" \ "Development;Qt;" true -# Run qmake also in help/ subdirectory to generate qt_lib_help.pri. -WRKSRC_SUBDIR= src/${PORTNAME} -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -INSTALL_WRKSRC= ${BUILD_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/images/assistant-128.png \ diff --git a/devel/qt5-assistant/files/patch-src__src.pro b/devel/qt5-assistant/files/patch-src__src.pro new file mode 100644 index 000000000000..08d7b209cf61 --- /dev/null +++ b/devel/qt5-assistant/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = assistant diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index b3bc10a56197..3eca86a53a6f 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -2,7 +2,6 @@ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index 5d8697422cfc..fc5f9fc4e925 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -2,7 +2,6 @@ PORTNAME= concurrent DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 9dcd959bfad5..03c00c459135 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp b/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp deleted file mode 100644 index 403a0dfa234b..000000000000 --- a/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- ./src/corelib/tools/qdatetime.cpp.orig 2013-10-22 01:49:27.000000000 -0700 -+++ ./src/corelib/tools/qdatetime.cpp 2013-11-04 16:56:16.155303199 -0800 -@@ -2190,6 +2190,12 @@ - long offset; - _get_timezone(&offset); - return offset; -+#elif defined(Q_OS_FREEBSD) -+ time_t t; -+ struct tm *lt; -+ (void)time(&t); -+ lt = localtime(&t); -+ return -lt->tm_gmtoff; - #else - return timezone; - #endif // Q_OS_WIN -@@ -2207,6 +2213,12 @@ - return QString::fromWCharArray(tzi.DaylightName); - else - return QString::fromWCharArray(tzi.StandardName); -+#elif defined(Q_OS_FREEBSD) -+ time_t t; -+ struct tm *lt; -+ (void)time(&t); -+ lt = localtime(&t); -+ return QString::fromLocal8Bit(lt->tm_zone); - #else - int isDst = (daylightStatus == QDateTimePrivate::DaylightTime) ? 1 : 0; - #if defined(_MSC_VER) && _MSC_VER >= 1400 diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index 5f8fc340b22f..1fb990624982 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -48,6 +48,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_win_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_winrt_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventloop_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventtransition_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfactoryloader_p.h @@ -59,6 +60,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystementry_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemmetadata_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_fsevents_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_inotify_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_kqueue_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h @@ -115,6 +117,10 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpodlist_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattribute_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsattributeprivate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsobject_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qppsobjectprivate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qprocess_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpropertyanimation_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qreadwritelock_p.h @@ -133,6 +139,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsjiscodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstatemachine_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h @@ -179,6 +186,7 @@ %%QT_INCDIR%%/QtCore/QArrayDataPointerRef %%QT_INCDIR%%/QtCore/QAssociativeIterable %%QT_INCDIR%%/QtCore/QAtomicInt +%%QT_INCDIR%%/QtCore/QAtomicInteger %%QT_INCDIR%%/QtCore/QAtomicPointer %%QT_INCDIR%%/QtCore/QBBSystemLocaleData %%QT_INCDIR%%/QtCore/QBasicMutex @@ -288,6 +296,7 @@ %%QT_INCDIR%%/QtCore/QMapNode %%QT_INCDIR%%/QtCore/QMapNodeBase %%QT_INCDIR%%/QtCore/QMargins +%%QT_INCDIR%%/QtCore/QMarginsF %%QT_INCDIR%%/QtCore/QMessageAuthenticationCode %%QT_INCDIR%%/QtCore/QMessageLogContext %%QT_INCDIR%%/QtCore/QMessageLogger @@ -365,6 +374,7 @@ %%QT_INCDIR%%/QtCore/QSharedDataPointer %%QT_INCDIR%%/QtCore/QSharedMemory %%QT_INCDIR%%/QtCore/QSharedPointer +%%QT_INCDIR%%/QtCore/QSignalBlocker %%QT_INCDIR%%/QtCore/QSignalMapper %%QT_INCDIR%%/QtCore/QSignalTransition %%QT_INCDIR%%/QtCore/QSize @@ -474,24 +484,16 @@ %%QT_INCDIR%%/QtCore/qarraydataops.h %%QT_INCDIR%%/QtCore/qarraydatapointer.h %%QT_INCDIR%%/QtCore/qatomic.h -%%QT_INCDIR%%/QtCore/qatomic_alpha.h %%QT_INCDIR%%/QtCore/qatomic_armv5.h %%QT_INCDIR%%/QtCore/qatomic_armv6.h %%QT_INCDIR%%/QtCore/qatomic_armv7.h -%%QT_INCDIR%%/QtCore/qatomic_bfin.h %%QT_INCDIR%%/QtCore/qatomic_bootstrap.h %%QT_INCDIR%%/QtCore/qatomic_cxx11.h %%QT_INCDIR%%/QtCore/qatomic_gcc.h %%QT_INCDIR%%/QtCore/qatomic_ia64.h -%%QT_INCDIR%%/QtCore/qatomic_integrity.h %%QT_INCDIR%%/QtCore/qatomic_mips.h %%QT_INCDIR%%/QtCore/qatomic_msvc.h -%%QT_INCDIR%%/QtCore/qatomic_power.h -%%QT_INCDIR%%/QtCore/qatomic_s390.h -%%QT_INCDIR%%/QtCore/qatomic_sh4a.h -%%QT_INCDIR%%/QtCore/qatomic_sparc.h %%QT_INCDIR%%/QtCore/qatomic_unix.h -%%QT_INCDIR%%/QtCore/qatomic_vxworks.h %%QT_INCDIR%%/QtCore/qatomic_x86.h %%QT_INCDIR%%/QtCore/qbasicatomic.h %%QT_INCDIR%%/QtCore/qbasictimer.h @@ -540,6 +542,7 @@ %%QT_INCDIR%%/QtCore/qfunctions_nacl.h %%QT_INCDIR%%/QtCore/qfunctions_vxworks.h %%QT_INCDIR%%/QtCore/qfunctions_wince.h +%%QT_INCDIR%%/QtCore/qfunctions_winrt.h %%QT_INCDIR%%/QtCore/qfuture.h %%QT_INCDIR%%/QtCore/qfutureinterface.h %%QT_INCDIR%%/QtCore/qfuturesynchronizer.h @@ -585,7 +588,6 @@ %%QT_INCDIR%%/QtCore/qobjectcleanuphandler.h %%QT_INCDIR%%/QtCore/qobjectdefs.h %%QT_INCDIR%%/QtCore/qobjectdefs_impl.h -%%QT_INCDIR%%/QtCore/qoldbasicatomic.h %%QT_INCDIR%%/QtCore/qpair.h %%QT_INCDIR%%/QtCore/qparallelanimationgroup.h %%QT_INCDIR%%/QtCore/qpauseanimation.h diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index ac17e17c0378..23808d7940bd 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -2,7 +2,6 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -20,14 +19,15 @@ DESKTOP_ENTRIES="Qt 5 Designer" "" \ "${PREFIX}/${QT_BINDIR_REL}/designer" \ "Development;Qt;" true -WRKSRC_SUBDIR= src/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} post-patch: @${REINPLACE_CMD} -e '/uitools/ d' \ - ${WRKSRC}/src/src.pro + ${WRKSRC}/src/${PORTNAME}/src/src.pro post-install: - ${INSTALL_DATA} ${WRKSRC}/src/designer/images/designer.png \ + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/src/designer/images/designer.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt5.png .include <bsd.port.mk> diff --git a/devel/qt5-designer/files/patch-src__src.pro b/devel/qt5-designer/files/patch-src__src.pro new file mode 100644 index 000000000000..7a6ae6e6b21a --- /dev/null +++ b/devel/qt5-designer/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = designer diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist index 51c07c455d13..e9d7eb553f0e 100644 --- a/devel/qt5-designer/pkg-plist +++ b/devel/qt5-designer/pkg-plist @@ -176,6 +176,8 @@ %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake %%QT_LIBDIR%%/libQt5Designer.prl %%QT_LIBDIR%%/libQt5Designer.so %%QT_LIBDIR%%/libQt5Designer.so.5 @@ -194,6 +196,8 @@ %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri %%QT_PLUGINDIR%%/designer/libqwebview.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug +%%QT_PLUGINDIR%%/designer/libqquickwidget.so +%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug libdata/pkgconfig/Qt5Designer.pc libdata/pkgconfig/Qt5DesignerComponents.pc share/pixmaps/designer-qt5.png diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index 53aa9f8ffc97..8d0c8d7a2399 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -2,7 +2,6 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,10 +13,7 @@ QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/assistant - -post-patch: - @${REINPLACE_CMD} -Ee 's,(clucene|assistant),,' \ - ${WRKSRC}/assistant.pro +BUILD_WRKSRC= ${WRKSRC}/src/assistant +INSTALL_WRKSRC= ${WRKSRC}/src/assistant .include <bsd.port.mk> diff --git a/devel/qt5-help/files/patch-src__assistant__assistant.pro b/devel/qt5-help/files/patch-src__assistant__assistant.pro new file mode 100644 index 000000000000..ff28ef284d97 --- /dev/null +++ b/devel/qt5-help/files/patch-src__assistant__assistant.pro @@ -0,0 +1,30 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +clucene/ is built in textproc/clucene-qt5, assistant/ is built in +devel/qt5-assistant. + +--- src/assistant/assistant.pro ++++ src/assistant/assistant.pro +@@ -1,20 +1,15 @@ + TEMPLATE = subdirs + +-SUBDIRS += clucene \ +- help \ +- assistant \ ++SUBDIRS += help \ + qhelpgenerator \ + qcollectiongenerator \ + qhelpconverter + +-help.depends = clucene +-assistant.depends = help + qhelpgenerator.depends = help + qcollectiongenerator.depends = help + qhelpconverter.depends = help + + qtNomakeTools( \ +- assistant \ + qhelpgenerator \ + qcollectiongenerator \ + qhelpconverter \ diff --git a/devel/qt5-help/files/patch-src__src.pro b/devel/qt5-help/files/patch-src__src.pro new file mode 100644 index 000000000000..08d7b209cf61 --- /dev/null +++ b/devel/qt5-help/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = assistant diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist index 1eddfebe1bf9..4215be22a677 100644 --- a/devel/qt5-help/pkg-plist +++ b/devel/qt5-help/pkg-plist @@ -36,6 +36,7 @@ %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigVersion.cmake %%QT_LIBDIR%%/libQt5Help.prl %%QT_LIBDIR%%/libQt5Help.so diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile index 357dc3ea9190..0370cae18396 100644 --- a/devel/qt5-linguist/Makefile +++ b/devel/qt5-linguist/Makefile @@ -2,7 +2,6 @@ PORTNAME= linguist DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -19,14 +18,11 @@ DESKTOP_ENTRIES="Qt 5 Linguist" "" \ "${PREFIX}/${QT_BINDIR_REL}/linguist" \ "Development;Qt;" true -WRKSRC_SUBDIR= src/${PORTNAME}/${PORTNAME} - -post-patch: - @${REINPLACE_CMD} -e '/DESTDIR/ d' \ - ${WRKSRC}/linguist.pro +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} post-install: - ${INSTALL_DATA} ${WRKSRC}/images/icons/linguist-128-32.png \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png .include <bsd.port.mk> diff --git a/devel/qt5-linguist/files/patch-src__src.pro b/devel/qt5-linguist/files/patch-src__src.pro new file mode 100644 index 000000000000..9eb0f97e1d6c --- /dev/null +++ b/devel/qt5-linguist/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = linguist diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index 9470e379dd84..9a4d7248e80c 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -8,26 +8,20 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools -USE_QT5= core qmldevtools_build xml buildtools_build +USE_QT5= core xml buildtools_build qml_build QT_DIST= tools USES= qmake -WRKSRC_SUBDIR= src/linguist +BUILD_WRKSRC= ${WRKSRC}/src/linguist +INSTALL_WRKSRC= ${WRKSRC}/src/linguist post-patch: @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ - ${WRKSRC}/linguist.pro - -pre-configure: -# Generate qt_lib_uitools.pri to fix CMake files creation. - @${REINPLACE_CMD} -e '/QT.*widgets/ d' \ - ${WRKSRC:H}/designer/src/lib/uilib/uilib.pri - @cd ${WRKSRC:H}/designer/src/uitools && \ - ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} + ${WRKSRC}/src/linguist/linguist.pro post-install: .for f in lrelease lupdate - ${INSTALL_MAN} ${WRKSRC}/${f}/${f}.1 \ + ${INSTALL_MAN} ${WRKSRC}/src/linguist/${f}/${f}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 .endfor diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile index 21d72f378613..16b420d45efc 100644 --- a/devel/qt5-qdbus/Makefile +++ b/devel/qt5-qdbus/Makefile @@ -12,6 +12,7 @@ USE_QT5= core dbus xml buildtools_build QT_DIST= tools USES= qmake -WRKSRC_SUBDIR= src/${PORTNAME}/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} .include <bsd.port.mk> diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile index 51f924e70173..2c4bf4237042 100644 --- a/devel/qt5-qdbusviewer/Makefile +++ b/devel/qt5-qdbusviewer/Makefile @@ -2,7 +2,6 @@ PORTNAME= qdbusviewer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -18,10 +17,11 @@ DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \ "${PREFIX}/${QT_BINDIR_REL}/qdbusviewer" \ "Development;Qt;" true -WRKSRC_SUBDIR= src/qdbus/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/qdbus/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} post-install: - ${INSTALL_DATA} ${WRKSRC}/images/qdbusviewer-128.png \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt5.png .include <bsd.port.mk> diff --git a/devel/qt5-qdbusviewer/files/patch-src__src.pro b/devel/qt5-qdbusviewer/files/patch-src__src.pro new file mode 100644 index 000000000000..597dab0d6d97 --- /dev/null +++ b/devel/qt5-qdbusviewer/files/patch-src__src.pro @@ -0,0 +1,44 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,3 @@ + TEMPLATE = subdirs + +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- + qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile new file mode 100644 index 000000000000..d2efed757a32 --- /dev/null +++ b/devel/qt5-qdoc/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= qdoc +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel textproc +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt documentation generator + +USE_QT5= core xml buildtools_build qmake_build +QT_DIST= base +HAS_CONFIGURE= yes +CONFIGURE_ARGS= -no-dbus -no-gui -no-xcb + +BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +PLIST_FILES= ${QT_BINDIR}/qdoc + +.include <bsd.port.mk> diff --git a/devel/qt5-qmldevtools/Makefile b/devel/qt5-qmldevtools/Makefile deleted file mode 100644 index f35f18d25e5f..000000000000 --- a/devel/qt5-qmldevtools/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= qmldevtools -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 -CATEGORIES= devel -PKGNAMEPREFIX= qt5- - -MAINTAINER= kde@FreeBSD.org -COMMENT= Qt QML development support module - -USE_QT5= core buildtools_build -QT_DIST= declarative -USES= qmake -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} - -WRKSRC_SUBDIR= src/${PORTNAME} - -post-patch: - @${REINPLACE_CMD} -e 's/no_module_headers//' \ - ${WRKSRC}/${PORTNAME}.pro - -.include <bsd.port.mk> diff --git a/devel/qt5-qmldevtools/pkg-plist b/devel/qt5-qmldevtools/pkg-plist deleted file mode 100644 index 62f9cd880a37..000000000000 --- a/devel/qt5-qmldevtools/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsast_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastfwd_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastvisitor_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsengine_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsglobal_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsgrammar_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljskeywords_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljslexer_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsmemorypool_p.h -%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsparser_p.h -%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevTools -%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsDepends -%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsVersion -%%QT_INCDIR%%/QtQmlDevTools/qtqmldevtoolsversion.h -%%QT_LIBDIR%%/libQt5QmlDevTools.a -%%QT_LIBDIR%%/libQt5QmlDevTools.prl -%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri -libdata/pkgconfig/Qt5QmlDevTools.pc diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 31db455d487b..d07a4e8f0934 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -2,7 +2,6 @@ PORTNAME= script DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +10,7 @@ COMMENT= Qt 4-compatible scripting module USE_QT5= core buildtools_build QT_DIST= ${PORTNAME} -USES= alias qmake +USES= qmake # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index ce7f924386f2..369ecd813f13 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -2,7 +2,6 @@ PORTNAME= scripttools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,6 +13,7 @@ QT_DIST= script USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index 4013af6ddcd5..466983665a55 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -2,7 +2,6 @@ PORTNAME= testlib DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index a169bc111ff8..64663ff81559 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -8,6 +8,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmetric_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkperfevents_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index 79494331749f..efb0b8674156 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -2,7 +2,6 @@ PORTNAME= uitools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,6 +13,7 @@ QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/designer/src/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/qt5-uitools/files/patch-src__designer__src__src.pro b/devel/qt5-uitools/files/patch-src__designer__src__src.pro new file mode 100644 index 000000000000..0e5f5694b57e --- /dev/null +++ b/devel/qt5-uitools/files/patch-src__designer__src__src.pro @@ -0,0 +1,27 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/designer/src/src.pro ++++ src/designer/src/src.pro +@@ -1,20 +1,4 @@ + TEMPLATE = subdirs + + SUBDIRS = \ +- uitools \ +- lib \ +- components \ +- designer +- +-contains(QT_CONFIG, shared): SUBDIRS += plugins +- +-components.depends = lib +-designer.depends = components +-plugins.depends = lib +- +-qtNomakeTools( \ +- lib \ +- components \ +- designer \ +- plugins \ +-) ++ uitools diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro new file mode 100644 index 000000000000..7a6ae6e6b21a --- /dev/null +++ b/devel/qt5-uitools/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = designer diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index a7f7373f37ce..82438149fcf6 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # empty @@ -14,8 +13,8 @@ COMMENT= Cross-platform application and UI framework (metaport) USE_QT5= clucene concurrent core dbus declarative designer \ graphicaleffects gui help imageformats multimedia \ network opengl printsupport qml quick script \ - scripttools sql svg testlib webkit widgets xml \ - xmlpatterns + scripttools serialport sql svg testlib webkit widgets x11extras \ + xml xmlpatterns NO_BUILD= yes NO_MTREE= yes @@ -29,7 +28,7 @@ SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \ TOOLS_DESC= Install Qt tools (qmake, moc, etc.) TOOLS_USE= assistant buildtools linguist linguisttools \ - pixeltool qdbus qdbusviewer qev qmake + pixeltool qdbus qdbusviewer qdoc qev qmake .for opt in ${OPTIONS_DEFINE} ${opt}_USE:= ${${opt}_USE:S/^/QT5=/} diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index cfa9050a7acb..fe4bf968495b 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,34 +1,34 @@ -SHA256 (KDE/Qt/5.2.1/qtbase-opensource-src-5.2.1.tar.xz) = acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0 -SIZE (KDE/Qt/5.2.1/qtbase-opensource-src-5.2.1.tar.xz) = 46380984 -SHA256 (KDE/Qt/5.2.1/qtdeclarative-opensource-src-5.2.1.tar.xz) = 7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690 -SIZE (KDE/Qt/5.2.1/qtdeclarative-opensource-src-5.2.1.tar.xz) = 17566720 -SHA256 (KDE/Qt/5.2.1/qtdoc-opensource-src-5.2.1.tar.xz) = 5de96af4391b60e6d771d6bc86601d4af5dd3579769cc40b6780e725deabf63e -SIZE (KDE/Qt/5.2.1/qtdoc-opensource-src-5.2.1.tar.xz) = 16619116 -SHA256 (KDE/Qt/5.2.1/qtgraphicaleffects-opensource-src-5.2.1.tar.xz) = 5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482 -SIZE (KDE/Qt/5.2.1/qtgraphicaleffects-opensource-src-5.2.1.tar.xz) = 14325888 -SHA256 (KDE/Qt/5.2.1/qtimageformats-opensource-src-5.2.1.tar.xz) = a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124 -SIZE (KDE/Qt/5.2.1/qtimageformats-opensource-src-5.2.1.tar.xz) = 1032604 -SHA256 (KDE/Qt/5.2.1/qtmultimedia-opensource-src-5.2.1.tar.xz) = 62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2 -SIZE (KDE/Qt/5.2.1/qtmultimedia-opensource-src-5.2.1.tar.xz) = 4216840 -SHA256 (KDE/Qt/5.2.1/qtquick1-opensource-src-5.2.1.tar.xz) = 8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65 -SIZE (KDE/Qt/5.2.1/qtquick1-opensource-src-5.2.1.tar.xz) = 15989344 -SHA256 (KDE/Qt/5.2.1/qtquickcontrols-opensource-src-5.2.1.tar.xz) = eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac -SIZE (KDE/Qt/5.2.1/qtquickcontrols-opensource-src-5.2.1.tar.xz) = 598328 -SHA256 (KDE/Qt/5.2.1/qtscript-opensource-src-5.2.1.tar.xz) = 6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa -SIZE (KDE/Qt/5.2.1/qtscript-opensource-src-5.2.1.tar.xz) = 2585204 -SHA256 (KDE/Qt/5.2.1/qtserialport-opensource-src-5.2.1.tar.xz) = f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347 -SIZE (KDE/Qt/5.2.1/qtserialport-opensource-src-5.2.1.tar.xz) = 252008 -SHA256 (KDE/Qt/5.2.1/qtsvg-opensource-src-5.2.1.tar.xz) = 788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef -SIZE (KDE/Qt/5.2.1/qtsvg-opensource-src-5.2.1.tar.xz) = 1762520 -SHA256 (KDE/Qt/5.2.1/qttools-opensource-src-5.2.1.tar.xz) = ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5 -SIZE (KDE/Qt/5.2.1/qttools-opensource-src-5.2.1.tar.xz) = 8945736 -SHA256 (KDE/Qt/5.2.1/qttranslations-opensource-src-5.2.1.tar.xz) = 9a93fddb9c98bd5c85c9644603f4326f4cc991004f40df5432dc811a6b59b4e6 -SIZE (KDE/Qt/5.2.1/qttranslations-opensource-src-5.2.1.tar.xz) = 999808 -SHA256 (KDE/Qt/5.2.1/qtwebkit-opensource-src-5.2.1.tar.xz) = ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c -SIZE (KDE/Qt/5.2.1/qtwebkit-opensource-src-5.2.1.tar.xz) = 32980844 -SHA256 (KDE/Qt/5.2.1/qtwebkit-examples-opensource-src-5.2.1.tar.xz) = d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5 -SIZE (KDE/Qt/5.2.1/qtwebkit-examples-opensource-src-5.2.1.tar.xz) = 3408728 -SHA256 (KDE/Qt/5.2.1/qtx11extras-opensource-src-5.2.1.tar.xz) = 4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9 -SIZE (KDE/Qt/5.2.1/qtx11extras-opensource-src-5.2.1.tar.xz) = 30152 -SHA256 (KDE/Qt/5.2.1/qtxmlpatterns-opensource-src-5.2.1.tar.xz) = bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2 -SIZE (KDE/Qt/5.2.1/qtxmlpatterns-opensource-src-5.2.1.tar.xz) = 1314292 +SHA256 (KDE/Qt/5.3.2/qtbase-opensource-src-5.3.2.tar.xz) = 9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8 +SIZE (KDE/Qt/5.3.2/qtbase-opensource-src-5.3.2.tar.xz) = 46694044 +SHA256 (KDE/Qt/5.3.2/qtdeclarative-opensource-src-5.3.2.tar.xz) = 04108193b9642c0394c157e98b5c1d81f555f9f495289e07ebfb6f03448b2382 +SIZE (KDE/Qt/5.3.2/qtdeclarative-opensource-src-5.3.2.tar.xz) = 18171760 +SHA256 (KDE/Qt/5.3.2/qtdoc-opensource-src-5.3.2.tar.xz) = 0b3453efb634d1111ad7bc963f5839fe52106b08b8afce5d0b516b88a46e509d +SIZE (KDE/Qt/5.3.2/qtdoc-opensource-src-5.3.2.tar.xz) = 16650824 +SHA256 (KDE/Qt/5.3.2/qtgraphicaleffects-opensource-src-5.3.2.tar.xz) = 688f2658a13d2919487d3f5acacb037364ee5c8fe0319f524a7d0a4987ba7ffc +SIZE (KDE/Qt/5.3.2/qtgraphicaleffects-opensource-src-5.3.2.tar.xz) = 14326148 +SHA256 (KDE/Qt/5.3.2/qtimageformats-opensource-src-5.3.2.tar.xz) = d303cbceb73774edc0cfdbde6b97b0e41077e242ff6520710890f81bea40e2d4 +SIZE (KDE/Qt/5.3.2/qtimageformats-opensource-src-5.3.2.tar.xz) = 2098004 +SHA256 (KDE/Qt/5.3.2/qtmultimedia-opensource-src-5.3.2.tar.xz) = 255fac66c93f33743c707da3d41d95c7c562924fe4eb829cbb7b21b2274a0e0b +SIZE (KDE/Qt/5.3.2/qtmultimedia-opensource-src-5.3.2.tar.xz) = 3190116 +SHA256 (KDE/Qt/5.3.2/qtquick1-opensource-src-5.3.2.tar.xz) = 9b7b2e895180e4e3e1ed4e7b5ad049b7d021a05c96be6edc5fc433c6de6273fb +SIZE (KDE/Qt/5.3.2/qtquick1-opensource-src-5.3.2.tar.xz) = 15989460 +SHA256 (KDE/Qt/5.3.2/qtquickcontrols-opensource-src-5.3.2.tar.xz) = 5f890f014d087141b0aaa8954b21b1f85740233b60a556e0e9624227bff6d94e +SIZE (KDE/Qt/5.3.2/qtquickcontrols-opensource-src-5.3.2.tar.xz) = 857000 +SHA256 (KDE/Qt/5.3.2/qtscript-opensource-src-5.3.2.tar.xz) = 6e18002c8c993402c7d28b3c0705092e41c18769b6d3ff741e9a3b3ce9d6d7be +SIZE (KDE/Qt/5.3.2/qtscript-opensource-src-5.3.2.tar.xz) = 2585704 +SHA256 (KDE/Qt/5.3.2/qtserialport-opensource-src-5.3.2.tar.xz) = a886e0cb08be60e57958676dc91c6f649468184a03c89c2aeabc904d36fd5a4b +SIZE (KDE/Qt/5.3.2/qtserialport-opensource-src-5.3.2.tar.xz) = 256448 +SHA256 (KDE/Qt/5.3.2/qtsvg-opensource-src-5.3.2.tar.xz) = 1ec5c2f307ee55740cc8c82dc2ca4037dbc0ca398b4e32abbd967535e71ae30f +SIZE (KDE/Qt/5.3.2/qtsvg-opensource-src-5.3.2.tar.xz) = 1763380 +SHA256 (KDE/Qt/5.3.2/qttools-opensource-src-5.3.2.tar.xz) = 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e +SIZE (KDE/Qt/5.3.2/qttools-opensource-src-5.3.2.tar.xz) = 8993140 +SHA256 (KDE/Qt/5.3.2/qttranslations-opensource-src-5.3.2.tar.xz) = 29b648f005e9e588714c8e3c2115db65c7a944a6ba84baafb84091d73213c5cd +SIZE (KDE/Qt/5.3.2/qttranslations-opensource-src-5.3.2.tar.xz) = 1047568 +SHA256 (KDE/Qt/5.3.2/qtwebkit-opensource-src-5.3.2.tar.xz) = e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b +SIZE (KDE/Qt/5.3.2/qtwebkit-opensource-src-5.3.2.tar.xz) = 33445540 +SHA256 (KDE/Qt/5.3.2/qtwebkit-examples-opensource-src-5.3.2.tar.xz) = c8081a0863b7d8e2e39ec0e2fe288331ddab093a682959ba7378392512296482 +SIZE (KDE/Qt/5.3.2/qtwebkit-examples-opensource-src-5.3.2.tar.xz) = 3409140 +SHA256 (KDE/Qt/5.3.2/qtx11extras-opensource-src-5.3.2.tar.xz) = ca6a28c95be0bf18080b4a20ae9e2c24a77a45aaf557f06047e65b1280c17251 +SIZE (KDE/Qt/5.3.2/qtx11extras-opensource-src-5.3.2.tar.xz) = 30032 +SHA256 (KDE/Qt/5.3.2/qtxmlpatterns-opensource-src-5.3.2.tar.xz) = acab0307039e117475caf2c95e425ead09ab5ee08ce15205fb3c0af7d7ec1abb +SIZE (KDE/Qt/5.3.2/qtxmlpatterns-opensource-src-5.3.2.tar.xz) = 1314016 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index d9ecfa5179db..820a0a76a559 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -1,5 +1,23 @@ ---- ./configure.orig 2013-10-22 01:49:15.000000000 -0700 -+++ ./configure 2013-11-04 07:23:05.115448412 -0800 +* The "build qmake" chunk is required for qtbase ports other than devel/qmake5 + to use the already built qmake instead of always building their own copy. + +* All the other chunks are part of the changes required to avoid ports/194088. + + We want to avoid passing -I${LOCALBASE}/include and -L${LOCALBASE}/lib to the + compiler since in Qt5 at least for the Qt ports themselves those parameters + will be passed before the build directories, and consequently an older + installed version will be used when building a new Qt port and cause + problems. See QTBUG-40825 for a discussion we have started upstream. + + This part of the solution comprises both filtering the output of the + pkg-config calls so it does not contain those parameters as well as + changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the + qtbase-post-patch target). It is used in the pkg-config filtering as well + as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake + uses to filter out those same paths when processing .pro files). + +--- configure ++++ configure @@ -4073,7 +4073,7 @@ } @@ -9,3 +27,164 @@ echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit +@@ -4481,8 +4481,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do + SQLITE_AUTODETECT_FAILED="no" + if [ "$CFG_SQLITE" = "system" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then +- QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` +- QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` ++ QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions` ++ QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions` + else + QT_CFLAGS_SQLITE= + QT_LFLAGS_SQLITE="-lsqlite3 -lz" +@@ -4582,8 +4582,8 @@ fi + # auto-detect libdbus-1 support + if [ "$CFG_DBUS" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then +- QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` +- QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` ++ QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions` + else + QT_LIBS_DBUS="-ldbus-1" + fi +@@ -4615,8 +4615,8 @@ fi + # auto-detect Glib support + if [ "$CFG_GLIB" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then +- QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` +- QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` ++ QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions` + fi + if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then + CFG_GLIB=yes +@@ -4638,9 +4638,9 @@ fi + # auto-detect GTK style support + if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then +- QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null` +- QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null` +- QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` ++ QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null | filterLibraryOptions` ++ QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions` + fi + if [ -n "$QT_CFLAGS_QGTK2" ] ; then + CFG_QGTKSTYLE=yes +@@ -4686,8 +4686,8 @@ fi + # Auto-detect PulseAudio support + if [ "$CFG_PULSEAUDIO" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then +- QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` +- QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` ++ QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions` + fi + if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then + CFG_PULSEAUDIO=yes +@@ -4810,10 +4810,10 @@ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + elif [ "$CFG_OPENGL" = "es2" ]; then + #OpenGL ES 2.x + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then +- QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` +- QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'` +- QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null` +- QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null` ++ QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` ++ QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | filterLibraryOptions | sed -e 's,^-L,,g' -e 's, -L, ,g'` ++ QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null | filterIncludeOptions` ++ QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null | filterLibraryOptions` + QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`" + QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBDIR_OPENGL_ES2"`" + QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`" +@@ -4842,8 +4842,8 @@ fi + # auto-detect FontConfig support + if [ "$CFG_FONTCONFIG" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then +- QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` +- QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` ++ QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions` + else + QT_CFLAGS_FONTCONFIG= + QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" +@@ -4869,8 +4869,8 @@ ORIG_CFG_KMS="$CFG_KMS" + + if [ "$CFG_LIBUDEV" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then +- QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` +- QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null` ++ QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` ++ QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterLibraryOptions` + QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV" + QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV" + fi +@@ -4958,8 +4958,8 @@ fi + + if [ "$CFG_XCB" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then +- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" +- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" ++ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`" ++ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`" + fi + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then + QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" +@@ -4978,16 +4978,16 @@ if [ "$CFG_XCB" != "no" ]; then + CFG_XCB="system" + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then + XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" +- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" +- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" ++ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`" ++ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`" + fi + + # libxcb version 1.10 was the first version that enables xcb-xkb by default, + # therefore the minimal xcb-xkb version we support is 1.10 + CFG_XKB=no + if $PKG_CONFIG --exists "xcb-xkb >= 1.10" 2>/dev/null; then +- QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`" +- QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`" ++ QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null | filterIncludeOptions`" ++ QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null | filterLibraryOptions`" + if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then + CFG_XKB=yes + fi +@@ -5040,8 +5040,8 @@ fi + + if [ "$CFG_DIRECTFB" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then +- QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` +- QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` ++ QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions` ++ QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions` + if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then + CFG_DIRECTFB=yes + elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then +@@ -5093,8 +5093,8 @@ ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON" + if [ "$CFG_XCB" != "no" ]; then + if [ "$CFG_XKBCOMMON" = "auto" ] || [ "$CFG_XKBCOMMON" = "system" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then +- QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" +- QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" ++ QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`" ++ QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`" + + QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" + QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" +@@ -5139,9 +5139,9 @@ if [ "$CFG_EGL" != "no" ]; then + fi + + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then +- QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` +- QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` +- QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` ++ QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` ++ QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions` ++ QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions` + QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" + QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" + QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" diff --git a/devel/qt5/files/extrapatch-libtool b/devel/qt5/files/extrapatch-libtool index cee41072aabf..2679a1e5c87e 100644 --- a/devel/qt5/files/extrapatch-libtool +++ b/devel/qt5/files/extrapatch-libtool @@ -1,11 +1,11 @@ --- mkspecs/features/qt_module.prf.orig +++ mkspecs/features/qt_module.prf -@@ -156,7 +156,7 @@ - } +@@ -189,7 +189,7 @@ + QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace - unix { -- CONFIG += create_libtool explicitlib -+ CONFIG += explicitlib - QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace - } + unix { +- CONFIG += create_libtool explicitlib ++ CONFIG += explicitlib + QMAKE_LIBTOOL_LIBDIR = $$qt_libdir + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace + } diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 3dfb106e9f77..576ca5476e52 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -3,7 +3,6 @@ PORTNAME= qtcreator DISTVERSION= 2.8.0 -PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ ${MASTER_SITE_QT} diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index ae2695413296..5f45fc1af6be 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -2,15 +2,16 @@ PORTNAME= imageformats DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt plugins for additional image formats -LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng \ - libtiff.so:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper \ + libmng.so:${PORTSDIR}/graphics/libmng \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libwebp.so:${PORTSDIR}/graphics/webp USE_QT5= core gui buildtools_build QT_DIST= ${PORTNAME} diff --git a/graphics/qt5-imageformats/pkg-plist b/graphics/qt5-imageformats/pkg-plist index 0d2888e65be5..ac2a4dadd995 100644 --- a/graphics/qt5-imageformats/pkg-plist +++ b/graphics/qt5-imageformats/pkg-plist @@ -1,7 +1,17 @@ +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QDDSPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QICNSPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QJp2Plugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMngPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QTgaPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QTiffPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake +%%QT_PLUGINDIR%%/imageformats/libqdds.so +%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqdds.so.debug +%%QT_PLUGINDIR%%/imageformats/libqicns.so +%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqicns.so.debug +%%QT_PLUGINDIR%%/imageformats/libqjp2.so +%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqjp2.so.debug %%QT_PLUGINDIR%%/imageformats/libqmng.so %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqmng.so.debug %%QT_PLUGINDIR%%/imageformats/libqtga.so @@ -10,3 +20,5 @@ %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqtiff.so.debug %%QT_PLUGINDIR%%/imageformats/libqwbmp.so %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqwbmp.so.debug +%%QT_PLUGINDIR%%/imageformats/libqwebp.so +%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqwebp.so.debug diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile index 35a9faf6fa2f..e8b6dee82c0e 100644 --- a/graphics/qt5-opengl/Makefile +++ b/graphics/qt5-opengl/Makefile @@ -2,7 +2,6 @@ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-opengl/pkg-plist b/graphics/qt5-opengl/pkg-plist index c2d1a663b790..9b9e16b5dd15 100644 --- a/graphics/qt5-opengl/pkg-plist +++ b/graphics/qt5-opengl/pkg-plist @@ -12,6 +12,7 @@ %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qgraphicsshadereffect_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qpaintengineex_opengl2_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qtextureglyphcache_gl_p.h +%%QT_INCDIR%%/QtOpenGL/QGL %%QT_INCDIR%%/QtOpenGL/QGLBuffer %%QT_INCDIR%%/QtOpenGL/QGLColormap %%QT_INCDIR%%/QtOpenGL/QGLContext diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile index a6017d248601..d6bced7cae9d 100644 --- a/graphics/qt5-pixeltool/Makefile +++ b/graphics/qt5-pixeltool/Makefile @@ -2,7 +2,6 @@ PORTNAME= pixeltool DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -19,10 +18,7 @@ DESKTOP_ENTRIES="Qt 5 PixelTool" "" \ "${PREFIX}/${QT_BINDIR_REL}/pixeltool" \ "Graphics;Qt;" true -WRKSRC_SUBDIR= src/${PORTNAME} - -post-patch: - @${REINPLACE_CMD} -e '/DESTDIR/ d' \ - ${WRKSRC}/pixeltool.pro +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} .include <bsd.port.mk> diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro new file mode 100644 index 000000000000..5419f8421292 --- /dev/null +++ b/graphics/qt5-pixeltool/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = pixeltool diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile index 53480b781854..85deedeeb6a2 100644 --- a/graphics/qt5-svg/Makefile +++ b/graphics/qt5-svg/Makefile @@ -2,7 +2,6 @@ PORTNAME= svg DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-svg/pkg-plist b/graphics/qt5-svg/pkg-plist index 84b7466a3224..1c8344701e0c 100644 --- a/graphics/qt5-svg/pkg-plist +++ b/graphics/qt5-svg/pkg-plist @@ -19,9 +19,10 @@ %%QT_INCDIR%%/QtSvg/qsvgwidget.h %%QT_INCDIR%%/QtSvg/qtsvgglobal.h %%QT_INCDIR%%/QtSvg/qtsvgversion.h -%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QSvgPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Svg/Qt5SvgConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Svg/Qt5SvgConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Svg/Qt5Svg_QSvgPlugin.cmake %%QT_LIBDIR%%/libQt5Svg.prl %%QT_LIBDIR%%/libQt5Svg.so %%QT_LIBDIR%%/libQt5Svg.so.5 diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile index dff964d18527..f9f495c44958 100644 --- a/lang/qt5-qml/Makefile +++ b/lang/qt5-qml/Makefile @@ -2,7 +2,6 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- @@ -14,9 +13,15 @@ QT_DIST= declarative USES= python:build qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/src +INSTALL_WRKSRC= ${WRKSRC}/src post-patch: - ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' ${WRKSRC}/../3rdparty/masm/masm.pri +# tools/tools.pro will be processed automatically unless it does not exist. + ${RM} -r ${WRKSRC}/tools + + ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \ + ${WRKSRC}/src/3rdparty/masm/masm.pri + .include <bsd.port.mk> diff --git a/lang/qt5-qml/files/patch-git_b84f08c8 b/lang/qt5-qml/files/patch-git_b84f08c8 new file mode 100644 index 000000000000..1a632b140f27 --- /dev/null +++ b/lang/qt5-qml/files/patch-git_b84f08c8 @@ -0,0 +1,23 @@ +Fixes the build with base GCC. + +commit b84f08c8b7c91a979bd74840561af2391ef20666 +Author: Lars Knoll <lars.knoll@digia.com> +Date: Tue May 6 13:30:31 2014 +0200 + + Fix compiler warning + + Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2 + Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> + +--- src/qml/jsruntime/qv4object_p.h ++++ src/qml/jsruntime/qv4object_p.h +@@ -168,7 +168,8 @@ struct Q_QML_EXPORT Object: Managed { + void defineReadonlyProperty(const StringRef name, ValueRef value); + + void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) { +- insertMember(s, Property(*v), attributes); ++ Property p(*v); ++ insertMember(s, p, attributes); + } + void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes); + diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h b/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h deleted file mode 100644 index 272340c889ee..000000000000 --- a/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./jsruntime/qv4alloca_p.h.orig 2014-02-01 20:38:02.000000000 +0000 -+++ ./jsruntime/qv4alloca_p.h 2014-02-24 08:11:34.679454851 +0000 -@@ -49,7 +49,7 @@ - # ifndef __GNUC__ - # define alloca _alloca - # endif --#else -+#elif !defined(Q_OS_FREEBSD) - # include <alloca.h> - #endif - diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp b/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp deleted file mode 100644 index c73ed5c2c07e..000000000000 --- a/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- ./jsruntime/qv4engine.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ ./jsruntime/qv4engine.cpp 2014-02-24 08:26:02.342458294 +0000 -@@ -109,7 +112,11 @@ - # else - void* stackBottom = 0; - pthread_attr_t attr; -+#if defined(Q_OS_FREEBSD) -+ pthread_attr_init(&attr); -+#else - pthread_getattr_np(pthread_self(), &attr); -+#endif - size_t stackSize = 0; - pthread_attr_getstack(&attr, &stackBottom, &stackSize); - pthread_attr_destroy(&attr); diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp b/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp deleted file mode 100644 index b31dde5e6103..000000000000 --- a/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- ./jsruntime/qv4mm.cpp.orig 2013-10-22 01:49:53.000000000 -0700 -+++ ./jsruntime/qv4mm.cpp 2013-11-06 15:34:38.035186604 -0800 -@@ -218,7 +218,11 @@ - # else - void* stackBottom = 0; - pthread_attr_t attr; -+# if OS(FREEBSD) -+ pthread_attr_init(&attr); -+# else - pthread_getattr_np(pthread_self(), &attr); -+# endif - size_t stackSize = 0; - pthread_attr_getstack(&attr, &stackBottom, &stackSize); - pthread_attr_destroy(&attr); diff --git a/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp b/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp new file mode 100644 index 000000000000..ecc5d0572282 --- /dev/null +++ b/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp @@ -0,0 +1,11 @@ +--- src/qml/jit/qv4assembler.cpp ++++ src/qml/jit/qv4assembler.cpp +@@ -96,7 +96,7 @@ QV4::ExecutableAllocator::ChunkOfPages *CompilationUnit::chunkForFunction(int fu + /* Platform/Calling convention/Architecture specific section */ + + #if CPU(X86_64) +-# if OS(LINUX) || OS(MAC_OS_X) ++# if OS(UNIX) + static const Assembler::RegisterID calleeSavedRegisters[] = { + JSC::X86Registers::ebx, + JSC::X86Registers::r12, // LocalsRegister diff --git a/lang/qt5-qml/files/patch-src__src.pro b/lang/qt5-qml/files/patch-src__src.pro new file mode 100644 index 000000000000..a8fd52f7ec42 --- /dev/null +++ b/lang/qt5-qml/files/patch-src__src.pro @@ -0,0 +1,24 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -3,18 +3,7 @@ + SUBDIRS += \ + qml + +-qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { +- SUBDIRS += \ +- quick \ +- qmltest \ +- particles +- +- qtHaveModule(widgets): SUBDIRS += quickwidgets +-} +- + SUBDIRS += \ +- plugins \ +- imports \ + qmldevtools + + qmldevtools.CONFIG = host_build diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist index 6baa5fbb776e..7d51e93f4513 100644 --- a/lang/qt5-qml/pkg-plist +++ b/lang/qt5-qml/pkg-plist @@ -2,6 +2,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qbitfield_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qcontinuinganimationgroupjob_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdebugmessageservice_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeletewatcher_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfieldlist_p.h @@ -20,6 +21,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpointervaluepair_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractexpression_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlaccessors_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmladaptormodel_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h @@ -31,15 +33,15 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbundle_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcodegenerator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontextwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserver_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserverconnection_p.h @@ -50,6 +52,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlengine_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenginecontrolservice_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenginedebugservice_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlexpression_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlextensionplugin_p.h @@ -62,7 +65,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinspectorservice_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstruction_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirbuilder_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljavascriptexpression_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsast_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastfwd_p.h @@ -92,18 +95,20 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlplatform_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpool_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofiler_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerdefinitions_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerservice_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscript_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltrace_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenotavailable_p.h @@ -123,7 +128,10 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4binop_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h @@ -155,11 +163,15 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4managed_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4math_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mathobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4memberdata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mm_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4numberobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4object_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectiterator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectproto_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4persistent_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profileradapter_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profiling_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlextensions_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h @@ -176,15 +188,14 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4ssa_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4unop_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_def_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_inl_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8debug_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8profiler_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8profilerservice_p.h %%QT_INCDIR%%/QtQml/QJSEngine %%QT_INCDIR%%/QtQml/QJSValue %%QT_INCDIR%%/QtQml/QJSValueIterator @@ -256,6 +267,10 @@ %%QT_LIBDIR%%/libQt5Qml.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5QmlDevTools.a +%%QT_LIBDIR%%/libQt5QmlDevTools.prl %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri %%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri libdata/pkgconfig/Qt5Qml.pc +libdata/pkgconfig/Qt5QmlDevTools.pc diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 6caade4a47de..b765044364e6 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,7 +2,6 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -19,17 +18,17 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= XVIDEO QT_CONFIG= xlib -OPTIONS_DEFINE= ALSA GSTREAMER OPENAL PULSEAUDIO -OPTIONS_DEFAULT=GSTREAMER -OPTIONS_SUB= yes +OPTIONS_DEFINE= AUDIOPLUGIN GSTREAMER OPENAL +OPTIONS_DEFAULT= GSTREAMER +OPTIONS_RADIO= AUDIOPLUGIN +OPTIONS_RADIO_AUDIOPLUGIN= ALSA PULSEAUDIO +OPTIONS_SUB= yes +AUDIOPLUGIN_DESC= Audio plugins to build ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib - GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -GSTREAMER_USE= GSTREAMER=yes,bad - -OPENAL_USES= openal - +GSTREAMER_USE= GSTREAMER=yes,bad +OPENAL_USES= openal PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio .include <bsd.port.options.mk> @@ -46,12 +45,10 @@ QT_CONFIG+= -alsa .if ${PORT_OPTIONS:MGSTREAMER} QT_DEFINES+= GSTREAMER QT_CONFIG+= gstreamer -PLIST_SUB+= NOGSTREAMER="@comment " .else TBR_DEPENDS+= gstreamer QT_DEFINES+= -GSTREAMER QT_CONFIG+= -gstreamer -PLIST_SUB+= NOGSTREAMER="" .endif .if ! ${PORT_OPTIONS:MOPENAL} @@ -73,13 +70,6 @@ post-patch: ${WRKSRC}/qtmultimedia.pro .endfor @${REINPLACE_CMD} -e 's|<linux/types.h>|<sys/types.h>|' \ - ${WRKSRC}/src/gsttools/qgstreamervideoinputdevicecontrol.cpp \ - ${WRKSRC}/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp \ - ${WRKSRC}/src/plugins/gstreamer/camerabin/camerabincontrol.cpp \ - ${WRKSRC}/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp \ - ${WRKSRC}/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp \ - ${WRKSRC}/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp \ - ${WRKSRC}/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp \ ${WRKSRC}/src/plugins/v4l/radio/v4lradiocontrol.h .include <bsd.port.mk> diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index cdc9f5a6f2fb..d01bcac73339 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -3,13 +3,10 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qabstractvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevicefactory_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodeviceinfo_alsa_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodeviceinfo_win32_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioinput_alsa_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioinput_win32_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiooutput_alsa_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiooutput_win32_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_backend_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstappsrc_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstbufferpoolinterface_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstcodecsinfo_p.h @@ -43,6 +40,7 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaresourceset_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaservice_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaserviceprovider_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmemoryvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsgvideonode_p.h @@ -90,6 +88,8 @@ %%QT_INCDIR%%/QtMultimedia/QCameraImageCaptureControl %%QT_INCDIR%%/QtMultimedia/QCameraImageProcessing %%QT_INCDIR%%/QtMultimedia/QCameraImageProcessingControl +%%QT_INCDIR%%/QtMultimedia/QCameraInfo +%%QT_INCDIR%%/QtMultimedia/QCameraInfoControl %%QT_INCDIR%%/QtMultimedia/QCameraLocksControl %%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettingsControl %%QT_INCDIR%%/QtMultimedia/QCameraZoomControl @@ -113,6 +113,8 @@ %%QT_INCDIR%%/QtMultimedia/QMediaResource %%QT_INCDIR%%/QtMultimedia/QMediaResourceList %%QT_INCDIR%%/QtMultimedia/QMediaService +%%QT_INCDIR%%/QtMultimedia/QMediaServiceCameraInfoInterface +%%QT_INCDIR%%/QtMultimedia/QMediaServiceDefaultDeviceInterface %%QT_INCDIR%%/QtMultimedia/QMediaServiceFeaturesInterface %%QT_INCDIR%%/QtMultimedia/QMediaServiceProviderFactoryInterface %%QT_INCDIR%%/QtMultimedia/QMediaServiceProviderHint @@ -174,6 +176,8 @@ %%QT_INCDIR%%/QtMultimedia/qcameraimagecapturecontrol.h %%QT_INCDIR%%/QtMultimedia/qcameraimageprocessing.h %%QT_INCDIR%%/QtMultimedia/qcameraimageprocessingcontrol.h +%%QT_INCDIR%%/QtMultimedia/qcamerainfo.h +%%QT_INCDIR%%/QtMultimedia/qcamerainfocontrol.h %%QT_INCDIR%%/QtMultimedia/qcameralockscontrol.h %%QT_INCDIR%%/QtMultimedia/qcameraviewfindersettingscontrol.h %%QT_INCDIR%%/QtMultimedia/qcamerazoomcontrol.h @@ -219,10 +223,21 @@ %%QT_INCDIR%%/QtMultimedia/qvideorenderercontrol.h %%QT_INCDIR%%/QtMultimedia/qvideosurfaceformat.h %%QT_INCDIR%%/QtMultimedia/qvideowindowcontrol.h +%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h +%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_I420 +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_RGB +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_Texture %%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h +%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_i420.h +%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_rgb.h +%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_texture.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qpaintervideosurface_p.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qvideowidget_p.h @@ -241,6 +256,14 @@ %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.h %%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake +%%ALSA%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QAlsaPlugin.cmake +%%NO_GSTREAMER%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake +%%GSTREAMER%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake +%%GSTREAMER%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake +%%GSTREAMER%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake +%%GSTREAMER%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake +%%PULSEAUDIO%%%%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake %%QT_LIBDIR%%/libQt5Multimedia.prl @@ -271,6 +294,8 @@ %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qtmultimediaquicktools_private.pri +%%ALSA%%%%QT_PLUGINDIR%%/audio/libqtaudio_alsa.so +%%ALSA%%%%DEBUG%%%%QT_PLUGINDIR%%/audio/libqtaudio_alsa.so.debug %%PULSEAUDIO%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so %%PULSEAUDIO%%%%DEBUG%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so.debug %%GSTREAMER%%%%QT_PLUGINDIR%%/mediaservice/libgstaudiodecoder.so @@ -281,8 +306,8 @@ %%GSTREAMER%%%%DEBUG%%%%QT_PLUGINDIR%%/mediaservice/libgstmediacapture.so.debug %%GSTREAMER%%%%QT_PLUGINDIR%%/mediaservice/libgstmediaplayer.so %%GSTREAMER%%%%DEBUG%%%%QT_PLUGINDIR%%/mediaservice/libgstmediaplayer.so.debug -%%NOGSTREAMER%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_audioengine.so -%%NOGSTREAMER%%%%DEBUG%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_audioengine.so.debug +%%NO_GSTREAMER%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_audioengine.so +%%NO_GSTREAMER%%%%DEBUG%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_audioengine.so.debug %%QT_PLUGINDIR%%/playlistformats/libqtmultimedia_m3u.so %%DEBUG%%%%QT_PLUGINDIR%%/playlistformats/libqtmultimedia_m3u.so.debug %%OPENAL%%%%QT_QMLDIR%%/QtAudioEngine/libdeclarative_audioengine.so diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index 69002bf25a8f..202dcbc7a3e1 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -2,7 +2,6 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index 02d29b3878db..8e50603fa517 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -1,4 +1,5 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractnetworkcache_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractprotocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qauthenticator_p.h @@ -14,11 +15,13 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkheader_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkreply_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkrequest_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpprotocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpsocketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpthreaddelegate_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qlocalserver_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qlocalsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnativesocketengine_winrt_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnet_unix_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessauthenticationmanager_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkaccessbackend_p.h @@ -46,6 +49,7 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qspdyprotocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificateextension_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcipher_p.h diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 24fbd4eed3dd..3bcde6896933 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -2,7 +2,6 @@ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= print PKGNAMEPREFIX= qt5- diff --git a/print/qt5-printsupport/pkg-plist b/print/qt5-printsupport/pkg-plist index 8f0e03191f5f..a843758aa30a 100644 --- a/print/qt5-printsupport/pkg-plist +++ b/print/qt5-printsupport/pkg-plist @@ -5,10 +5,13 @@ %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qpagesetupdialog_unix_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qpaintengine_alpha_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qpaintengine_preview_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprint_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprintdevice_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprintengine_pdf_p.h %%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/qpa/qplatformprintdevice.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintersupport.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintplugin.h %%QT_INCDIR%%/QtPrintSupport/QAbstractPrintDialog @@ -34,6 +37,7 @@ %%QT_INCDIR%%/QtPrintSupport/qtprintsupportversion.h %%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake %%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupportConfigVersion.cmake +%%CUPS%%%%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake %%QT_LIBDIR%%/libQt5PrintSupport.prl %%QT_LIBDIR%%/libQt5PrintSupport.so %%QT_LIBDIR%%/libQt5PrintSupport.so.5 diff --git a/textproc/clucene-qt5/Makefile b/textproc/clucene-qt5/Makefile index a031df31fd7e..eddf37b28222 100644 --- a/textproc/clucene-qt5/Makefile +++ b/textproc/clucene-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= clucene DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- @@ -14,7 +13,7 @@ QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -WRKSRC_SUBDIR= src/assistant/${PORTNAME} -PATCH_WRKSRC= ${WRKSRC:H} +BUILD_WRKSRC= ${WRKSRC}/src/assistant/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/assistant/${PORTNAME} .include <bsd.port.mk> diff --git a/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp b/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp index 239d476488bc..2047d2861f89 100644 --- a/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp +++ b/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp @@ -1,5 +1,5 @@ ---- ./3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp.orig 2012-12-18 20:04:15.000000000 +0100 -+++ ./3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp 2013-01-07 11:29:50.837339980 +0100 +--- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp ++++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp @@ -11,6 +11,8 @@ CL_NS_USE(index) CL_NS_DEF(search) diff --git a/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro b/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro new file mode 100644 index 000000000000..5defce3a9904 --- /dev/null +++ b/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro @@ -0,0 +1,28 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/assistant/assistant.pro ++++ src/assistant/assistant.pro +@@ -1,21 +1,3 @@ + TEMPLATE = subdirs + +-SUBDIRS += clucene \ +- help \ +- assistant \ +- qhelpgenerator \ +- qcollectiongenerator \ +- qhelpconverter +- +-help.depends = clucene +-assistant.depends = help +-qhelpgenerator.depends = help +-qcollectiongenerator.depends = help +-qhelpconverter.depends = help +- +-qtNomakeTools( \ +- assistant \ +- qhelpgenerator \ +- qcollectiongenerator \ +- qhelpconverter \ +-) ++SUBDIRS += clucene diff --git a/textproc/clucene-qt5/files/patch-src__src.pro b/textproc/clucene-qt5/files/patch-src__src.pro new file mode 100644 index 000000000000..08d7b209cf61 --- /dev/null +++ b/textproc/clucene-qt5/files/patch-src__src.pro @@ -0,0 +1,45 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,38 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +-# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner qtd3dservice +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- qtconfig \ +- macdeployqt \ +-) ++SUBDIRS = assistant diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile index f1b9b4cb677d..353289b12cf5 100644 --- a/textproc/qt5-xml/Makefile +++ b/textproc/qt5-xml/Makefile @@ -2,7 +2,6 @@ PORTNAME= xml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/textproc/qt5-xml/pkg-plist b/textproc/qt5-xml/pkg-plist index f7b3e3369b55..9baf75565a40 100644 --- a/textproc/qt5-xml/pkg-plist +++ b/textproc/qt5-xml/pkg-plist @@ -1,3 +1,4 @@ +%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h %%QT_INCDIR%%/QtXml/QDomAttr %%QT_INCDIR%%/QtXml/QDomCDATASection %%QT_INCDIR%%/QtXml/QDomCharacterData diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile index d5c5dea1e7c0..b7e38388f15d 100644 --- a/textproc/qt5-xmlpatterns/Makefile +++ b/textproc/qt5-xmlpatterns/Makefile @@ -2,7 +2,6 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index 7ce9946a7d92..bf01f8889207 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 5 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -26,8 +25,7 @@ USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_SQLITE= 3 USE_XORG= x11 xcomposite xrender -USES= alias bison gmake gperf perl5 pkgconfig python:build \ - qmake:outsource +USES= bison gmake gperf perl5 pkgconfig python:build qmake:outsource # Keep make(1) from descending into obj/ subdirectories during tests. CONFIGURE_ENV= MAKEOBJDIR=. # Use flex(1) from ports. diff --git a/www/webkit-qt5/pkg-plist b/www/webkit-qt5/pkg-plist index e3866a46b81e..f010156cdc69 100644 --- a/www/webkit-qt5/pkg-plist +++ b/www/webkit-qt5/pkg-plist @@ -104,6 +104,7 @@ %%QT_QMLDIR%%/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so %%QT_QMLDIR%%/QtWebKit/experimental/qmldir %%QT_QMLDIR%%/QtWebKit/libqmlwebkitplugin.so +%%QT_QMLDIR%%/QtWebKit/plugins.qmltypes %%QT_QMLDIR%%/QtWebKit/qmldir libdata/pkgconfig/Qt5WebKit.pc libdata/pkgconfig/Qt5WebKitWidgets.pc diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 775cc9471ca9..7a0065698ca2 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist index 9ef1dada9d8b..df93164aae89 100644 --- a/x11-toolkits/qt5-declarative/pkg-plist +++ b/x11-toolkits/qt5-declarative/pkg-plist @@ -215,6 +215,9 @@ %%QT_INCDIR%%/QtDeclarative/qtdeclarativeversion.h %%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5Declarative_QTcpServerConnection.cmake +%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5Declarative_QtQuick1Plugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QDeclarativeViewPlugin.cmake %%QT_LIBDIR%%/libQt5Declarative.prl %%QT_LIBDIR%%/libQt5Declarative.so %%QT_LIBDIR%%/libQt5Declarative.so.5 diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index d1f4cb7aaf4e..8f219886dacb 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,6 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 5 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- @@ -61,19 +60,8 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11 ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype .endif -# Inherited from Qt 4. CFLAGS_powerpc64= -mminimal-toc -post-patch: - @${REINPLACE_CMD} -e 's/-ldl/$$$$QMAKE_LIBS_DYNLOAD/' \ - ${WRKSRC}/src/plugins/platforms/xcb/xcb-plugin.pro - -post-configure: -.for d in ${MORE_WRKSRCS} - @cd ${WRKSRC}/${d} && \ - ${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS} -.endfor - post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2014-0190 b/x11-toolkits/qt5-gui/files/patch-CVE-2014-0190 deleted file mode 100644 index cfbbe0f755c4..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-CVE-2014-0190 +++ /dev/null @@ -1,36 +0,0 @@ -commit eb1325047f2697d24e93ebaf924900affc876bc1 -Author: Lars Knoll <lars.knoll@digia.com> -Date: Thu Apr 24 15:33:27 2014 +0200 - - Don't crash on broken GIF images - - Broken GIF images could set invalid width and height - values inside the image, leading to Qt creating a null - QImage for it. In that case we need to abort decoding - the image and return an error. - - Initial patch by Rich Moore. - - Task-number: QTBUG-38367 - Change-Id: Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e - Security-advisory: CVE-2014-0190 - Reviewed-by: Richard J. Moore <rich@kde.org> - -diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp -index eeb62af..19b8382 100644 ---- src/gui/image/qgifhandler.cpp -+++ src/gui/image/qgifhandler.cpp -@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, - memset(bits, 0, image->byteCount()); - } - -+ // Check if the previous attempt to create the image failed. If it -+ // did then the image is broken and we should give up. -+ if (image->isNull()) { -+ state = Error; -+ return -1; -+ } -+ - disposePrevious(image); - disposed = false; - diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist index 9eb0c1221a61..78e79e2471e5 100644 --- a/x11-toolkits/qt5-gui/pkg-plist +++ b/x11-toolkits/qt5-gui/pkg-plist @@ -1,3 +1,4 @@ +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractlayoutstyleinfo_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qbezier_p.h @@ -31,6 +32,7 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgifhandler_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglyphrun_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgrayraster_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgridlayoutengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qguiapplication_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qharfbuzzng_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhexstring_p.h @@ -43,6 +45,7 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qjpeghandler_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qkeymapper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qkeysequence_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qlayoutpolicy_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qmath_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qmemrotate_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qnativeimage_p.h @@ -60,6 +63,7 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglshadercache_meego_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglshadercache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltexture_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltextureblitter_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltexturecache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltextureglyphcache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltexturehelper_p.h @@ -296,6 +300,8 @@ %%QT_INCDIR%%/QtGui/QOpenGLVersionFunctions %%QT_INCDIR%%/QtGui/QOpenGLVersionProfile %%QT_INCDIR%%/QtGui/QOpenGLVertexArrayObject +%%QT_INCDIR%%/QtGui/QPageLayout +%%QT_INCDIR%%/QtGui/QPageSize %%QT_INCDIR%%/QtGui/QPagedPaintDevice %%QT_INCDIR%%/QtGui/QPaintDevice %%QT_INCDIR%%/QtGui/QPaintEngine @@ -462,6 +468,8 @@ %%QT_INCDIR%%/QtGui/qopenglversionfunctions.h %%QT_INCDIR%%/QtGui/qopenglvertexarrayobject.h %%QT_INCDIR%%/QtGui/qpagedpaintdevice.h +%%QT_INCDIR%%/QtGui/qpagelayout.h +%%QT_INCDIR%%/QtGui/qpagesize.h %%QT_INCDIR%%/QtGui/qpaintdevice.h %%QT_INCDIR%%/QtGui/qpaintengine.h %%QT_INCDIR%%/QtGui/qpainter.h @@ -517,9 +525,15 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglcompositor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformbackingstore_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcontext_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcursor_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformintegration_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformscreen_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformwindow_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardhandler_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardmanager_p.h @@ -532,6 +546,7 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbbackingstore_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbcursor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbscreen_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbvthandler_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbwindow_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfontconfigdatabase_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfontengine_coretext_p.h @@ -541,6 +556,7 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixservices_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixthemes_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qglxconvenience_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qmacmime_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h @@ -551,8 +567,10 @@ %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile index b50230d09665..938abe482746 100644 --- a/x11-toolkits/qt5-quick/Makefile +++ b/x11-toolkits/qt5-quick/Makefile @@ -2,14 +2,13 @@ PORTNAME= quick DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces -USE_QT5= core gui network qml qmldevtools_build sql testlib \ +USE_QT5= core gui network qml sql testlib \ widgets xmlpatterns buildtools_build QT_DIST= declarative USES= qmake @@ -18,18 +17,4 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge -post-patch: - @${REINPLACE_CMD} -e '/qmldevtools/ d' \ - ${WRKSRC}/src/src.pro - @${REINPLACE_CMD} -e 's/qmldevtools-private/qmldevtools-private qml-private/' \ - ${WRKSRC}/tools/qmlimportscanner/qmlimportscanner.pro - @${REINPLACE_CMD} -e 's/qmltest/qmltest quick/' \ - ${WRKSRC}/tools/qmltestrunner/qmltestrunner.pro - -post-configure: -# Disable build of QML library (we need it on configure stage to -# create a local qt_lib_qml.pri). - @${REINPLACE_CMD} -Ee 's|sub-qml-[-_0-9a-z]+||' \ - ${WRKSRC}/src/Makefile - .include <bsd.port.mk> diff --git a/x11-toolkits/qt5-quick/files/patch-src__src.pro b/x11-toolkits/qt5-quick/files/patch-src__src.pro new file mode 100644 index 000000000000..6bcdf731fb52 --- /dev/null +++ b/x11-toolkits/qt5-quick/files/patch-src__src.pro @@ -0,0 +1,22 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro ++++ src/src.pro +@@ -1,7 +1,5 @@ + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS += \ +- qml + + qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += \ +@@ -14,7 +12,4 @@ qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { + + SUBDIRS += \ + plugins \ +- imports \ +- qmldevtools +- +-qmldevtools.CONFIG = host_build ++ imports diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist index 8c22c5bb9793..2e332d9d42a3 100644 --- a/x11-toolkits/qt5-quick/pkg-plist +++ b/x11-toolkits/qt5-quick/pkg-plist @@ -64,9 +64,11 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpixmapcache_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpositioners_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpositioners_p_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickprofiler_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpropertychanges_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrectangle_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrectangle_p_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrendercontrol_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickscalegrid_p_p.h @@ -241,13 +243,23 @@ %%QT_INCDIR%%/QtQuickTest/qtquicktestversion.h %%QT_INCDIR%%/QtQuickTest/quicktest.h %%QT_INCDIR%%/QtQuickTest/quicktestglobal.h +%%QT_INCDIR%%/QtQuickWidgets/%%FULLVER%%/QtQuickWidgets/private/qquickwidget_p.h +%%QT_INCDIR%%/QtQuickWidgets/QQuickWidget +%%QT_INCDIR%%/QtQuickWidgets/QtQuickWidgets +%%QT_INCDIR%%/QtQuickWidgets/QtQuickWidgetsDepends +%%QT_INCDIR%%/QtQuickWidgets/QtQuickWidgetsVersion +%%QT_INCDIR%%/QtQuickWidgets/qquickwidget.h +%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsglobal.h +%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsversion.h %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Quick/Qt5Quick_AccessibleQuickFactory.cmake %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake +%%QT_LIBDIR%%/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake %%QT_LIBDIR%%/libQt5Quick.prl %%QT_LIBDIR%%/libQt5Quick.so %%QT_LIBDIR%%/libQt5Quick.so.5 @@ -266,6 +278,12 @@ %%QT_LIBDIR%%/libQt5QuickTest.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5QuickTest.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickTest.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5QuickWidgets.prl +%%QT_LIBDIR%%/libQt5QuickWidgets.so +%%QT_LIBDIR%%/libQt5QuickWidgets.so.5 +%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug %%QT_BINDIR%%/qml %%QT_BINDIR%%/qmlbundle %%QT_BINDIR%%/qmlimportscanner @@ -279,6 +297,8 @@ %%QT_MKSPECDIR%%/modules/qt_lib_quick.pri %%QT_MKSPECDIR%%/modules/qt_lib_quick_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickparticles_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri +%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri %%QT_PLUGINDIR%%/accessible/libqtaccessiblequick.so %%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblequick.so.debug %%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so @@ -300,41 +320,6 @@ %%DEBUG%%%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so.debug %%QT_QMLDIR%%/QtQuick.2/plugins.qmltypes %%QT_QMLDIR%%/QtQuick.2/qmldir -%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultColorDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFileDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFontDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultMessageDialog.qml -%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so.debug -%%QT_QMLDIR%%/QtQuick/Dialogs/Private/qmldir -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetColorDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFileDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFontDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetMessageDialog.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkers.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkmark.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/copy.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/critical.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/crosshairs.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/folder.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/information.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/question.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/slider_handle.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/up.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png -%%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/Button.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/CheckBox.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/EdgeFade.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/TextField.qml -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir -%%QT_QMLDIR%%/QtQuick/Dialogs/qmldir %%QT_QMLDIR%%/QtQuick/LocalStorage/libqmllocalstorageplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick/LocalStorage/libqmllocalstorageplugin.so.debug %%QT_QMLDIR%%/QtQuick/LocalStorage/plugins.qmltypes @@ -343,10 +328,6 @@ %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Particles.2/libparticlesplugin.so.debug %%QT_QMLDIR%%/QtQuick/Particles.2/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Particles.2/qmldir -%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so.debug -%%QT_QMLDIR%%/QtQuick/PrivateWidgets/plugins.qmltypes -%%QT_QMLDIR%%/QtQuick/PrivateWidgets/qmldir %%QT_QMLDIR%%/QtQuick/Window.2/libwindowplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Window.2/libwindowplugin.so.debug %%QT_QMLDIR%%/QtQuick/Window.2/plugins.qmltypes @@ -365,3 +346,4 @@ libdata/pkgconfig/Qt5Quick.pc libdata/pkgconfig/Qt5QuickParticles.pc libdata/pkgconfig/Qt5QuickTest.pc +libdata/pkgconfig/Qt5QuickWidgets.pc diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile index d4585bdb6835..145fbeb87b08 100644 --- a/x11-toolkits/qt5-quickcontrols/Makefile +++ b/x11-toolkits/qt5-quickcontrols/Makefile @@ -2,7 +2,6 @@ PORTNAME= quickcontrols DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist index 410ddfdc013f..67fa7939053e 100644 --- a/x11-toolkits/qt5-quickcontrols/pkg-plist +++ b/x11-toolkits/qt5-quickcontrols/pkg-plist @@ -1,6 +1,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/ApplicationWindow.qml %%QT_QMLDIR%%/QtQuick/Controls/BusyIndicator.qml %%QT_QMLDIR%%/QtQuick/Controls/Button.qml +%%QT_QMLDIR%%/QtQuick/Controls/Calendar.qml %%QT_QMLDIR%%/QtQuick/Controls/CheckBox.qml %%QT_QMLDIR%%/QtQuick/Controls/ComboBox.qml %%QT_QMLDIR%%/QtQuick/Controls/GroupBox.qml @@ -9,12 +10,17 @@ %%QT_QMLDIR%%/QtQuick/Controls/MenuBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/AbstractCheckable.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/BasicButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarHeaderModel.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarUtils.js %%QT_QMLDIR%%/QtQuick/Controls/Private/ColumnMenuContent.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/ContentItem.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/Control.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/FastGlow.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/FocusFrame.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/HoverButton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/MenuContentItem.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/MenuContentScroller.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/MenuItemSubControls.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/ModalPopupBehavior.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/ScrollBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/ScrollViewHelper.qml @@ -22,6 +28,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/Private/StackView.js %%QT_QMLDIR%%/QtQuick/Controls/Private/StackViewSlideDelegate.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/Style.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/SystemPaletteSingleton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TabBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewSelection.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml @@ -39,6 +46,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CalendarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml @@ -74,7 +82,9 @@ %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/focusframe.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/groupbox.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/header.png +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/leftanglearrow.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/rightanglearrow.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-transient.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-vertical.png @@ -87,6 +97,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/tab_selected.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/CalendarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qml @@ -119,10 +130,46 @@ %%QT_QMLDIR%%/QtQuick/Controls/ToolBar.qml %%QT_QMLDIR%%/QtQuick/Controls/ToolButton.qml %%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/libqqtquickcontrolsplugin.so.debug +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so.debug %%QT_QMLDIR%%/QtQuick/Controls/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/qmldir +%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultColorDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultDialogWrapper.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFileDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFontDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultMessageDialog.qml +%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so.debug +%%QT_QMLDIR%%/QtQuick/Dialogs/Private/qmldir +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetColorDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFileDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFontDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetMessageDialog.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkers.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/checkmark.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/copy.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/critical.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/crosshairs.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/folder.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/information.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/question.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/slider_handle.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/up.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png +%%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir +%%QT_QMLDIR%%/QtQuick/Dialogs/qmldir %%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so.debug %%QT_QMLDIR%%/QtQuick/Layouts/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Layouts/qmldir +%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so.debug +%%QT_QMLDIR%%/QtQuick/PrivateWidgets/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/PrivateWidgets/qmldir diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 05be26217366..74aa3349f5d2 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -2,7 +2,6 @@ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -41,12 +40,6 @@ QT_DEFINES+= -STYLE_GTK QT_CONFIG+= -gtkstyle .endif -post-configure: -.for d in ${MORE_WRKSRCS} - @cd ${WRKSRC}/${d} && \ - ${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS} -.endfor - pre-build: @cd ${WRKSRC}/src/tools/uic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist index 2689beca2fc7..5a9e49998b24 100644 --- a/x11-toolkits/qt5-widgets/pkg-plist +++ b/x11-toolkits/qt5-widgets/pkg-plist @@ -38,9 +38,11 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraph_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsanchorlayout_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicseffect_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsgridlayoutengine_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsitem_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicslayout_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicslayoutitem_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicslayoutstyleinfo_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsproxywidget_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsscene_bsp_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsscene_p.h @@ -50,7 +52,6 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicstransform_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsview_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicswidget_p.h -%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgridlayoutengine_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtk2painter_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkglobal_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkpainter_p.h @@ -74,6 +75,7 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_wince_resource_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenubar_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qopenglwidget_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapfilter_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile index 06c302b52908..c769bf53e5a9 100644 --- a/x11/qt5-qev/Makefile +++ b/x11/qt5-qev/Makefile @@ -2,7 +2,6 @@ PORTNAME= qev DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt5- @@ -15,4 +14,11 @@ USES= qmake WRKSRC_SUBDIR= src/${PORTNAME} +# qev is not connected to qttool's build system, so we cannot just run qmake +# and set {BUILD,INSTALL}_WRKSRC. +# Instead, we run qmake from src/${PORTNAME} but need to copy .qmake.conf to +# it for all required variables to be set (MODULE_VERSION etc). +post-patch: + ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} + .include <bsd.port.mk> diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile index c3f817f7ab5d..a333873bb3b7 100644 --- a/x11/qt5-x11extras/Makefile +++ b/x11/qt5-x11extras/Makefile @@ -11,5 +11,6 @@ COMMENT= Qt platform-specific features for X11-based systems USE_QT5= core gui widgets QT_DIST= x11extras USES= qmake +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> |