diff --git a/x11-toolkits/qt5-declarative-test/Makefile b/x11-toolkits/qt5-declarative-test/Makefile index 5f4145b1e7aa..5f2efafc6478 100644 --- a/x11-toolkits/qt5-declarative-test/Makefile +++ b/x11-toolkits/qt5-declarative-test/Makefile @@ -1,29 +1,30 @@ PORTNAME= declarative-test PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interface (testing) USES= compiler:c++11-lang gl python:build qmake:norecursive \ qt-dist:5,declarative USE_GL= gl USE_QT= core declarative gui network sql testlib widgets \ buildtools_build CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick BINARY_ALIAS= python=${PYTHON_CMD} QT_BINARIES= yes TOOLS= qmltestrunner post-patch: # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \ ${WRKSRC}/qtdeclarative.pro ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \ ${WRKSRC}/src/3rdparty/masm/masm.pri .include diff --git a/x11-toolkits/qt5-declarative-test/files/patch-src_imports_imports.pro b/x11-toolkits/qt5-declarative-test/files/patch-src_imports_imports.pro new file mode 100644 index 000000000000..2c5e5409b304 --- /dev/null +++ b/x11-toolkits/qt5-declarative-test/files/patch-src_imports_imports.pro @@ -0,0 +1,38 @@ +--- src/imports/imports.pro.orig 2022-03-08 11:32:59 UTC ++++ src/imports/imports.pro +@@ -1,34 +1,4 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += qml-private + +-SUBDIRS += \ +- builtins \ +- qtqml \ +- models \ +- labsmodels +- +-qtConfig(qml-itemmodel): SUBDIRS += folderlistmodel +-qtConfig(qml-worker-script): SUBDIRS += workerscript +-qtHaveModule(sql): SUBDIRS += localstorage +-qtConfig(settings): SUBDIRS += settings +-qtConfig(statemachine): SUBDIRS += statemachine +- +-qtHaveModule(quick) { +- QT_FOR_CONFIG += quick-private +- +- SUBDIRS += \ +- labsanimation \ +- layouts \ +- qtquick2 \ +- window +- +- qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh +- +- qtHaveModule(testlib): SUBDIRS += testlib +- qtConfig(systemsemaphore): SUBDIRS += sharedimage +- qtConfig(quick-particles): \ +- SUBDIRS += particles +- +- qtConfig(quick-path): SUBDIRS += shapes +-} +- ++SUBDIRS= testlib diff --git a/x11-toolkits/qt5-declarative-test/files/patch-src_src.pro b/x11-toolkits/qt5-declarative-test/files/patch-src_src.pro index 40059dc2adb5..40804d971690 100644 --- a/x11-toolkits/qt5-declarative-test/files/patch-src_src.pro +++ b/x11-toolkits/qt5-declarative-test/files/patch-src_src.pro @@ -1,44 +1,45 @@ ---- src/src.pro.orig 2021-09-24 07:19:35 UTC +--- src/src.pro.orig 2021-11-16 21:43:56 UTC +++ src/src.pro -@@ -7,40 +7,6 @@ QT_FOR_CONFIG += qml qml-private quick-private +@@ -7,40 +7,7 @@ QT_FOR_CONFIG += qml qml-private quick-private # Otherwise we cannot compile qmltyperegistrar requires(qtConfig(commandlineparser)) -# We need qmltyperegistrar for all type registrations, even in qml -SUBDIRS += \ - qmltyperegistrar \ - qml \ - qmlmodels - -qtConfig(qml-worker-script): \ - SUBDIRS += qmlworkerscript - -qtHaveModule(gui):qtConfig(qml-animation) { - SUBDIRS += quick - - qtConfig(quick-path): \ - SUBDIRS += quickshapes - - qtConfig(testlib): \ - SUBDIRS += qmltest - - qtConfig(quick-particles): \ - SUBDIRS += particles - qtHaveModule(widgets): SUBDIRS += quickwidgets -} - -SUBDIRS += \ - plugins \ - imports - -qtConfig(qml-devtools): SUBDIRS += qmldevtools - -qmldevtools.depends = qml - -qtConfig(qml-network) { - QT_FOR_CONFIG += network - qtConfig(thread):qtConfig(localserver):qtConfig(qml-debug): SUBDIRS += qmldebug -} -+SUBDIRS += qmltest ++SUBDIRS += qmltest \ ++ imports DISTFILES += sync.profile configure.json diff --git a/x11-toolkits/qt5-declarative-test/pkg-plist b/x11-toolkits/qt5-declarative-test/pkg-plist index fa23067a4040..427caa024163 100644 --- a/x11-toolkits/qt5-declarative-test/pkg-plist +++ b/x11-toolkits/qt5-declarative-test/pkg-plist @@ -1,25 +1,32 @@ %%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/qtestoptions_p.h %%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktest_p.h %%QT_INCDIR%%/QtQuickTest/%%FULLVER%%/QtQuickTest/private/quicktestresult_p.h %%QT_INCDIR%%/QtQuickTest/QtQuickTest %%QT_INCDIR%%/QtQuickTest/QtQuickTestDepends %%QT_INCDIR%%/QtQuickTest/QtQuickTestVersion %%QT_INCDIR%%/QtQuickTest/qtquicktestversion.h %%QT_INCDIR%%/QtQuickTest/quicktest.h %%QT_INCDIR%%/QtQuickTest/quicktestglobal.h %%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfig.cmake %%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake %%QT_BINDIR%%/qmltestrunner %%DEBUG%%%%QT_BINDIR%%/qmltestrunner.debug %%QT_LIBDIR%%/libQt5QuickTest.prl %%QT_LIBDIR%%/libQt5QuickTest.so %%QT_LIBDIR%%/libQt5QuickTest.so.5 %%QT_LIBDIR%%/libQt5QuickTest.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5QuickTest.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickTest.so.%%FULLVER%%.debug %%QT_LIBDIR%%/metatypes/qt5quicktest_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri %%QT_QMLDIR%%/Qt/test/qtestroot/plugins.qmltypes %%QT_QMLDIR%%/Qt/test/qtestroot/qmldir +%%QT_QMLDIR%%/QtTest/SignalSpy.qml +%%QT_QMLDIR%%/QtTest/TestCase.qml +%%QT_QMLDIR%%/QtTest/libqmltestplugin.so +%%QT_QMLDIR%%/QtTest/libqmltestplugin.so.debug +%%QT_QMLDIR%%/QtTest/plugins.qmltypes +%%QT_QMLDIR%%/QtTest/qmldir +%%QT_QMLDIR%%/QtTest/testlogger.js libdata/pkgconfig/Qt5QuickTest.pc