diff options
Diffstat (limited to 'devel')
78 files changed, 542 insertions, 263 deletions
diff --git a/devel/Makefile b/devel/Makefile index 5ffafad33fc4..c6f2a47f56cc 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -384,8 +384,6 @@ SUBDIR += dbus SUBDIR += dbus-c++ SUBDIR += dbus-glib - SUBDIR += dbus-qt4 - SUBDIR += dbus-qt5 SUBDIR += dbus-sharp SUBDIR += dbus-sharp-glib SUBDIR += dbus-tcl @@ -4941,8 +4939,6 @@ SUBDIR += qjson SUBDIR += qjson-qt5 SUBDIR += qmake - SUBDIR += qmake4 - SUBDIR += qmake5 SUBDIR += qprog SUBDIR += qross SUBDIR += qscintilla2 @@ -4954,6 +4950,7 @@ SUBDIR += qt4-assistant SUBDIR += qt4-assistant-adp SUBDIR += qt4-corelib + SUBDIR += qt4-dbus SUBDIR += qt4-designer SUBDIR += qt4-help SUBDIR += qt4-help-tools @@ -4965,6 +4962,7 @@ SUBDIR += qt4-porting SUBDIR += qt4-qdbusviewer SUBDIR += qt4-qdoc3 + SUBDIR += qt4-qmake SUBDIR += qt4-qmlviewer SUBDIR += qt4-qt3support SUBDIR += qt4-qtsolutions-singleapplication @@ -4981,6 +4979,7 @@ SUBDIR += qt5-buildtools SUBDIR += qt5-concurrent SUBDIR += qt5-core + SUBDIR += qt5-dbus SUBDIR += qt5-designer SUBDIR += qt5-help SUBDIR += qt5-linguist @@ -4990,8 +4989,10 @@ SUBDIR += qt5-qdbusviewer SUBDIR += qt5-qdoc SUBDIR += qt5-qdoc-data + SUBDIR += qt5-qmake SUBDIR += qt5-script SUBDIR += qt5-scripttools + SUBDIR += qt5-scxml SUBDIR += qt5-testlib SUBDIR += qt5-uitools SUBDIR += qtcreator diff --git a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf b/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf deleted file mode 100644 index 7a1529de8699..000000000000 --- a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf +++ /dev/null @@ -1,16 +0,0 @@ -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) { - 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/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist index 5aa468f614a3..903ead92c6c5 100644 --- a/devel/qscintilla2-qt5/pkg-plist +++ b/devel/qscintilla2-qt5/pkg-plist @@ -48,10 +48,10 @@ %%QT_INCDIR%%/Qsci/qsciscintillabase.h %%QT_INCDIR%%/Qsci/qscistyle.h %%QT_INCDIR%%/Qsci/qscistyledtext.h -lib/libqscintilla2-qt5.so -lib/libqscintilla2-qt5.so.12 -lib/libqscintilla2-qt5.so.12.0 -lib/libqscintilla2-qt5.so.12.0.1 +%%QT_LIBDIR%%/libqscintilla2-qt5.so +%%QT_LIBDIR%%/libqscintilla2-qt5.so.12 +%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0 +%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1 %%QT_MKSPECDIR%%/features/qscintilla2.prf %%QT_DATADIR%%/qsci/api/python/Python-2.4.api %%QT_DATADIR%%/qsci/api/python/Python-2.5.api diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 11c78e2adf0d..9aac27efdb0c 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -3,6 +3,7 @@ PORTNAME= assistant DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist index 310fdb6664f9..437a256f230e 100644 --- a/devel/qt4-assistant/pkg-plist +++ b/devel/qt4-assistant/pkg-plist @@ -1,3 +1,3 @@ -%%QT_BINDIR%%/assistant-qt4 -%%DEBUG%%%%QT_BINDIR%%/assistant-qt4.debug +%%QT_BINDIR%%/assistant +%%DEBUG%%%%QT_BINDIR%%/assistant.debug share/pixmaps/assistant-qt4.png diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 3654aa8e7d80..19a67730c476 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/dbus-qt4/Makefile b/devel/qt4-dbus/Makefile index 914143048977..511a01e2608a 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/qt4-dbus/Makefile @@ -3,6 +3,7 @@ PORTNAME= dbus DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/dbus-qt4/files/patch-tools__qdbus__qdbus__qdbus.cpp b/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp index eab9f93025d8..eab9f93025d8 100644 --- a/devel/dbus-qt4/files/patch-tools__qdbus__qdbus__qdbus.cpp +++ b/devel/qt4-dbus/files/patch-tools__qdbus__qdbus__qdbus.cpp diff --git a/devel/dbus-qt4/pkg-plist b/devel/qt4-dbus/pkg-plist index 5ad61d5a00c7..5ad61d5a00c7 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/qt4-dbus/pkg-plist diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index df1ebcd20d6d..f69c461ad108 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -3,6 +3,7 @@ PORTNAME= designer DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 7141e443c7c9..9b0a5e759cce 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -1,5 +1,5 @@ -%%QT_BINDIR%%/designer-qt4 -%%DEBUG%%%%QT_BINDIR%%/designer-qt4.debug +%%QT_BINDIR%%/designer +%%DEBUG%%%%QT_BINDIR%%/designer.debug %%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory %%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager %%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 8457818a4b4c..6878cb6348f3 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -3,6 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tools diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 656b85e8f174..d11f40196c83 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -3,6 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 8cbab42559a8..8b56ad01a02e 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -3,7 +3,7 @@ PORTNAME= linguist DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index 1aecb90d39b6..fa73d71daf8b 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -1,5 +1,5 @@ -%%QT_BINDIR%%/linguist-qt4 -%%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug +%%QT_BINDIR%%/linguist +%%DEBUG%%%%QT_BINDIR%%/linguist.debug share/pixmaps/linguist-qt4.png %%QT_DATADIR%%/phrasebooks/danish.qph %%QT_DATADIR%%/phrasebooks/dutch.qph diff --git a/devel/qt4-linguisttools/Makefile b/devel/qt4-linguisttools/Makefile index 6783f9c4b7b0..7b1759a07bdb 100644 --- a/devel/qt4-linguisttools/Makefile +++ b/devel/qt4-linguisttools/Makefile @@ -2,6 +2,7 @@ PORTNAME= linguisttools DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguisttools/pkg-plist b/devel/qt4-linguisttools/pkg-plist index ad92b0474b19..59775a752bc8 100644 --- a/devel/qt4-linguisttools/pkg-plist +++ b/devel/qt4-linguisttools/pkg-plist @@ -1,6 +1,6 @@ %%QT_BINDIR%%/lconvert %%DEBUG%%%%QT_BINDIR%%/lconvert.debug -%%QT_BINDIR%%/lrelease-qt4 -%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug -%%QT_BINDIR%%/lupdate-qt4 -%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug +%%QT_BINDIR%%/lrelease +%%DEBUG%%%%QT_BINDIR%%/lrelease.debug +%%QT_BINDIR%%/lupdate +%%DEBUG%%%%QT_BINDIR%%/lupdate.debug diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 3db39b2dc07b..089ccb3ce70e 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -3,6 +3,7 @@ PORTNAME= makeqpf DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-makeqpf/pkg-plist b/devel/qt4-makeqpf/pkg-plist index de9c7707e413..748aaf6e773d 100644 --- a/devel/qt4-makeqpf/pkg-plist +++ b/devel/qt4-makeqpf/pkg-plist @@ -1,2 +1,2 @@ -%%QT_BINDIR%%/makeqpf-qt4 -%%DEBUG%%%%QT_BINDIR%%/makeqpf-qt4.debug +%%QT_BINDIR%%/makeqpf +%%DEBUG%%%%QT_BINDIR%%/makeqpf.debug diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 9bd7b235370c..171a97c55462 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -3,7 +3,7 @@ PORTNAME= moc DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist index 00396d6c04f2..35e50513f114 100644 --- a/devel/qt4-moc/pkg-plist +++ b/devel/qt4-moc/pkg-plist @@ -1,2 +1,2 @@ -%%QT_BINDIR%%/moc-qt4 -%%DEBUG%%%%QT_BINDIR%%/moc-qt4.debug +%%QT_BINDIR%%/moc +%%DEBUG%%%%QT_BINDIR%%/moc.debug diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 2ac329fad989..e8d26e77f7b6 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -3,6 +3,7 @@ PORTNAME= porting DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 0ee09573f2d5..39ac7f756c11 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -3,6 +3,7 @@ PORTNAME= qdbusviewer DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index 19362dc66b88..7fcc7b5b6563 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -3,6 +3,7 @@ PORTNAME= qdoc3 DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt4- diff --git a/devel/qmake4/Makefile b/devel/qt4-qmake/Makefile index e2685b9bd133..c3e445e755d8 100644 --- a/devel/qmake4/Makefile +++ b/devel/qt4-qmake/Makefile @@ -3,6 +3,7 @@ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- @@ -72,6 +73,7 @@ do-configure: apply-slist ${LN} ${WRKSRC}/qconfig.h ${WRKSRC:H}/src/corelib/global/qconfig.h do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL} ${INSTALL_PROGRAM} ${WRKSRC}/${QMAKE:T} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL} ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} && \ cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qt4-qmake/files/Makefile.bsd index cb91e92cc078..cb91e92cc078 100644 --- a/devel/qmake4/files/Makefile.bsd +++ b/devel/qt4-qmake/files/Makefile.bsd diff --git a/devel/qmake4/files/patch-mkspecs__common__clang-unix.conf b/devel/qt4-qmake/files/patch-mkspecs__common__clang-unix.conf index 541932731d95..541932731d95 100644 --- a/devel/qmake4/files/patch-mkspecs__common__clang-unix.conf +++ b/devel/qt4-qmake/files/patch-mkspecs__common__clang-unix.conf diff --git a/devel/qmake4/files/patch-mkspecs__common__freebsd.conf b/devel/qt4-qmake/files/patch-mkspecs__common__freebsd.conf index fa941e998a9e..fa941e998a9e 100644 --- a/devel/qmake4/files/patch-mkspecs__common__freebsd.conf +++ b/devel/qt4-qmake/files/patch-mkspecs__common__freebsd.conf diff --git a/devel/qmake4/files/patch-mkspecs__freebsd-g++__qmake.conf b/devel/qt4-qmake/files/patch-mkspecs__freebsd-g++__qmake.conf index 07ff28d5f0ec..07ff28d5f0ec 100644 --- a/devel/qmake4/files/patch-mkspecs__freebsd-g++__qmake.conf +++ b/devel/qt4-qmake/files/patch-mkspecs__freebsd-g++__qmake.conf diff --git a/devel/qmake4/files/patch-option.cpp b/devel/qt4-qmake/files/patch-option.cpp index e93b6be46ec1..e93b6be46ec1 100644 --- a/devel/qmake4/files/patch-option.cpp +++ b/devel/qt4-qmake/files/patch-option.cpp diff --git a/devel/qmake4/files/qconfig.cpp.in b/devel/qt4-qmake/files/qconfig.cpp.in index b3a5b6120371..b3a5b6120371 100644 --- a/devel/qmake4/files/qconfig.cpp.in +++ b/devel/qt4-qmake/files/qconfig.cpp.in diff --git a/devel/qmake4/pkg-plist b/devel/qt4-qmake/pkg-plist index 448331c6b542..576061db7aaa 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qt4-qmake/pkg-plist @@ -1,4 +1,4 @@ -%%QT_BINDIR%%/qmake-qt4 +%%QT_BINDIR%%/qmake %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index d327d34de530..0b5432926a49 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -3,6 +3,7 @@ PORTNAME= qmlviewer DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 8a1c62109668..ea02cb76c353 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index b16f08b316d5..88c0837d78f7 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -3,6 +3,7 @@ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist index 63d627ba7965..6bef12f1184b 100644 --- a/devel/qt4-qvfb/pkg-plist +++ b/devel/qt4-qvfb/pkg-plist @@ -1,3 +1,3 @@ -%%QT_BINDIR%%/qvfb-qt4 -%%DEBUG%%%%QT_BINDIR%%/qvfb-qt4.debug +%%QT_BINDIR%%/qvfb +%%DEBUG%%%%QT_BINDIR%%/qvfb.debug share/pixmaps/qvfb-qt4.png diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index ceeedd6cb1ac..481acd220d48 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -3,6 +3,7 @@ PORTNAME= rcc DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 7b22871d4291..7cfe6b04c2f7 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -3,6 +3,7 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 693a3338dec5..40db106b71df 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -2,6 +2,7 @@ PORTNAME= scripttools DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-testlib/Makefile b/devel/qt4-testlib/Makefile index 0bc7758e1f03..55a27d64cdc3 100644 --- a/devel/qt4-testlib/Makefile +++ b/devel/qt4-testlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index bf0ebe0c6d35..06d7cd7546b3 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -3,6 +3,7 @@ PORTNAME= uic DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist index c8f620766f41..7abf8abfa789 100644 --- a/devel/qt4-uic/pkg-plist +++ b/devel/qt4-uic/pkg-plist @@ -1,2 +1,2 @@ -%%QT_BINDIR%%/uic-qt4 -%%DEBUG%%%%QT_BINDIR%%/uic-qt4.debug +%%QT_BINDIR%%/uic +%%DEBUG%%%%QT_BINDIR%%/uic.debug diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 6e75874d69a1..f32671275482 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -3,6 +3,7 @@ PORTNAME= uic3 DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt5-concurrent/pkg-plist b/devel/qt5-concurrent/pkg-plist index b96be6f3ca17..97132ebe8e24 100644 --- a/devel/qt5-concurrent/pkg-plist +++ b/devel/qt5-concurrent/pkg-plist @@ -20,8 +20,8 @@ %%QT_INCDIR%%/QtConcurrent/qtconcurrentstoredfunctioncall.h %%QT_INCDIR%%/QtConcurrent/qtconcurrentthreadengine.h %%QT_INCDIR%%/QtConcurrent/qtconcurrentversion.h -%%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Concurrent/Qt5ConcurrentConfig.cmake +%%QT_CMAKEDIR%%/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake %%QT_LIBDIR%%/libQt5Concurrent.prl %%QT_LIBDIR%%/libQt5Concurrent.so %%QT_LIBDIR%%/libQt5Concurrent.so.5 diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 61fa76aec44a..d20c921df4b6 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -22,11 +21,11 @@ HAS_CONFIGURE= yes # that need to be detected). CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ - -no-iconv -no-dbus -no-xcb -no-opengl \ + -no-iconv -no-dbus -no-opengl \ -no-alsa -no-egl -no-evdev -no-feature-concurrent \ - -no-fontconfig -no-freetype -no-gtkstyle -no-harfbuzz \ - -no-libudev -no-pulseaudio -no-xcb -no-xinput -no-xkb \ - -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-xvideo + -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ + -no-libudev -no-pulseaudio -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ + -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib diff --git a/devel/qt5-core/files/patch-git_ea9a8672 b/devel/qt5-core/files/patch-git_ea9a8672 new file mode 100644 index 000000000000..84a41fb4b33c --- /dev/null +++ b/devel/qt5-core/files/patch-git_ea9a8672 @@ -0,0 +1,25 @@ +From ea9a8672a19588e89c0bda8e0c31424687c1e05f Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Thu, 3 Nov 2016 12:14:56 -0700 +Subject: [PATCH] Fix build with ICC on macOS: <atomic> is properly supported + +I'm guess I introduced the regression in the commit +18ed6f20ad4327fa2ffbb687ac2f3ca7429c4348, which I wasn't sure about. + +Change-Id: Ic46ff326a6ba46bc877cfffd14839f84fdf796e7 +Reviewed-by: Jake Petroules <jake.petroules@qt.io> +--- src/corelib/global/qcompilerdetection.h.orig 2017-02-10 22:14:51 UTC ++++ src/corelib/global/qcompilerdetection.h +@@ -1066,12 +1066,6 @@ + # ifndef _HAS_VARIADIC_TEMPLATES + # undef Q_COMPILER_VARIADIC_TEMPLATES + # endif +-# elif defined(_LIBCPP_VERSION) +-// libc++ uses __has_feature(cxx_atomic), so disable the feature if the compiler +-// doesn't support it. That's required for the Intel compiler 14.x or earlier on OS X, for example. +-# if !__has_feature(cxx_atomic) +-# undef Q_COMPILER_ATOMICS +-# endif + # endif + # if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC) + // Apple's low-level implementation of the C++ support library diff --git a/devel/qt5-core/files/patch-src_corelib_corelib.pro b/devel/qt5-core/files/patch-src_corelib_corelib.pro new file mode 100644 index 000000000000..e24d3ff92da9 --- /dev/null +++ b/devel/qt5-core/files/patch-src_corelib_corelib.pro @@ -0,0 +1,32 @@ +As we moved the libraries of Qt5 from /usr/local/lib to /usr/local/lib/qt5 the +cmake files would get installed into /usr/local/lib/qt5/cmake. This however is +not really convenient for use with other applications depending on Qt via cmake. + +For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the +search path. This would however still break applications outside of the ports +tree that users want to compile via cmake. An other option would be to patch +devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths. + +We chose the third option. To patch qmake's internal cmake generation function +to fix up the paths so that cmake files still land in the the "correct" location +in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. + + + +--- src/corelib/corelib.pro.orig 2017-02-04 18:51:27 UTC ++++ src/corelib/corelib.pro +@@ -113,12 +113,12 @@ cmake_extras_mkspec_dir_for_install.inpu + cmake_extras_mkspec_dir_for_install.output = $$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake + + cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output $$cmake_umbrella_config_version_file.output +-cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5 ++cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5 + + QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file cmake_umbrella_config_version_file cmake_extras_mkspec_dir cmake_extras_mkspec_dir_for_install + + ctest_qt5_module_files.files += $$ctest_macros_file.output $$cmake_extras_mkspec_dir_for_install.output + +-ctest_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5Core ++ctest_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5Core + + INSTALLS += ctest_qt5_module_files cmake_qt5_umbrella_module_files diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index dd2235bb0640..56059f83e814 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -24,10 +24,10 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeuckrcodec_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_blackberry_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_cf_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h @@ -103,6 +103,7 @@ %%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/qpoll_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 @@ -176,7 +177,6 @@ %%QT_INCDIR%%/QtCore/QAtomicInt %%QT_INCDIR%%/QtCore/QAtomicInteger %%QT_INCDIR%%/QtCore/QAtomicPointer -%%QT_INCDIR%%/QtCore/QBBSystemLocaleData %%QT_INCDIR%%/QtCore/QBasicMutex %%QT_INCDIR%%/QtCore/QBasicTimer %%QT_INCDIR%%/QtCore/QBitArray @@ -197,6 +197,7 @@ %%QT_INCDIR%%/QtCore/QCollatorSortKey %%QT_INCDIR%%/QtCore/QCommandLineOption %%QT_INCDIR%%/QtCore/QCommandLineParser +%%QT_INCDIR%%/QtCore/QConstOverload %%QT_INCDIR%%/QtCore/QContiguousCache %%QT_INCDIR%%/QtCore/QContiguousCacheData %%QT_INCDIR%%/QtCore/QContiguousCacheTypedData @@ -319,6 +320,7 @@ %%QT_INCDIR%%/QtCore/QMutex %%QT_INCDIR%%/QtCore/QMutexLocker %%QT_INCDIR%%/QtCore/QNoDebug +%%QT_INCDIR%%/QtCore/QNonConstOverload %%QT_INCDIR%%/QtCore/QObject %%QT_INCDIR%%/QtCore/QObjectCleanupHandler %%QT_INCDIR%%/QtCore/QObjectData @@ -448,6 +450,8 @@ %%QT_INCDIR%%/QtCore/QXmlStreamStringRef %%QT_INCDIR%%/QtCore/QXmlStreamWriter %%QT_INCDIR%%/QtCore/Q_PID +%%QT_INCDIR%%/QtCore/Q_SECURITY_ATTRIBUTES +%%QT_INCDIR%%/QtCore/Q_STARTUPINFO %%QT_INCDIR%%/QtCore/Qt %%QT_INCDIR%%/QtCore/QtAlgorithms %%QT_INCDIR%%/QtCore/QtCleanUpFunction @@ -479,16 +483,9 @@ %%QT_INCDIR%%/QtCore/qarraydataops.h %%QT_INCDIR%%/QtCore/qarraydatapointer.h %%QT_INCDIR%%/QtCore/qatomic.h -%%QT_INCDIR%%/QtCore/qatomic_armv5.h -%%QT_INCDIR%%/QtCore/qatomic_armv6.h -%%QT_INCDIR%%/QtCore/qatomic_armv7.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_msvc.h -%%QT_INCDIR%%/QtCore/qatomic_unix.h -%%QT_INCDIR%%/QtCore/qatomic_x86.h %%QT_INCDIR%%/QtCore/qbasicatomic.h %%QT_INCDIR%%/QtCore/qbasictimer.h %%QT_INCDIR%%/QtCore/qbitarray.h @@ -563,7 +560,6 @@ %%QT_INCDIR%%/QtCore/qlinkedlist.h %%QT_INCDIR%%/QtCore/qlist.h %%QT_INCDIR%%/QtCore/qlocale.h -%%QT_INCDIR%%/QtCore/qlocale_blackberry.h %%QT_INCDIR%%/QtCore/qlockfile.h %%QT_INCDIR%%/QtCore/qlogging.h %%QT_INCDIR%%/QtCore/qloggingcategory.h @@ -660,14 +656,14 @@ %%QT_INCDIR%%/QtCore/qwaitcondition.h %%QT_INCDIR%%/QtCore/qwineventnotifier.h %%QT_INCDIR%%/QtCore/qxmlstream.h -%%QT_LIBDIR%%/cmake/Qt5/Qt5Config.cmake -%%QT_LIBDIR%%/cmake/Qt5/Qt5ConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CTestMacros.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigExtras.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreMacros.cmake +%%QT_CMAKEDIR%%/Qt5/Qt5Config.cmake +%%QT_CMAKEDIR%%/Qt5/Qt5ConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CTestMacros.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfig.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtras.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake %%QT_LIBDIR%%/libQt5Core.prl %%QT_LIBDIR%%/libQt5Core.so %%QT_LIBDIR%%/libQt5Core.so.5 @@ -677,5 +673,3 @@ %%QT_MKSPECDIR%%/modules/qt_lib_core.pri %%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri libdata/pkgconfig/Qt5Core.pc -@comment Ensure that a (even empty) qconfig-modules.h exists. -@exec touch %%QT_INCDIR%%/QtCore/qconfig-modules.h diff --git a/devel/dbus-qt5/Makefile b/devel/qt5-dbus/Makefile index 9bc93a64078f..9bc93a64078f 100644 --- a/devel/dbus-qt5/Makefile +++ b/devel/qt5-dbus/Makefile diff --git a/devel/dbus-qt5/pkg-plist b/devel/qt5-dbus/pkg-plist index 5c531f3421c2..babecffebed1 100644 --- a/devel/dbus-qt5/pkg-plist +++ b/devel/qt5-dbus/pkg-plist @@ -62,10 +62,10 @@ %%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h %%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h %%QT_INCDIR%%/QtDBus/qtdbusversion.h -%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake -%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusMacros.cmake +%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfig.cmake +%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigExtras.cmake +%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusMacros.cmake %%QT_LIBDIR%%/libQt5DBus.prl %%QT_LIBDIR%%/libQt5DBus.so %%QT_LIBDIR%%/libQt5DBus.so.5 diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist index 82bcaa412f84..328d11668782 100644 --- a/devel/qt5-designer/pkg-plist +++ b/devel/qt5-designer/pkg-plist @@ -174,10 +174,11 @@ %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsDepends %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsVersion %%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_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfig.cmake +%%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%%QT_BINDIR%%/designer %%QT_LIBDIR%%/libQt5Designer.prl %%QT_LIBDIR%%/libQt5Designer.so %%QT_LIBDIR%%/libQt5Designer.so.5 @@ -190,7 +191,6 @@ %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%%.debug -%%QT_BINDIR%%/designer %%QT_MKSPECDIR%%/modules/qt_lib_designer.pri %%QT_MKSPECDIR%%/modules/qt_lib_designer_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index daf48afb04b3..8c4fb90f4d32 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -2,7 +2,6 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-help/files/patch-src__assistant__assistant.pro b/devel/qt5-help/files/patch-src__assistant__assistant.pro index 7df0e599289f..872697f630ec 100644 --- a/devel/qt5-help/files/patch-src__assistant__assistant.pro +++ b/devel/qt5-help/files/patch-src__assistant__assistant.pro @@ -1,10 +1,9 @@ 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. +assistant/ is built in devel/qt5-assistant. ---- src/assistant/assistant.pro.orig 2016-08-31 07:07:13 UTC +--- src/assistant/assistant.pro.orig 2016-06-10 14:46:48 UTC +++ src/assistant/assistant.pro @@ -2,19 +2,16 @@ TEMPLATE = subdirs diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist index 382ab68ccc3c..6dd7b0abd93e 100644 --- a/devel/qt5-help/pkg-plist +++ b/devel/qt5-help/pkg-plist @@ -57,15 +57,16 @@ %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h %%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_CMAKEDIR%%/Qt5Help/Qt5HelpConfig.cmake +%%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigExtras.cmake +%%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigVersion.cmake %%QT_LIBDIR%%/libQt5CLucene.prl %%QT_LIBDIR%%/libQt5CLucene.so %%QT_LIBDIR%%/libQt5CLucene.so.5 %%QT_LIBDIR%%/libQt5CLucene.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri %%QT_LIBDIR%%/libQt5Help.prl %%QT_LIBDIR%%/libQt5Help.so %%QT_LIBDIR%%/libQt5Help.so.5 @@ -75,7 +76,6 @@ %%QT_BINDIR%%/qcollectiongenerator %%QT_BINDIR%%/qhelpconverter %%QT_BINDIR%%/qhelpgenerator -%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_help.pri %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri libdata/pkgconfig/Qt5Help.pc diff --git a/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro b/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro new file mode 100644 index 000000000000..df93b1d2a583 --- /dev/null +++ b/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro @@ -0,0 +1,41 @@ +As we moved the libraries of Qt5 from /usr/local/lib to /usr/local/lib/qt5 the +cmake files would get installed into /usr/local/lib/qt5/cmake. This howeever is +not really convenient for use with other applications depending on Qt via cmake. + +For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the +search path. This would however still break applications outside of the ports +tree that users want to compile via cmake. An other option would be to patch +devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths. + +We chose the third option. To patch qmake's internal cmake generation function +to fix up the paths so that cmake files still land in the the "correct" location +in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. + +--- src/linguist/linguist.pro.orig 2016-06-03 17:47:52 UTC ++++ src/linguist/linguist.pro +@@ -17,7 +17,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPa + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-!contains(CMAKE_LIB_DIR,"^\\.\\./.*") { ++!contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd { + CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) + # We need to go up another two levels because the CMake files are + # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +@@ -27,7 +27,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[Q + } + + CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { ++contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd { + CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ + CMAKE_BIN_DIR_IS_ABSOLUTE = True + } +@@ -45,6 +45,6 @@ cmake_linguist_macros_file.CONFIG = verb + QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file + + cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_config_version_file.output $$cmake_linguist_macros_file.output +-cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools ++cmake_linguist_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5LinguistTools + cmake_linguist_tools_files.CONFIG = no_check_exists + INSTALLS += cmake_linguist_tools_files diff --git a/devel/qt5-linguisttools/pkg-plist b/devel/qt5-linguisttools/pkg-plist index 30f35407bd61..6a0980d8200b 100644 --- a/devel/qt5-linguisttools/pkg-plist +++ b/devel/qt5-linguisttools/pkg-plist @@ -1,6 +1,6 @@ -%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake +%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake +%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake %%QT_BINDIR%%/lconvert %%QT_BINDIR%%/lrelease %%QT_BINDIR%%/lupdate diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist index bf3d0272f104..6915c05da48e 100644 --- a/devel/qt5-location/pkg-plist +++ b/devel/qt5-location/pkg-plist @@ -10,15 +10,17 @@ %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaneuver_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p_p.h -%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapcontroller_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p_p.h -%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapscene_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroute_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparserosrmv4_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparserosrmv5_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutereply_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouterequest_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutesegment_p.h @@ -31,6 +33,7 @@ %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapscene_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilerequestmanager_p.h @@ -190,15 +193,15 @@ %%QT_INCDIR%%/QtPositioning/qnmeapositioninfosource.h %%QT_INCDIR%%/QtPositioning/qpositioningglobal.h %%QT_INCDIR%%/QtPositioning/qtpositioningversion.h -%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake -%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake -%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake -%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake -%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake -%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfig.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake +%%QT_CMAKEDIR%%/Qt5Positioning/Qt5PositioningConfig.cmake +%%QT_CMAKEDIR%%/Qt5Positioning/Qt5PositioningConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake +%%QT_CMAKEDIR%%/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake %%QT_LIBDIR%%/libQt5Location.prl %%QT_LIBDIR%%/libQt5Location.so %%QT_LIBDIR%%/libQt5Location.so.5 diff --git a/devel/qmake5/Makefile b/devel/qt5-qmake/Makefile index 619a389e1e44..e86d084924bb 100644 --- a/devel/qmake5/Makefile +++ b/devel/qt5-qmake/Makefile @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator USE_QT5= # empty -USES= pkgconfig shebangfix +USES= compiler:c++11-lib pkgconfig shebangfix SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ src/3rdparty/freetype/src/tools/afblue.pl @@ -21,14 +20,14 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ -no-glib -no-audio-backend -no-fontconfig \ - -no-gtkstyle -no-xinput2 -no-xrender \ + -no-gtk -no-xinput2 -no-xrender \ -no-evdev -no-xkbcommon -no-alsa \ -no-freetype -no-gif -no-harfbuzz -no-libjpeg \ -no-libpng -no-pulseaudio -no-widgets # Features yet to be removed from qconfig.pri. TBR_CONFIG= concurrent|inotify|xlib QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER} -INSTALL_TARGET= install_qmake install_mkspecs +INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} @@ -36,6 +35,7 @@ post-patch: # Prevent qconfig.pri from being module dependent. @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ ${WRKSRC}/configure +# Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig post-build: diff --git a/devel/qmake5/files/patch-configure b/devel/qt5-qmake/files/patch-configure index 575912c5dad4..ab08286a75a4 100644 --- a/devel/qmake5/files/patch-configure +++ b/devel/qt5-qmake/files/patch-configure @@ -1,9 +1,6 @@ -Make sure only qmake is built, as the rest of Qt is built -in other ports. - ---- configure.orig 2016-08-24 08:18:37 UTC +--- configure.orig 2016-02-24 19:25:11 UTC +++ configure -@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then +@@ -4108,11 +4108,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" @@ -18,7 +15,7 @@ in other ports. echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then +@@ -4131,6 +4131,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then fi fi done diff --git a/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf b/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf new file mode 100644 index 000000000000..f3dee42ec3f5 --- /dev/null +++ b/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf @@ -0,0 +1,43 @@ +--- ./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,40 @@ ++# ++# qmake configuration for FreeBSD ++# ++ ++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 = %%LOCALBASE%%/include ++QMAKE_LIBDIR = %%LOCALBASE%%/lib ++ ++# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. ++QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include ++QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib ++ ++QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined ++QMAKE_LFLAGS_THREAD = -pthread ++ ++QMAKE_LIBS = ++QMAKE_LIBS_DYNLOAD = ++QMAKE_LIBS_EXECINFO = -lexecinfo ++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 = ++ ++QMAKE_STRIP = strip ++QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_INSTALL_FILE = install -m 644 -p ++QMAKE_INSTALL_PROGRAM = install -m 755 -p ++ ++include(unix.conf) diff --git a/devel/qmake5/pkg-plist b/devel/qt5-qmake/pkg-plist index b33d1a30daab..9154e3e52bd1 100644 --- a/devel/qmake5/pkg-plist +++ b/devel/qt5-qmake/pkg-plist @@ -11,10 +11,6 @@ %%QT_MKSPECDIR%%/android-clang/qplatformdefs.h %%QT_MKSPECDIR%%/android-g++/qmake.conf %%QT_MKSPECDIR%%/android-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf -%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf -%%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h %%QT_MKSPECDIR%%/common/android-base-head.conf %%QT_MKSPECDIR%%/common/android-base-tail.conf @@ -25,6 +21,7 @@ %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf %%QT_MKSPECDIR%%/common/clang.conf +%%QT_MKSPECDIR%%/common/freebsd.conf %%QT_MKSPECDIR%%/common/g++-base.conf %%QT_MKSPECDIR%%/common/g++-macx.conf %%QT_MKSPECDIR%%/common/g++-unix.conf @@ -32,6 +29,10 @@ %%QT_MKSPECDIR%%/common/gcc-base-mac.conf %%QT_MKSPECDIR%%/common/gcc-base-unix.conf %%QT_MKSPECDIR%%/common/gcc-base.conf +%%QT_MKSPECDIR%%/common/ghs-base.conf +%%QT_MKSPECDIR%%/common/ghs-integrity-armv7.conf +%%QT_MKSPECDIR%%/common/ghs-integrity-x86.conf +%%QT_MKSPECDIR%%/common/integrity/qplatformdefs.h %%QT_MKSPECDIR%%/common/ios.conf %%QT_MKSPECDIR%%/common/ios/GLES2/gl2.h %%QT_MKSPECDIR%%/common/ios/clang.conf @@ -97,10 +98,16 @@ %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-imx7-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp @@ -128,6 +135,7 @@ %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/features/android/android.prf %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf +%%QT_MKSPECDIR%%/features/android/sdk.prf %%QT_MKSPECDIR%%/features/benchmark.prf %%QT_MKSPECDIR%%/features/build_pass.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf @@ -166,11 +174,13 @@ %%QT_MKSPECDIR%%/features/link_ltcg.prf %%QT_MKSPECDIR%%/features/link_pkgconfig.prf %%QT_MKSPECDIR%%/features/ltcg.prf +%%QT_MKSPECDIR%%/features/mac/asset_catalogs.prf %%QT_MKSPECDIR%%/features/mac/default_post.prf %%QT_MKSPECDIR%%/features/mac/default_pre.prf %%QT_MKSPECDIR%%/features/mac/objective_c.prf %%QT_MKSPECDIR%%/features/mac/rez.prf %%QT_MKSPECDIR%%/features/mac/sdk.prf +%%QT_MKSPECDIR%%/features/mac/toolchain.prf %%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf @@ -222,6 +232,7 @@ %%QT_MKSPECDIR%%/features/testcase_targets.prf %%QT_MKSPECDIR%%/features/testcocoon.prf %%QT_MKSPECDIR%%/features/testlib_defines.prf +%%QT_MKSPECDIR%%/features/toolchain.prf %%QT_MKSPECDIR%%/features/uic.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf @@ -284,6 +295,12 @@ %%QT_MKSPECDIR%%/hpuxi-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/hurd-g++/qmake.conf %%QT_MKSPECDIR%%/hurd-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/integrity-armv7-imx6/qmake.conf +%%QT_MKSPECDIR%%/integrity-armv7-imx6/qplatformdefs.h +%%QT_MKSPECDIR%%/integrity-armv7/qmake.conf +%%QT_MKSPECDIR%%/integrity-armv7/qplatformdefs.h +%%QT_MKSPECDIR%%/integrity-x86/qmake.conf +%%QT_MKSPECDIR%%/integrity-x86/qplatformdefs.h %%QT_MKSPECDIR%%/irix-cc-64/qmake.conf %%QT_MKSPECDIR%%/irix-cc-64/qplatformdefs.h %%QT_MKSPECDIR%%/irix-cc/qmake.conf @@ -395,6 +412,7 @@ %%QT_MKSPECDIR%%/qconfig.pri %%QT_MKSPECDIR%%/qdevice.pri %%QT_MKSPECDIR%%/qfeatures.pri +%%QT_MKSPECDIR%%/qhost.pri %%QT_MKSPECDIR%%/qmodule.pri %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qplatformdefs.h @@ -428,9 +446,6 @@ %%QT_MKSPECDIR%%/unixware-cc/qplatformdefs.h %%QT_MKSPECDIR%%/unixware-g++/qmake.conf %%QT_MKSPECDIR%%/unixware-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp -%%QT_MKSPECDIR%%/unsupported/android-g++/qmake.conf -%%QT_MKSPECDIR%%/unsupported/android-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf @@ -449,6 +464,8 @@ %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/win32-clang-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/win32-clang-msvc2015/qplatformdefs.h %%QT_MKSPECDIR%%/win32-g++/qmake.conf %%QT_MKSPECDIR%%/win32-g++/qplatformdefs.h %%QT_MKSPECDIR%%/win32-icc/qmake.conf diff --git a/devel/qt5-script/pkg-plist b/devel/qt5-script/pkg-plist index 8ca2a8fd5a1b..afc74c4377fd 100644 --- a/devel/qt5-script/pkg-plist +++ b/devel/qt5-script/pkg-plist @@ -56,8 +56,8 @@ %%QT_INCDIR%%/QtScript/qscriptvalueiterator.h %%QT_INCDIR%%/QtScript/qtscriptglobal.h %%QT_INCDIR%%/QtScript/qtscriptversion.h -%%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Script/Qt5ScriptConfig.cmake +%%QT_CMAKEDIR%%/Qt5Script/Qt5ScriptConfigVersion.cmake %%QT_LIBDIR%%/libQt5Script.prl %%QT_LIBDIR%%/libQt5Script.so %%QT_LIBDIR%%/libQt5Script.so.5 diff --git a/devel/qt5-scripttools/pkg-plist b/devel/qt5-scripttools/pkg-plist index 90f7548042ae..69a8435a2e06 100644 --- a/devel/qt5-scripttools/pkg-plist +++ b/devel/qt5-scripttools/pkg-plist @@ -88,8 +88,8 @@ %%QT_INCDIR%%/QtScriptTools/QtScriptToolsVersion %%QT_INCDIR%%/QtScriptTools/qscriptenginedebugger.h %%QT_INCDIR%%/QtScriptTools/qtscripttoolsversion.h -%%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake +%%QT_CMAKEDIR%%/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake %%QT_LIBDIR%%/libQt5ScriptTools.prl %%QT_LIBDIR%%/libQt5ScriptTools.so %%QT_LIBDIR%%/libQt5ScriptTools.so.5 diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile new file mode 100644 index 000000000000..6b5bac09bb0b --- /dev/null +++ b/devel/qt5-scxml/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= scxml +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt5 SXCML module + +USE_QT5= core network qml buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/devel/qt5-scxml/pkg-plist b/devel/qt5-scxml/pkg-plist new file mode 100644 index 000000000000..0001d9e87913 --- /dev/null +++ b/devel/qt5-scxml/pkg-plist @@ -0,0 +1,63 @@ +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlcppdatamodel_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmldatamodel_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlecmascriptplatformproperties_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlevent_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlexecutablecontent_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlglobals_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlparser_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlqstates_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachine_p.h +%%QT_INCDIR%%/QtScxml/QScxmlBaseTransition +%%QT_INCDIR%%/QtScxml/QScxmlCppDataModel +%%QT_INCDIR%%/QtScxml/QScxmlDataModel +%%QT_INCDIR%%/QtScxml/QScxmlEcmaScriptDataModel +%%QT_INCDIR%%/QtScxml/QScxmlError +%%QT_INCDIR%%/QtScxml/QScxmlEvent +%%QT_INCDIR%%/QtScxml/QScxmlEventFilter +%%QT_INCDIR%%/QtScxml/QScxmlFinalState +%%QT_INCDIR%%/QtScxml/QScxmlHistoryState +%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxml +%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxmlServiceFactory +%%QT_INCDIR%%/QtScxml/QScxmlInvokableService +%%QT_INCDIR%%/QtScxml/QScxmlInvokableServiceFactory +%%QT_INCDIR%%/QtScxml/QScxmlInvokeScxmlFactory +%%QT_INCDIR%%/QtScxml/QScxmlNullDataModel +%%QT_INCDIR%%/QtScxml/QScxmlParser +%%QT_INCDIR%%/QtScxml/QScxmlState +%%QT_INCDIR%%/QtScxml/QScxmlStateMachine +%%QT_INCDIR%%/QtScxml/QScxmlTableData +%%QT_INCDIR%%/QtScxml/QScxmlTransition +%%QT_INCDIR%%/QtScxml/QtScxml +%%QT_INCDIR%%/QtScxml/QtScxmlDepends +%%QT_INCDIR%%/QtScxml/QtScxmlVersion +%%QT_INCDIR%%/QtScxml/qscxmlcppdatamodel.h +%%QT_INCDIR%%/QtScxml/qscxmldatamodel.h +%%QT_INCDIR%%/QtScxml/qscxmlecmascriptdatamodel.h +%%QT_INCDIR%%/QtScxml/qscxmlerror.h +%%QT_INCDIR%%/QtScxml/qscxmlevent.h +%%QT_INCDIR%%/QtScxml/qscxmlexecutablecontent.h +%%QT_INCDIR%%/QtScxml/qscxmlglobals.h +%%QT_INCDIR%%/QtScxml/qscxmlinvokableservice.h +%%QT_INCDIR%%/QtScxml/qscxmlnulldatamodel.h +%%QT_INCDIR%%/QtScxml/qscxmlparser.h +%%QT_INCDIR%%/QtScxml/qscxmlqstates.h +%%QT_INCDIR%%/QtScxml/qscxmlstatemachine.h +%%QT_INCDIR%%/QtScxml/qscxmltabledata.h +%%QT_INCDIR%%/QtScxml/qtscxmlversion.h +%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfig.cmake +%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake +%%QT_BINDIR%%/qscxmlc +%%QT_LIBDIR%%/libQt5Scxml.prl +%%QT_LIBDIR%%/libQt5Scxml.so +%%QT_LIBDIR%%/libQt5Scxml.so.5 +%%QT_LIBDIR%%/libQt5Scxml.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Scxml.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Scxml.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/features/qscxmlc.prf +%%QT_MKSPECDIR%%/modules/qt_lib_scxml.pri +%%QT_MKSPECDIR%%/modules/qt_lib_scxml_private.pri +%%QT_QMLDIR%%/QtScxml/libdeclarative_scxml.so +%%DEBUG%%%%QT_QMLDIR%%/QtScxml/libdeclarative_scxml.so.debug +%%QT_QMLDIR%%/QtScxml/plugins.qmltypes +%%QT_QMLDIR%%/QtScxml/qmldir +libdata/pkgconfig/Qt5Scxml.pc diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index c08937ea305a..c912eddd7884 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -11,6 +11,7 @@ %%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/qteamcitylogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h @@ -62,9 +63,9 @@ %%QT_INCDIR%%/QtTest/qtestsystem.h %%QT_INCDIR%%/QtTest/qtesttouch.h %%QT_INCDIR%%/QtTest/qttestversion.h -%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigExtras.cmake -%%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfig.cmake +%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfigExtras.cmake +%%QT_CMAKEDIR%%/Qt5Test/Qt5TestConfigVersion.cmake %%QT_LIBDIR%%/libQt5Test.prl %%QT_LIBDIR%%/libQt5Test.so %%QT_LIBDIR%%/libQt5Test.so.5 diff --git a/devel/qt5-uitools/pkg-plist b/devel/qt5-uitools/pkg-plist index b557f0c30b97..52afbcc3ce37 100644 --- a/devel/qt5-uitools/pkg-plist +++ b/devel/qt5-uitools/pkg-plist @@ -5,8 +5,8 @@ %%QT_INCDIR%%/QtUiTools/QtUiToolsVersion %%QT_INCDIR%%/QtUiTools/qtuitoolsversion.h %%QT_INCDIR%%/QtUiTools/quiloader.h -%%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5UiTools/Qt5UiToolsConfig.cmake +%%QT_CMAKEDIR%%/Qt5UiTools/Qt5UiToolsConfigVersion.cmake %%QT_LIBDIR%%/libQt5UiTools.a %%QT_LIBDIR%%/libQt5UiTools.prl %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers index 6da175cbc77a..ecb1c2b07c78 100644 --- a/devel/qt5/Makefile.sqldrivers +++ b/devel/qt5/Makefile.sqldrivers @@ -16,7 +16,7 @@ CONFIGURE_ARGS+=-no-gui -no-xcb BUILD_WRKSRC?= ${WRKSRC}/src/plugins/sqldrivers/${DB:tl} INSTALL_WRKSRC?=${BUILD_WRKSRC} -PLIST_FILES+= ${QT_LIBDIR_REL}/cmake/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \ +PLIST_FILES+= ${QT_CMAKEDIR_REL}/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \ ${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \ %%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index 12d804bd0b41..808700ede7c7 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,45 +1,59 @@ -TIMESTAMP = 1476003740 -SHA256 (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 -SIZE (KDE/Qt/5.6.2/qt3d-opensource-src-5.6.2.tar.xz) = 19763124 -SHA256 (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 -SIZE (KDE/Qt/5.6.2/qtbase-opensource-src-5.6.2.tar.xz) = 46825164 -SHA256 (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad -SIZE (KDE/Qt/5.6.2/qtcanvas3d-opensource-src-5.6.2.tar.xz) = 10836672 -SHA256 (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 -SIZE (KDE/Qt/5.6.2/qtconnectivity-opensource-src-5.6.2.tar.xz) = 2639772 -SHA256 (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da -SIZE (KDE/Qt/5.6.2/qtdeclarative-opensource-src-5.6.2.tar.xz) = 18813016 -SHA256 (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e -SIZE (KDE/Qt/5.6.2/qtgraphicaleffects-opensource-src-5.6.2.tar.xz) = 14751100 -SHA256 (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 -SIZE (KDE/Qt/5.6.2/qtimageformats-opensource-src-5.6.2.tar.xz) = 1909556 -SHA256 (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a -SIZE (KDE/Qt/5.6.2/qtlocation-opensource-src-5.6.2.tar.xz) = 3148448 -SHA256 (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf -SIZE (KDE/Qt/5.6.2/qtmultimedia-opensource-src-5.6.2.tar.xz) = 3492628 -SHA256 (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c -SIZE (KDE/Qt/5.6.2/qtquickcontrols-opensource-src-5.6.2.tar.xz) = 5952696 -SHA256 (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 -SIZE (KDE/Qt/5.6.2/qtquickcontrols2-opensource-src-5.6.2.tar.xz) = 882160 -SHA256 (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e -SIZE (KDE/Qt/5.6.2/qtscript-opensource-src-5.6.2.tar.xz) = 2587484 -SHA256 (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 -SIZE (KDE/Qt/5.6.2/qtsensors-opensource-src-5.6.2.tar.xz) = 1973888 -SHA256 (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 -SIZE (KDE/Qt/5.6.2/qtserialbus-opensource-src-5.6.2.tar.xz) = 234612 -SHA256 (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 -SIZE (KDE/Qt/5.6.2/qtserialport-opensource-src-5.6.2.tar.xz) = 256852 -SHA256 (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e -SIZE (KDE/Qt/5.6.2/qtsvg-opensource-src-5.6.2.tar.xz) = 1723056 -SHA256 (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 -SIZE (KDE/Qt/5.6.2/qttools-opensource-src-5.6.2.tar.xz) = 9794512 -SHA256 (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421 -SIZE (KDE/Qt/5.6.2/qttranslations-opensource-src-5.6.2.tar.xz) = 1204148 -SHA256 (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 -SIZE (KDE/Qt/5.6.2/qtwebchannel-opensource-src-5.6.2.tar.xz) = 119792 -SHA256 (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 -SIZE (KDE/Qt/5.6.2/qtwebsockets-opensource-src-5.6.2.tar.xz) = 171004 -SHA256 (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced -SIZE (KDE/Qt/5.6.2/qtx11extras-opensource-src-5.6.2.tar.xz) = 33640 -SHA256 (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc -SIZE (KDE/Qt/5.6.2/qtxmlpatterns-opensource-src-5.6.2.tar.xz) = 1323576 +TIMESTAMP = 1484477552 +SHA256 (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea +SIZE (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 19474848 +SHA256 (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e +SIZE (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = 44992616 +SHA256 (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 +SIZE (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = 10851540 +SHA256 (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 +SIZE (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 4086256 +SHA256 (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 +SIZE (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = 2690688 +SHA256 (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 +SIZE (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 5155740 +SHA256 (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 +SIZE (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = 18976920 +SHA256 (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f +SIZE (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 74340 +SHA256 (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 +SIZE (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = 360940 +SHA256 (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 +SIZE (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 14486948 +SHA256 (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 +SIZE (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 2004376 +SHA256 (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f +SIZE (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = 3194112 +SHA256 (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def +SIZE (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = 3563676 +SHA256 (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d +SIZE (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 5943024 +SHA256 (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec +SIZE (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = 2212812 +SHA256 (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 +SIZE (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 2608180 +SHA256 (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c +SIZE (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 346948 +SHA256 (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 +SIZE (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = 1987144 +SHA256 (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 +SIZE (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 239676 +SHA256 (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 +SIZE (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 265616 +SHA256 (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 +SIZE (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = 1751536 +SHA256 (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac +SIZE (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 10011108 +SHA256 (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 +SIZE (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 1206116 +SHA256 (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add +SIZE (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = 10014088 +SHA256 (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b +SIZE (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 122436 +SHA256 (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 +SIZE (KDE/Qt/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz) = 35298736 +SHA256 (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 +SIZE (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 193204 +SHA256 (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 5f5a0c2cc66ec01c2f2f31eff32fea26bd0bc03741a5dfd803b13870aa4ce427 +SIZE (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 59656 +SHA256 (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 +SIZE (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = 1352472 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index ed22a32567e4..46515d852348 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -16,9 +16,9 @@ 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.orig 2015-03-16 17:16:10.000000000 +0100 -+++ configure 2015-05-01 09:35:38.595937000 +0200 -@@ -3853,7 +3853,7 @@ +--- configure.orig 2015-03-16 17:16:10.000000000 +0100 ++++ configure 2016-04-18 12:35:38.595937000 +0200 +@@ -3878,7 +3878,7 @@ } # build qmake @@ -27,7 +27,7 @@ echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit -@@ -4777,8 +4777,8 @@ +@@ -5045,8 +5045,8 @@ SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then @@ -38,9 +38,9 @@ else QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE="-lsqlite3 -lz" -@@ -4881,8 +4881,8 @@ - fi - if [ "$CFG_DBUS" = "linked" ]; then +@@ -5149,8 +5149,8 @@ + # runtime: no detection (cannot fail), load libdbus-1 at runtime + if [ "$CFG_DBUS" = "auto" ] || [ "$CFG_DBUS" = "linked" ]; 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` @@ -49,7 +49,7 @@ else QT_LIBS_DBUS="-ldbus-1" fi -@@ -4928,8 +4928,8 @@ +@@ -5201,8 +5201,8 @@ # auto-detect Glib support if [ "$CFG_GLIB" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -60,20 +60,20 @@ fi if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then CFG_GLIB=yes -@@ -4952,9 +4952,9 @@ +@@ -5225,9 +5225,9 @@ # auto-detect GTK style support - if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then + if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "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_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` +- QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.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_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null | filterIncludeOptions` ++ QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.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 -@@ -5001,8 +5001,8 @@ + if [ -n "$QT_CFLAGS_QGTK3" ] ; then + CFG_GTK=yes +@@ -5272,8 +5272,8 @@ # Auto-detect PulseAudio support if [ "$CFG_PULSEAUDIO" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -84,7 +84,7 @@ fi if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then CFG_PULSEAUDIO=yes -@@ -5165,8 +5165,8 @@ +@@ -5436,8 +5436,8 @@ # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then @@ -119,7 +119,7 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" -@@ -5353,16 +5353,16 @@ +@@ -5631,16 +5631,16 @@ 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" @@ -151,7 +151,7 @@ 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 -@@ -5470,8 +5470,8 @@ +@@ -5776,8 +5776,8 @@ if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then # Check if there is a suitable system-wide xkbcommon if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then @@ -162,7 +162,7 @@ QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -5524,9 +5524,9 @@ +@@ -5830,9 +5830,9 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then diff --git a/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf new file mode 100644 index 000000000000..2723284c5083 --- /dev/null +++ b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf @@ -0,0 +1,77 @@ +As we moved the libraries of Qt5 from /usr/local/lib to /usr/local/lib/qt5 the +cmake files would get installed into /usr/local/lib/qt5/cmake. This however is +not really convenient for use with other applications depending on Qt via cmake. + +For ports we could modify cmake.mk to always append /usr/local/lib/qt5 to the +search path. This would however still break applications outside of the ports +tree that users want to compile via cmake. An other option would be to patch +devel/cmake to add /usr/local/lib/qt5/cmake to the default search paths. + +We chose the third option. To patch qmake's internal cmake generation function +to fix up the paths so that cmake files still land in the the "correct" location +in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. + + + +--- mkspecs/features/create_cmake.prf.orig 2016-05-11 09:21:02.000000000 +0200 ++++ mkspecs/features/create_cmake.prf 2016-06-03 18:21:42.389363000 +0200 +@@ -48,7 +52,7 @@ + } + + CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { ++contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*")|freebsd { + CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ + CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + } +@@ -56,7 +60,7 @@ + !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true + + CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { ++contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd { + CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ + CMAKE_LIB_DIR_IS_ABSOLUTE = True + } else { +@@ -67,20 +71,20 @@ + } + + CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { ++contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd { + CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ + CMAKE_BIN_DIR_IS_ABSOLUTE = True + } + + CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { ++contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*")|freebsd { + CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ + CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + } + + win32:!wince:!static:!staticlib { + CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { ++ contains(CMAKE_DLL_DIR, "^\\.\\./.*")|freebsd { + CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ + CMAKE_DLL_DIR_IS_ABSOLUTE = True + } +@@ -167,7 +171,7 @@ + cmake_target_file + + cmake_qt5_plugin_file.files = $$cmake_target_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -314,7 +318,7 @@ + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should diff --git a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf index 25007cbeb401..ebca55108e98 100644 --- a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf +++ b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf @@ -1,7 +1,7 @@ The first hunk fixes the install location of the pkconfig files: FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig - qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR - respectively as absolute path. + qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR. + As this is now '${PREFIX}/lib/qt5' we need to go up two levels. The second hunk stops qmake from generating la files. @@ -12,7 +12,7 @@ The second hunk stops qmake from generating la files. !internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -+ QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig ++ QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig host_build: \ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] else: \ diff --git a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h b/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h deleted file mode 100644 index fbc864b3058b..000000000000 --- a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h +++ /dev/null @@ -1,31 +0,0 @@ ---- src/corelib/global/qcompilerdetection.h.orig 2015-10-13 04:35:31 UTC -+++ src/corelib/global/qcompilerdetection.h -@@ -941,13 +941,26 @@ - # undef Q_COMPILER_CONSTEXPR - # endif - # endif // Q_OS_QNX --# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ -- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) -+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && !defined(_LIBCPP_VERSION) - // Apple has not updated libstdc++ since 2007, which means it does not have - // <initializer_list> or std::move. Let's disable these features -+// The same applies to FreeBSD's base libstdc++ version used in FreeBSD 9.x. - # undef Q_COMPILER_INITIALIZER_LISTS - # undef Q_COMPILER_RVALUE_REFS - # undef Q_COMPILER_REF_QUALIFIERS -+// FreeBSD's base libstdc++ does not support std::u{16,32}string. -+# undef Q_COMPILER_UNICODE_STRINGS -+// FreeBSD's base libstdc++ does not support std::declval, which is used in -+// together with noexcept in some headers such as qpair.h (as of Qt 5.5). -+// Since there is no macro checking for std::declval, just disable noexcept -+// altogether. -+# undef Q_COMPILER_NOEXCEPT -+// FreeBSD's base libstdc++ is missing constexpr keywords on important -+// functions like std::numeric_limits<>::min(). Disable constexpr even if clang -+// advertises support for it. -+# undef Q_COMPILER_CONSTEXPR -+// FreeBSD's base libstdc++ does not support std::nullptr_t. -+# undef Q_COMPILER_NULLPTR - // Also disable <atomic>, since it's clearly not there - # undef Q_COMPILER_ATOMICS - # endif diff --git a/devel/subcommander2/files/patch-configure.ac b/devel/subcommander2/files/patch-configure.ac index b3839f6857de..1face02b85a5 100644 --- a/devel/subcommander2/files/patch-configure.ac +++ b/devel/subcommander2/files/patch-configure.ac @@ -149,7 +149,7 @@ [ AC_MSG_RESULT([yes]) AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) -@@ -635,11 +624,11 @@ +@@ -635,7 +624,7 @@ QT_BIN="$qt_path/bin" QT_PATH="$qt_path" @@ -158,11 +158,6 @@ # extract version numbers of qt -- QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` -+ QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"` - QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[[.]].*[[.]].*/\1/"` - QT_MINOR=`echo $QT_VERSION | sed "s/.*[[.]]\(.*\)[[.]].*/\1/"` - @@ -669,7 +658,7 @@ *) # any other Unix platform directly link with the libs diff --git a/devel/subcommander2/files/patch-subcommander__Makefile.am b/devel/subcommander2/files/patch-subcommander__Makefile.am index ff0284b4d16a..1d2d4e097b1c 100644 --- a/devel/subcommander2/files/patch-subcommander__Makefile.am +++ b/devel/subcommander2/files/patch-subcommander__Makefile.am @@ -1,14 +1,5 @@ --- subcommander/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 +++ subcommander/Makefile.am 2012-05-10 05:35:09.000000000 +0900 -@@ -1,7 +1,7 @@ - ## process this file with automake to produce Makefile.in - - --QT_MOC = @QT_BIN@/moc -+QT_MOC = @QT_BIN@/moc-qt4 - - scdir = $(datadir)/subcommander - icondir = $(scdir)/icons/default @@ -125,9 +125,9 @@ bin_PROGRAMS = subcommander diff --git a/devel/subcommander2/files/patch-sublib__Makefile.am b/devel/subcommander2/files/patch-sublib__Makefile.am index fa5ae9128168..ff7bc00ffad9 100644 --- a/devel/subcommander2/files/patch-sublib__Makefile.am +++ b/devel/subcommander2/files/patch-sublib__Makefile.am @@ -1,13 +1,5 @@ --- sublib/Makefile.am.orig 2009-09-20 18:10:18.000000000 +0900 +++ sublib/Makefile.am 2012-05-10 05:23:34.000000000 +0900 -@@ -1,6 +1,6 @@ - ## process this file with automake to produce Makefile.in - --QT_MOC = @QT_BIN@/moc -+QT_MOC = @QT_BIN@/moc-qt4 - QT_RCC = @QT_BIN@/rcc - - scdir = $(datadir)/subcommander @@ -121,7 +121,7 @@ $(QT_MOC) $< -o $@ diff --git a/devel/subcommander2/files/patch-submerge__Makefile.am b/devel/subcommander2/files/patch-submerge__Makefile.am index a2c0159fe16b..6766a98420c1 100644 --- a/devel/subcommander2/files/patch-submerge__Makefile.am +++ b/devel/subcommander2/files/patch-submerge__Makefile.am @@ -1,14 +1,5 @@ --- submerge/Makefile.am.orig 2008-06-23 02:19:21.000000000 +0900 +++ submerge/Makefile.am 2012-05-10 05:28:09.000000000 +0900 -@@ -1,7 +1,7 @@ - ## process this file with automake to produce Makefile.in - - --QT_MOC = @QT_BIN@/moc -+QT_MOC = @QT_BIN@/moc-qt4 - - scdir = $(datadir)/subcommander - icondir = $(scdir)/icons/default @@ -29,7 +29,7 @@ bin_PROGRAMS = submerge diff --git a/devel/universalindentgui/files/patch-UniversalIndentGUI.pro b/devel/universalindentgui/files/patch-UniversalIndentGUI.pro new file mode 100644 index 000000000000..4d71861dff1b --- /dev/null +++ b/devel/universalindentgui/files/patch-UniversalIndentGUI.pro @@ -0,0 +1,15 @@ +--- UniversalIndentGUI.pro.orig 2017-01-20 10:40:58 UTC ++++ UniversalIndentGUI.pro +@@ -37,10 +37,10 @@ macx:pipe2nul = "&> /dev/null" + ########################## + message(Updating language files) + lupdate = lupdate +-unix:lupdate = lupdate-qt4 ++unix:lupdate = lupdate + macx:lupdate = lupdate + lrelease = lrelease +-unix:lrelease = lrelease-qt4 ++unix:lrelease = lrelease + macx:lrelease = lrelease + # Update translation files + message ( Updating universalindent.ts ) |