Hi,
here is my current patch to update Qt to 5.4.0. Not sure if it is
correct, but running KF5 based apps such as kate is working fine with
this build.
Regards,
Alex
Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk (revision 377197)
+++ Mk/bsd.qt.mk (working copy)
@@ -27,7 +27,7 @@
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.6
-QT5_VERSION?= 5.3.2
+QT5_VERSION?= 5.4.0
QT_PREFIX?= ${LOCALBASE}
@@ -168,9 +168,11 @@
. endif
. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
-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
+EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-storageinfo_unix
+
+# this one no longer applies: ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure
+
. if ${_QT_VERSION:M4*}
EXTRA_PATCHES?= ${EXTRA_PATCHES} \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
Index: devel/dbus-qt5/pkg-plist
===================================================================
--- devel/dbus-qt5/pkg-plist (revision 377197)
+++ devel/dbus-qt5/pkg-plist (working copy)
@@ -1,3 +1,4 @@
+%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/dbus_minimal_p.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractinterface_p.h
Index: devel/qmake5/Makefile
===================================================================
--- devel/qmake5/Makefile (revision 377197)
+++ devel/qmake5/Makefile (working copy)
@@ -20,7 +20,7 @@
-no-xkbcommon
# Features yet to be removed from qconfig.pri.
TBR_CONFIG= alsa|concurrent|.*freetype|.*gif|.*gui|.*harfbuzz|inotify|.*jpeg|.*pkg-config|.*png|pulseaudio|.*widgets|xlib
-QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER}
+QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-clang
INSTALL_TARGET= install_qmake install_mkspecs
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
@@ -47,14 +47,19 @@
@${RM} ${WRKSRC}/mkspecs/*/*.orig
@${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46
-post-build:
+do-configure:
+ @echo "Configuring"
+
+do-build:
# Complete configure stage to generate *.pri files.
@cd ${WRKSRC} && \
${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+
+pre-install:
# Cleanup qmodule.pri to make it module agnostic.
- @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \
+ ${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \
${WRKSRC}/mkspecs/qmodule.pri
.include <bsd.port.mk>
Index: devel/qmake5/files/patch-configure
===================================================================
--- devel/qmake5/files/patch-configure (revision 377197)
+++ devel/qmake5/files/patch-configure (working copy)
@@ -15,11 +15,4 @@
echo "EXEEXT = $EXEEXT" >> "$mkfile"
echo "RM_F = rm -f" >> "$mkfile"
echo "RM_RF = rm -rf" >> "$mkfile"
-@@ -4214,6 +4214,7 @@
- rm "$mkfile.tmp"
- fi
- done
-+ exit 0
-
- (cd "$outpath/qmake"; "$MAKE") || exit 2
- fi # Build qmake
+
Index: devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf
===================================================================
--- devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf (revision 377197)
+++ devel/qmake5/files/patch-mkspecs__unsupported__freebsd-clang__qmake.conf (working copy)
@@ -15,6 +15,7 @@
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR = /usr/local/lib
-
+-QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined
-QMAKE_LFLAGS_THREAD = -pthread
-
-QMAKE_LIBS =
@@ -29,9 +30,5 @@
-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)
+ load(qt_config)
Index: devel/qmake5/pkg-plist
===================================================================
--- devel/qmake5/pkg-plist (revision 377197)
+++ devel/qmake5/pkg-plist (working copy)
@@ -48,6 +48,7 @@
%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf
%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf
%%QT_MKSPECDIR%%/common/qcc-base.conf
+%%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h
%%QT_MKSPECDIR%%/common/shell-unix.conf
%%QT_MKSPECDIR%%/common/shell-win32.conf
%%QT_MKSPECDIR%%/common/unix.conf
@@ -99,8 +100,6 @@
%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h
-%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qmake.conf
-%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h
@@ -119,6 +118,7 @@
%%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf
%%QT_MKSPECDIR%%/features/build_pass.prf
%%QT_MKSPECDIR%%/features/c++11.prf
+%%QT_MKSPECDIR%%/features/c++14.prf
%%QT_MKSPECDIR%%/features/cmake_functions.prf
%%QT_MKSPECDIR%%/features/configure.prf
%%QT_MKSPECDIR%%/features/create_cmake.prf
@@ -150,6 +150,7 @@
%%QT_MKSPECDIR%%/features/java.prf
%%QT_MKSPECDIR%%/features/lex.prf
%%QT_MKSPECDIR%%/features/link_pkgconfig.prf
+%%QT_MKSPECDIR%%/features/ltcg.prf
%%QT_MKSPECDIR%%/features/mac/default_post.prf
%%QT_MKSPECDIR%%/features/mac/default_pre.prf
%%QT_MKSPECDIR%%/features/mac/objective_c.prf
@@ -222,7 +223,6 @@
%%QT_MKSPECDIR%%/features/win32/default_pre.prf
%%QT_MKSPECDIR%%/features/win32/dumpcpp.prf
%%QT_MKSPECDIR%%/features/win32/idcidl.prf
-%%QT_MKSPECDIR%%/features/win32/ltcg.prf
%%QT_MKSPECDIR%%/features/win32/msvc_mp.prf
%%QT_MKSPECDIR%%/features/win32/opengl.prf
%%QT_MKSPECDIR%%/features/win32/openvg.prf
@@ -282,8 +282,6 @@
%%QT_MKSPECDIR%%/linux-g++-32/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-g++-64/qmake.conf
%%QT_MKSPECDIR%%/linux-g++-64/qplatformdefs.h
-%%QT_MKSPECDIR%%/linux-g++-maemo/qmake.conf
-%%QT_MKSPECDIR%%/linux-g++-maemo/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-g++/qmake.conf
%%QT_MKSPECDIR%%/linux-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/linux-icc-32/qmake.conf
@@ -338,6 +336,7 @@
%%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/LaunchScreen.xib
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
%%QT_MKSPECDIR%%/macx-ios-clang/rename_main.sh
@@ -394,8 +393,6 @@
%%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
Index: devel/qt5/distinfo
===================================================================
--- devel/qt5/distinfo (revision 377197)
+++ devel/qt5/distinfo (working copy)
@@ -1,34 +1,34 @@
-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
+SHA256 (KDE/Qt/5.4.0/qtbase-opensource-src-5.4.0.tar.xz) = daea240ba5e77bc2d78ec21a2cb664eed83b3d4ad409b6277a6f7d4c0c8e91d1
+SIZE (KDE/Qt/5.4.0/qtbase-opensource-src-5.4.0.tar.xz) = 46109688
+SHA256 (KDE/Qt/5.4.0/qtdeclarative-opensource-src-5.4.0.tar.xz) = e67c9275b0f6869a7c1e8023ad7c0a23fb19f8a8d2f350371e954ead0cfad7b6
+SIZE (KDE/Qt/5.4.0/qtdeclarative-opensource-src-5.4.0.tar.xz) = 18401844
+SHA256 (KDE/Qt/5.4.0/qtdoc-opensource-src-5.4.0.tar.xz) = d58696946c3a61f7a48f41bbac79f099ced303135e7fc76bbe4d0edcc73afd19
+SIZE (KDE/Qt/5.4.0/qtdoc-opensource-src-5.4.0.tar.xz) = 16049796
+SHA256 (KDE/Qt/5.4.0/qtgraphicaleffects-opensource-src-5.4.0.tar.xz) = a43f10e532180eb8400fec65752b36c1adaa9aaf672146035ef630d324a38b19
+SIZE (KDE/Qt/5.4.0/qtgraphicaleffects-opensource-src-5.4.0.tar.xz) = 14323556
+SHA256 (KDE/Qt/5.4.0/qtimageformats-opensource-src-5.4.0.tar.xz) = c89b678df71e44f8cff7b5f8362b7d61430a7aa7cd70147be1267d87ac8fe046
+SIZE (KDE/Qt/5.4.0/qtimageformats-opensource-src-5.4.0.tar.xz) = 2104452
+SHA256 (KDE/Qt/5.4.0/qtmultimedia-opensource-src-5.4.0.tar.xz) = 5ab9dba27ae64123f2d0124b6884da276d8982aa959d65aa44125f758ef9af51
+SIZE (KDE/Qt/5.4.0/qtmultimedia-opensource-src-5.4.0.tar.xz) = 3188824
+SHA256 (KDE/Qt/5.4.0/qtquick1-opensource-src-5.4.0.tar.xz) = d5a8b77c1c4832383f3c5a39c6dc60e992e61e684e7fbbdf9a208c31d9d032dc
+SIZE (KDE/Qt/5.4.0/qtquick1-opensource-src-5.4.0.tar.xz) = 15982676
+SHA256 (KDE/Qt/5.4.0/qtquickcontrols-opensource-src-5.4.0.tar.xz) = b59f43333291c3e73f9a9f92706a4c98d4d810b4efd6803a4edd3f1658fae61e
+SIZE (KDE/Qt/5.4.0/qtquickcontrols-opensource-src-5.4.0.tar.xz) = 919408
+SHA256 (KDE/Qt/5.4.0/qtscript-opensource-src-5.4.0.tar.xz) = f5f35702ec36f24b17878348af1aa1ecf93056a9ddf475097b3fdd52c3330ed0
+SIZE (KDE/Qt/5.4.0/qtscript-opensource-src-5.4.0.tar.xz) = 2579768
+SHA256 (KDE/Qt/5.4.0/qtserialport-opensource-src-5.4.0.tar.xz) = 0fc619ef714f5b920ff19ec811b6459c849fafcc697ef4091dbb74e45bd058c3
+SIZE (KDE/Qt/5.4.0/qtserialport-opensource-src-5.4.0.tar.xz) = 251680
+SHA256 (KDE/Qt/5.4.0/qtsvg-opensource-src-5.4.0.tar.xz) = 68ee762bacc7b63aea29f446549ee6daae46e6fe2120e2460f30d47accc2b789
+SIZE (KDE/Qt/5.4.0/qtsvg-opensource-src-5.4.0.tar.xz) = 1758668
+SHA256 (KDE/Qt/5.4.0/qttools-opensource-src-5.4.0.tar.xz) = 5a85a096ffd30463781dc3871ad9640a510eba0086188c7943d23adc3660741a
+SIZE (KDE/Qt/5.4.0/qttools-opensource-src-5.4.0.tar.xz) = 9261924
+SHA256 (KDE/Qt/5.4.0/qttranslations-opensource-src-5.4.0.tar.xz) = aca78d9178481a21a7af8571beb9109b38f0f71ba75cf3b89ddf705962a3f98b
+SIZE (KDE/Qt/5.4.0/qttranslations-opensource-src-5.4.0.tar.xz) = 1095484
+SHA256 (KDE/Qt/5.4.0/qtwebkit-opensource-src-5.4.0.tar.xz) = 6c672207765d5d2e88aa14b72b3876ad7bce453397a02e1a3d6e4670a8d188c1
+SIZE (KDE/Qt/5.4.0/qtwebkit-opensource-src-5.4.0.tar.xz) = 33456404
+SHA256 (KDE/Qt/5.4.0/qtwebkit-examples-opensource-src-5.4.0.tar.xz) = b02a2f3d381e66e83fbf972416ad376e2a03ccfa8b4371867c83970bf0f0e9f6
+SIZE (KDE/Qt/5.4.0/qtwebkit-examples-opensource-src-5.4.0.tar.xz) = 3419228
+SHA256 (KDE/Qt/5.4.0/qtx11extras-opensource-src-5.4.0.tar.xz) = a3c66bc9e2b877109073f27bbc7865489fa1ed548584f5fc87c371380dc1474c
+SIZE (KDE/Qt/5.4.0/qtx11extras-opensource-src-5.4.0.tar.xz) = 25456
+SHA256 (KDE/Qt/5.4.0/qtxmlpatterns-opensource-src-5.4.0.tar.xz) = 791c697b9bc7a5384e3d0dbec56af7f2194fe7dc91f8b1e0fd502089135e5425
+SIZE (KDE/Qt/5.4.0/qtxmlpatterns-opensource-src-5.4.0.tar.xz) = 1307936
Index: devel/qt5/files/extrapatch-config.tests-unix-compile.test
===================================================================
--- devel/qt5/files/extrapatch-config.tests-unix-compile.test (revision 377197)
+++ devel/qt5/files/extrapatch-config.tests-unix-compile.test (working copy)
@@ -1,11 +0,0 @@
---- config.tests/unix/compile.test.orig
-+++ config.tests/unix/compile.test
-@@ -13,7 +13,7 @@
- shift 7
- LFLAGS="$SYSROOT_FLAG"
- INCLUDEPATH=""
--CXXFLAGS="$SYSROOT_FLAG"
-+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
- MAC_ARCH_CXXFLAGS=""
- MAC_ARCH_LFLAGS=""
- while [ "$#" -gt 0 ]; do
Index: devel/qt5/files/extrapatch-storageinfo_unix
===================================================================
--- devel/qt5/files/extrapatch-storageinfo_unix (revision 0)
+++ devel/qt5/files/extrapatch-storageinfo_unix (working copy)
@@ -0,0 +1,49 @@
+commit 13972476ad2c3178fe89f2d96f398de10394c6f6
+Author: Dmitry Shachnev <[email protected]>
+Date: Mon Dec 22 13:44:45 2014 +0300
+
+ qstorageinfo_unix.cpp: Fix build on BSD and other unices
+
+ * Include statvfs.h on all non-Linux and non-Solaris systems.
+ * Fix type of stat_buf structure on BSD.
+
+ Change-Id: I6336503082fafd7f6108cf95c079bdd329d2ea0f
+ Reviewed-by: Gabriel de Dietrich <[email protected]>
+ Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <[email protected]>
+ Reviewed-by: Allan Sandfeld Jensen <[email protected]>
+ Reviewed-by: Shawn Rutledge <[email protected]>
+
+diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
+index e82737c..857464f 100644
+--- src/corelib/io/qstorageinfo_unix.cpp
++++ src/corelib/io/qstorageinfo_unix.cpp
+@@ -52,17 +52,18 @@
+
+ #if defined(Q_OS_BSD4)
+ # include <sys/mount.h>
++# include <sys/statvfs.h>
+ #elif defined(Q_OS_ANDROID)
+ # include <sys/mount.h>
+ # include <sys/vfs.h>
+ # include <mntent.h>
+-#elif defined(Q_OS_QNX)
+-# include <sys/statvfs.h>
+ #elif defined(Q_OS_LINUX)
+ # include <mntent.h>
+ # include <sys/statvfs.h>
+ #elif defined(Q_OS_SOLARIS)
+ # include <sys/mnttab.h>
++#else
++# include <sys/statvfs.h>
+ #endif
+
+ #if defined(Q_OS_BSD4)
+@@ -118,7 +119,7 @@ public:
+ inline QByteArray device() const;
+ private:
+ #if defined(Q_OS_BSD4)
+- statfs *stat_buf;
++ struct statfs *stat_buf;
+ int entryCount;
+ int currentIndex;
+ #elif defined(Q_OS_SOLARIS)
Property changes on: devel/qt5/files/extrapatch-storageinfo_unix
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/qt5-assistant/files/patch-src__src.pro
===================================================================
--- devel/qt5-assistant/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-assistant/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: devel/qt5-core/Makefile
===================================================================
--- devel/qt5-core/Makefile (revision 377197)
+++ devel/qt5-core/Makefile (working copy)
@@ -45,5 +45,7 @@
# Allow qconfig.h to be customized by single ports.
${REINPLACE_CMD} -i "" '1 s|.*|#include <QtCore/qconfig-modules.h>|' \
${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h
-
+#somehow an absolute path is inserted here ("${_qt5Core_install_prefix}/lib/qt5//mkspecs//usr/local/lib/qt5/mkspecs/freebsd-clang")
+ ${REINPLACE_CMD} -i "" 's|/lib/qt5//mkspecs//usr/local||g' \
+ ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
.include <bsd.port.post.mk>
Index: devel/qt5-core/files/patch-link_execinfo
===================================================================
--- devel/qt5-core/files/patch-link_execinfo (revision 0)
+++ devel/qt5-core/files/patch-link_execinfo (working copy)
@@ -0,0 +1,14 @@
+diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
+index 2d78041..ac6f63e 100644
+--- src/corelib/corelib.pro
++++ src/corelib/corelib.pro
+@@ -56,6 +56,9 @@ mac|darwin {
+ LIBS_PRIVATE += -framework CoreFoundation
+ LIBS_PRIVATE += -framework Foundation
+ }
++# needed for backtrace_symbols() in qlogging.cpp
++freebsd:LIBS_PRIVATE += -lexecinfo
++
+ win32:DEFINES-=QT_NO_CAST_TO_ASCII
+ DEFINES += $$MODULE_DEFINES
+
Property changes on: devel/qt5-core/files/patch-link_execinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/qt5-core/pkg-plist
===================================================================
--- devel/qt5-core/pkg-plist (revision 377197)
+++ devel/qt5-core/pkg-plist (working copy)
@@ -75,6 +75,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiconvcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qicucodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qiodevice_p.h
@@ -94,7 +95,6 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlocale_tools_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qlockfile_p.h
-%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingcategory_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qloggingregistry_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmachparser_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qmetaobject_moc_p.h
@@ -139,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/qstorageinfo_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
@@ -163,6 +164,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qversionnumber_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
@@ -197,6 +199,8 @@
%%QT_INCDIR%%/QtCore/QByteArray
%%QT_INCDIR%%/QtCore/QByteArrayData
%%QT_INCDIR%%/QtCore/QByteArrayDataPtr
+%%QT_INCDIR%%/QtCore/QByteArrayList
+%%QT_INCDIR%%/QtCore/QByteArrayListIterator
%%QT_INCDIR%%/QtCore/QByteArrayMatcher
%%QT_INCDIR%%/QtCore/QByteRef
%%QT_INCDIR%%/QtCore/QCache
@@ -223,6 +227,7 @@
%%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent
%%QT_INCDIR%%/QtCore/QEasingCurve
%%QT_INCDIR%%/QtCore/QElapsedTimer
+%%QT_INCDIR%%/QtCore/QEnableSharedFromThis
%%QT_INCDIR%%/QtCore/QEvent
%%QT_INCDIR%%/QtCore/QEventLoop
%%QT_INCDIR%%/QtCore/QEventLoopLocker
@@ -253,7 +258,6 @@
%%QT_INCDIR%%/QtCore/QGlobalStatic
%%QT_INCDIR%%/QtCore/QHash
%%QT_INCDIR%%/QtCore/QHashData
-%%QT_INCDIR%%/QtCore/QHashDummyNode
%%QT_INCDIR%%/QtCore/QHashDummyValue
%%QT_INCDIR%%/QtCore/QHashIterator
%%QT_INCDIR%%/QtCore/QHashNode
@@ -271,7 +275,9 @@
%%QT_INCDIR%%/QtCore/QJsonObject
%%QT_INCDIR%%/QtCore/QJsonParseError
%%QT_INCDIR%%/QtCore/QJsonValue
+%%QT_INCDIR%%/QtCore/QJsonValuePtr
%%QT_INCDIR%%/QtCore/QJsonValueRef
+%%QT_INCDIR%%/QtCore/QJsonValueRefPtr
%%QT_INCDIR%%/QtCore/QLatin1Char
%%QT_INCDIR%%/QtCore/QLatin1Literal
%%QT_INCDIR%%/QtCore/QLatin1String
@@ -286,6 +292,7 @@
%%QT_INCDIR%%/QtCore/QList
%%QT_INCDIR%%/QtCore/QListData
%%QT_INCDIR%%/QtCore/QListIterator
+%%QT_INCDIR%%/QtCore/QListSpecialMethods
%%QT_INCDIR%%/QtCore/QLocale
%%QT_INCDIR%%/QtCore/QLockFile
%%QT_INCDIR%%/QtCore/QLoggingCategory
@@ -316,6 +323,7 @@
%%QT_INCDIR%%/QtCore/QModelIndexList
%%QT_INCDIR%%/QtCore/QMultiHash
%%QT_INCDIR%%/QtCore/QMultiMap
+%%QT_INCDIR%%/QtCore/QMutableByteArrayListIterator
%%QT_INCDIR%%/QtCore/QMutableFutureIterator
%%QT_INCDIR%%/QtCore/QMutableHashIterator
%%QT_INCDIR%%/QtCore/QMutableLinkedListIterator
@@ -390,6 +398,7 @@
%%QT_INCDIR%%/QtCore/QStaticByteArrayData
%%QT_INCDIR%%/QtCore/QStaticPlugin
%%QT_INCDIR%%/QtCore/QStaticStringData
+%%QT_INCDIR%%/QtCore/QStorageInfo
%%QT_INCDIR%%/QtCore/QString
%%QT_INCDIR%%/QtCore/QStringBuilder
%%QT_INCDIR%%/QtCore/QStringData
@@ -500,6 +509,7 @@
%%QT_INCDIR%%/QtCore/qbitarray.h
%%QT_INCDIR%%/QtCore/qbuffer.h
%%QT_INCDIR%%/QtCore/qbytearray.h
+%%QT_INCDIR%%/QtCore/qbytearraylist.h
%%QT_INCDIR%%/QtCore/qbytearraymatcher.h
%%QT_INCDIR%%/QtCore/qcache.h
%%QT_INCDIR%%/QtCore/qchar.h
@@ -627,6 +637,7 @@
%%QT_INCDIR%%/QtCore/qstandardpaths.h
%%QT_INCDIR%%/QtCore/qstate.h
%%QT_INCDIR%%/QtCore/qstatemachine.h
+%%QT_INCDIR%%/QtCore/qstorageinfo.h
%%QT_INCDIR%%/QtCore/qstring.h
%%QT_INCDIR%%/QtCore/qstringbuilder.h
%%QT_INCDIR%%/QtCore/qstringlist.h
Index: devel/qt5-designer/files/patch-src__src.pro
===================================================================
--- devel/qt5-designer/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-designer/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: devel/qt5-help/Makefile
===================================================================
--- devel/qt5-help/Makefile (revision 377197)
+++ devel/qt5-help/Makefile (working copy)
@@ -13,7 +13,25 @@
USES= qmake
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
-BUILD_WRKSRC= ${WRKSRC}/src/assistant
-INSTALL_WRKSRC= ${WRKSRC}/src/assistant
+BUILD_WRKSRC= ${WRKSRC}/src/assistant/help
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+MORE_WRKSRCS= src/assistant/qcollectiongenerator \
+ src/assistant/qhelpconverter \
+ src/assistant/qhelpgenerator
+
+post-build:
+.for d in ${MORE_WRKSRCS}
+ @cd ${WRKSRC}/${d} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
+.endfor
+
+post-install:
+.for d in ${MORE_WRKSRCS}
+ @cd ${WRKSRC}/${d} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} ${INSTALL_TARGET}
+.endfor
+
.include <bsd.port.mk>
Index: devel/qt5-help/files/patch-src__assistant__assistant.pro
===================================================================
--- devel/qt5-help/files/patch-src__assistant__assistant.pro (revision 377197)
+++ devel/qt5-help/files/patch-src__assistant__assistant.pro (working copy)
@@ -1,30 +0,0 @@
-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 \
Index: devel/qt5-help/files/patch-src__src.pro
===================================================================
--- devel/qt5-help/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-help/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: devel/qt5-linguist/Makefile
===================================================================
--- devel/qt5-linguist/Makefile (revision 377197)
+++ devel/qt5-linguist/Makefile (working copy)
@@ -21,6 +21,11 @@
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}
INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}
+# we need Qt5UiTools from qt5-uitools
+post-configure:
+ ${LN} -s ${QT_LIBDIR}/libQt5UiTools.a \
+ ${CONFIGURE_WRKSRC}/lib/libQt5UiTools.a
+
post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \
${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png
Index: devel/qt5-linguist/files/patch-src__src.pro
===================================================================
--- devel/qt5-linguist/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-linguist/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: devel/qt5-qdbusviewer/files/patch-src__src.pro
===================================================================
--- devel/qt5-qdbusviewer/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-qdbusviewer/files/patch-src__src.pro (working copy)
@@ -1,44 +0,0 @@
-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 \
--)
Index: devel/qt5-testlib/pkg-plist
===================================================================
--- devel/qt5-testlib/pkg-plist (revision 377197)
+++ devel/qt5-testlib/pkg-plist (working copy)
@@ -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/qtestblacklist_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
Index: devel/qt5-uitools/files/patch-src__designer__src__src.pro
===================================================================
--- devel/qt5-uitools/files/patch-src__designer__src__src.pro (revision 377197)
+++ devel/qt5-uitools/files/patch-src__designer__src__src.pro (working copy)
@@ -1,27 +0,0 @@
-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
Index: devel/qt5-uitools/files/patch-src__src.pro
===================================================================
--- devel/qt5-uitools/files/patch-src__src.pro (revision 377197)
+++ devel/qt5-uitools/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: graphics/qt5-pixeltool/files/patch-src__src.pro
===================================================================
--- graphics/qt5-pixeltool/files/patch-src__src.pro (revision 377197)
+++ graphics/qt5-pixeltool/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: lang/qt5-qml/Makefile
===================================================================
--- lang/qt5-qml/Makefile (revision 377197)
+++ lang/qt5-qml/Makefile (working copy)
@@ -13,9 +13,11 @@
USES= python:build qmake
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
-BUILD_WRKSRC= ${WRKSRC}/src
-INSTALL_WRKSRC= ${WRKSRC}/src
+BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+MORE_WRKSRCS= src/qmldevtools
+
post-patch:
# tools/tools.pro will be processed automatically unless it does not exist.
${RM} -r ${WRKSRC}/tools
@@ -23,5 +25,18 @@
${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \
${WRKSRC}/src/3rdparty/masm/masm.pri
+post-build:
+.for d in ${MORE_WRKSRCS}
+ @cd ${WRKSRC}/${d} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
+.endfor
+post-install:
+.for d in ${MORE_WRKSRCS}
+ @cd ${WRKSRC}/${d} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} ${INSTALL_TARGET}
+.endfor
+
.include <bsd.port.mk>
Index: lang/qt5-qml/files/patch-fix-pthread-crash
===================================================================
--- lang/qt5-qml/files/patch-fix-pthread-crash (revision 0)
+++ lang/qt5-qml/files/patch-fix-pthread-crash (working copy)
@@ -0,0 +1,24 @@
+diff --git src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4engine.cpp
+index 74b262e..72d0e7a 100644
+--- src/qml/jsruntime/qv4engine.cpp
++++ src/qml/jsruntime/qv4engine.cpp
+@@ -112,7 +112,8 @@ quintptr getStackLimit()
+ void* stackBottom = 0;
+ pthread_attr_t attr;
+ #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
+- if (pthread_attr_get_np(pthread_self(), &attr) == 0) {
++ // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
++ if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) {
+ #else
+ if (pthread_getattr_np(pthread_self(), &attr) == 0) {
+ #endif
+@@ -130,6 +131,8 @@ quintptr getStackLimit()
+ # endif
+
+ stackLimit = reinterpret_cast<quintptr>(stackBottom);
++ // When the thread attributes object returned by pthread_getattr_np() is no longer required, it should be destroyed using pthread_attr_destroy(3)
++ pthread_attr_destroy(&attr);
+ } else {
+ int dummy;
+ // this is inexact, as part of the stack is used when being called here,
+
Property changes on: lang/qt5-qml/files/patch-fix-pthread-crash
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: lang/qt5-qml/files/patch-git_b84f08c8
===================================================================
--- lang/qt5-qml/files/patch-git_b84f08c8 (revision 377197)
+++ lang/qt5-qml/files/patch-git_b84f08c8 (working copy)
@@ -1,23 +0,0 @@
-Fixes the build with base GCC.
-
-commit b84f08c8b7c91a979bd74840561af2391ef20666
-Author: Lars Knoll <[email protected]>
-Date: Tue May 6 13:30:31 2014 +0200
-
- Fix compiler warning
-
- Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2
- Reviewed-by: Simon Hausmann <[email protected]>
-
---- 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);
-
Index: lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp
===================================================================
--- lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp (revision 377197)
+++ lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp (working copy)
@@ -1,11 +0,0 @@
---- 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
Index: lang/qt5-qml/files/patch-src__src.pro
===================================================================
--- lang/qt5-qml/files/patch-src__src.pro (revision 377197)
+++ lang/qt5-qml/files/patch-src__src.pro (working copy)
@@ -1,24 +0,0 @@
-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
Index: lang/qt5-qml/pkg-plist
===================================================================
--- lang/qt5-qml/pkg-plist (revision 377197)
+++ lang/qt5-qml/pkg-plist (working copy)
@@ -178,6 +178,7 @@
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regalloc_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexp_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexpobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4registerinfo_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtime_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h
%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h
@@ -188,6 +189,7 @@
%%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/qv4targetplatform_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_inl_p.h
Index: net/qt5-network/pkg-plist
===================================================================
--- net/qt5-network/pkg-plist (revision 377197)
+++ net/qt5-network/pkg-plist (working copy)
@@ -2,6 +2,7 @@
%%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/qasn1element_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qauthenticator_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerengine_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qbearerplugin_p.h
@@ -54,11 +55,12 @@
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificateextension_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcipher_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslconfiguration_p.h
-%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_openssl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h
%%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache
Index: textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
===================================================================
--- textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (revision 377197)
+++ textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (working copy)
@@ -1,11 +0,0 @@
---- 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)
-
-+using ::wcschr;
-+
- FieldCacheImpl::FieldCacheImpl():
- cache(false,true){
- }
Index: textproc/clucene-qt5/files/patch-src__assistant__assistant.pro
===================================================================
--- textproc/clucene-qt5/files/patch-src__assistant__assistant.pro (revision 377197)
+++ textproc/clucene-qt5/files/patch-src__assistant__assistant.pro (working copy)
@@ -1,28 +0,0 @@
-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
Index: textproc/clucene-qt5/files/patch-src__src.pro
===================================================================
--- textproc/clucene-qt5/files/patch-src__src.pro (revision 377197)
+++ textproc/clucene-qt5/files/patch-src__src.pro (working copy)
@@ -1,45 +0,0 @@
-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
Index: x11-toolkits/qt5-gui/Makefile
===================================================================
--- x11-toolkits/qt5-gui/Makefile (revision 377197)
+++ x11-toolkits/qt5-gui/Makefile (working copy)
@@ -63,6 +63,11 @@
CFLAGS_powerpc64= -mminimal-toc
+pre-build:
+ @cd ${WRKSRC}/src/3rdparty/harfbuzz-ng && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
+
post-build:
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
Index: x11-toolkits/qt5-gui/pkg-plist
===================================================================
--- x11-toolkits/qt5-gui/pkg-plist (revision 377197)
+++ x11-toolkits/qt5-gui/pkg-plist (working copy)
@@ -25,7 +25,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfont_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_ft_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_p.h
-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_qpa_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengine_qpf2_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontengineglyphcache_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfontsubset_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qfragmentmap_p.h
@@ -58,6 +58,7 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglextensions_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglframebufferobject_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglgradientcache_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglpaintdevice_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglpaintengine_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglqueryhelper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglshadercache_meego_p.h
@@ -68,9 +69,11 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltextureglyphcache_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopengltexturehelper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglversionfunctionsfactory_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglvertexarrayobject_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qoutlinemapper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpagedpaintdevice_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintbuffer_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintdevicewindow_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_blitter_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_pic_p.h
@@ -145,7 +148,6 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformpixmap.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreen.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreen_p.h
-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformscreenpageflipper.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformservices.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformsessionmanager.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformsharedgraphicscache.h
@@ -300,10 +302,12 @@
%%QT_INCDIR%%/QtGui/QOpenGLVersionFunctions
%%QT_INCDIR%%/QtGui/QOpenGLVersionProfile
%%QT_INCDIR%%/QtGui/QOpenGLVertexArrayObject
+%%QT_INCDIR%%/QtGui/QOpenGLWindow
%%QT_INCDIR%%/QtGui/QPageLayout
%%QT_INCDIR%%/QtGui/QPageSize
%%QT_INCDIR%%/QtGui/QPagedPaintDevice
%%QT_INCDIR%%/QtGui/QPaintDevice
+%%QT_INCDIR%%/QtGui/QPaintDeviceWindow
%%QT_INCDIR%%/QtGui/QPaintEngine
%%QT_INCDIR%%/QtGui/QPaintEngineState
%%QT_INCDIR%%/QtGui/QPaintEvent
@@ -316,6 +320,7 @@
%%QT_INCDIR%%/QtGui/QPicture
%%QT_INCDIR%%/QtGui/QPictureFormatPlugin
%%QT_INCDIR%%/QtGui/QPictureIO
+%%QT_INCDIR%%/QtGui/QPixelFormat
%%QT_INCDIR%%/QtGui/QPixmap
%%QT_INCDIR%%/QtGui/QPixmapCache
%%QT_INCDIR%%/QtGui/QPolygon
@@ -322,6 +327,7 @@
%%QT_INCDIR%%/QtGui/QPolygonF
%%QT_INCDIR%%/QtGui/QQuaternion
%%QT_INCDIR%%/QtGui/QRadialGradient
+%%QT_INCDIR%%/QtGui/QRasterWindow
%%QT_INCDIR%%/QtGui/QRawFont
%%QT_INCDIR%%/QtGui/QRegExpValidator
%%QT_INCDIR%%/QtGui/QRegion
@@ -467,10 +473,12 @@
%%QT_INCDIR%%/QtGui/qopengltimerquery.h
%%QT_INCDIR%%/QtGui/qopenglversionfunctions.h
%%QT_INCDIR%%/QtGui/qopenglvertexarrayobject.h
+%%QT_INCDIR%%/QtGui/qopenglwindow.h
%%QT_INCDIR%%/QtGui/qpagedpaintdevice.h
%%QT_INCDIR%%/QtGui/qpagelayout.h
%%QT_INCDIR%%/QtGui/qpagesize.h
%%QT_INCDIR%%/QtGui/qpaintdevice.h
+%%QT_INCDIR%%/QtGui/qpaintdevicewindow.h
%%QT_INCDIR%%/QtGui/qpaintengine.h
%%QT_INCDIR%%/QtGui/qpainter.h
%%QT_INCDIR%%/QtGui/qpainterpath.h
@@ -479,10 +487,12 @@
%%QT_INCDIR%%/QtGui/qpen.h
%%QT_INCDIR%%/QtGui/qpicture.h
%%QT_INCDIR%%/QtGui/qpictureformatplugin.h
+%%QT_INCDIR%%/QtGui/qpixelformat.h
%%QT_INCDIR%%/QtGui/qpixmap.h
%%QT_INCDIR%%/QtGui/qpixmapcache.h
%%QT_INCDIR%%/QtGui/qpolygon.h
%%QT_INCDIR%%/QtGui/qquaternion.h
+%%QT_INCDIR%%/QtGui/qrasterwindow.h
%%QT_INCDIR%%/QtGui/qrawfont.h
%%QT_INCDIR%%/QtGui/qregion.h
%%QT_INCDIR%%/QtGui/qrgb.h
@@ -521,6 +531,7 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/cglconvenience_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/constant_mappings_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/dbusconnection_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qaccessiblebridgeutils_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h
Index: x11-toolkits/qt5-quick/files/patch-git_b84f08c8
===================================================================
--- x11-toolkits/qt5-quick/files/patch-git_b84f08c8 (revision 377197)
+++ x11-toolkits/qt5-quick/files/patch-git_b84f08c8 (working copy)
@@ -1,23 +0,0 @@
-Fixes the build with base GCC.
-
-commit b84f08c8b7c91a979bd74840561af2391ef20666
-Author: Lars Knoll <[email protected]>
-Date: Tue May 6 13:30:31 2014 +0200
-
- Fix compiler warning
-
- Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2
- Reviewed-by: Simon Hausmann <[email protected]>
-
---- 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);
-
Index: x11-toolkits/qt5-quick/pkg-plist
===================================================================
--- x11-toolkits/qt5-quick/pkg-plist (revision 377197)
+++ x11-toolkits/qt5-quick/pkg-plist (working copy)
@@ -1,5 +1,9 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/designerwindowmanager_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmlaccessible_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanimatedimage_p.h
@@ -32,6 +36,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickflipable_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfocusscope_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontloader_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickfontmetrics_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickgridview_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickimage_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickimage_p_p.h
@@ -53,6 +58,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmousearea_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickmultipointtoucharea_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickopenglinfo_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpainteditem_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpath_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpath_p_p.h
@@ -99,6 +105,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextedit_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextmetrics_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnodeengine_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextutil_p.h
@@ -110,7 +117,9 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindow_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowattached_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowmodule_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgabstractrenderer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgadaptationlayer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgareaallocator_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgatlastexture_p.h
@@ -121,21 +130,23 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultimagenode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultlayer_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultpainternode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultrectanglenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdepthstencilbuffer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldutil_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgengine_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggeometry_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialshader_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnodeupdater_p.h
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgpainternode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderer_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderloop_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrendernode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshadersourcebuilder_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshareddistancefieldglyphcache_p.h
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshadersourcebuilder_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexture_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturematerial_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgthreadedrenderloop_p.h
@@ -145,15 +156,19 @@
%%QT_INCDIR%%/QtQuick/QQuickFramebufferObject
%%QT_INCDIR%%/QtQuick/QQuickImageProvider
%%QT_INCDIR%%/QtQuick/QQuickItem
+%%QT_INCDIR%%/QtQuick/QQuickItemGrabResult
%%QT_INCDIR%%/QtQuick/QQuickPaintedItem
+%%QT_INCDIR%%/QtQuick/QQuickRenderControl
%%QT_INCDIR%%/QtQuick/QQuickTextDocument
%%QT_INCDIR%%/QtQuick/QQuickTextureFactory
%%QT_INCDIR%%/QtQuick/QQuickTransform
%%QT_INCDIR%%/QtQuick/QQuickView
%%QT_INCDIR%%/QtQuick/QQuickWindow
+%%QT_INCDIR%%/QtQuick/QSGAbstractRenderer
%%QT_INCDIR%%/QtQuick/QSGBasicGeometryNode
%%QT_INCDIR%%/QtQuick/QSGClipNode
%%QT_INCDIR%%/QtQuick/QSGDynamicTexture
+%%QT_INCDIR%%/QtQuick/QSGEngine
%%QT_INCDIR%%/QtQuick/QSGFlatColorMaterial
%%QT_INCDIR%%/QtQuick/QSGGeometry
%%QT_INCDIR%%/QtQuick/QSGGeometryNode
@@ -182,10 +197,14 @@
%%QT_INCDIR%%/QtQuick/qquickframebufferobject.h
%%QT_INCDIR%%/QtQuick/qquickimageprovider.h
%%QT_INCDIR%%/QtQuick/qquickitem.h
+%%QT_INCDIR%%/QtQuick/qquickitemgrabresult.h
%%QT_INCDIR%%/QtQuick/qquickpainteditem.h
+%%QT_INCDIR%%/QtQuick/qquickrendercontrol.h
%%QT_INCDIR%%/QtQuick/qquicktextdocument.h
%%QT_INCDIR%%/QtQuick/qquickview.h
%%QT_INCDIR%%/QtQuick/qquickwindow.h
+%%QT_INCDIR%%/QtQuick/qsgabstractrenderer.h
+%%QT_INCDIR%%/QtQuick/qsgengine.h
%%QT_INCDIR%%/QtQuick/qsgflatcolormaterial.h
%%QT_INCDIR%%/QtQuick/qsggeometry.h
%%QT_INCDIR%%/QtQuick/qsgmaterial.h
@@ -251,11 +270,11 @@
%%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/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
@@ -286,7 +305,9 @@
%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
%%QT_BINDIR%%/qml
%%QT_BINDIR%%/qmlbundle
+%%QT_BINDIR%%/qmleasing
%%QT_BINDIR%%/qmlimportscanner
+%%QT_BINDIR%%/qmllint
%%QT_BINDIR%%/qmlmin
%%QT_BINDIR%%/qmlplugindump
%%QT_BINDIR%%/qmlprofiler
@@ -299,8 +320,6 @@
%%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
%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so.debug
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so
@@ -316,6 +335,10 @@
%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug
%%QT_QMLDIR%%/QtQml/Models.2/qmldir
+%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug
+%%QT_QMLDIR%%/QtQml/StateMachine/plugins.qmltypes
+%%QT_QMLDIR%%/QtQml/StateMachine/qmldir
%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so.debug
%%QT_QMLDIR%%/QtQuick.2/plugins.qmltypes
Index: x11-toolkits/qt5-quickcontrols/pkg-plist
===================================================================
--- x11-toolkits/qt5-quickcontrols/pkg-plist (revision 377197)
+++ x11-toolkits/qt5-quickcontrols/pkg-plist (working copy)
@@ -15,6 +15,9 @@
%%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/EditMenu.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_base.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_ios.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/FastGlow.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/FocusFrame.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/HoverButton.qml
@@ -31,7 +34,10 @@
%%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/TextHandle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/TextInputWithHandles.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/ToolMenuButton.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Private/style.js
%%QT_QMLDIR%%/QtQuick/Controls/ProgressBar.qml
@@ -44,6 +50,7 @@
%%QT_QMLDIR%%/QtQuick/Controls/StackViewDelegate.qml
%%QT_QMLDIR%%/QtQuick/Controls/StackViewTransition.qml
%%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.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
@@ -95,6 +102,7 @@
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/spinner_small.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/tab.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/tab_selected.png
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ApplicationWindowStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/CalendarStyle.qml
Index: x11-toolkits/qt5-widgets/Makefile
===================================================================
--- x11-toolkits/qt5-widgets/Makefile (revision 377197)
+++ x11-toolkits/qt5-widgets/Makefile (working copy)
@@ -17,8 +17,7 @@
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-MORE_WRKSRCS= src/plugins/accessible/${PORTNAME} \
- src/tools/uic
+MORE_WRKSRCS= src/tools/uic
QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC
QT_CONFIG= accessibility accessibility-atspi-bridge xlib
@@ -45,11 +44,6 @@
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-post-build:
- @cd ${WRKSRC}/src/plugins/accessible/${PORTNAME} && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
- ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-
post-install:
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
Index: x11-toolkits/qt5-widgets/pkg-plist
===================================================================
--- x11-toolkits/qt5-widgets/pkg-plist (revision 377197)
+++ x11-toolkits/qt5-widgets/pkg-plist (working copy)
@@ -3,6 +3,7 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractscrollarea_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractslider_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractspinbox_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaction_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qandroidstyle_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qapplication_p.h
@@ -9,7 +10,6 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasickeyeventtransition_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasicmouseeventtransition_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbsptree_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcalendartextnavigator_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolordialog_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnview_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnviewgrip_p.h
@@ -18,7 +18,7 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcommonstylepixmaps_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcompleter_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdatetimeedit_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_qpa_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdialog_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockarealayout_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockwidget_p.h
@@ -75,7 +75,6 @@
%%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
@@ -116,7 +115,7 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetresizehandler_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_qpa_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowcontainer_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p_p.h
@@ -136,7 +135,45 @@
%%QT_INCDIR%%/QtWidgets/QAbstractScrollArea
%%QT_INCDIR%%/QtWidgets/QAbstractSlider
%%QT_INCDIR%%/QtWidgets/QAbstractSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractScrollArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSlider
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleCalendarWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleComboBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleDial
+%%QT_INCDIR%%/QtWidgets/QAccessibleDialogButtonBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleDisplay
+%%QT_INCDIR%%/QtWidgets/QAccessibleDockWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleDoubleSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleGroupBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleLineEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleMainWindow
+%%QT_INCDIR%%/QtWidgets/QAccessibleMdiArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleMdiSubWindow
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenu
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenuBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenuItem
+%%QT_INCDIR%%/QtWidgets/QAccessiblePlainTextEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleProgressBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleScrollArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleScrollBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleSlider
+%%QT_INCDIR%%/QtWidgets/QAccessibleSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleStackedWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleTabBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleTable
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableCell
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableCornerButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableHeaderCell
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextBrowser
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleToolBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleToolButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleTree
%%QT_INCDIR%%/QtWidgets/QAccessibleWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleWindowContainer
%%QT_INCDIR%%/QtWidgets/QAction
%%QT_INCDIR%%/QtWidgets/QActionGroup
%%QT_INCDIR%%/QtWidgets/QApplication
@@ -240,6 +277,7 @@
%%QT_INCDIR%%/QtWidgets/QMenuBar
%%QT_INCDIR%%/QtWidgets/QMessageBox
%%QT_INCDIR%%/QtWidgets/QMouseEventTransition
+%%QT_INCDIR%%/QtWidgets/QOpenGLWidget
%%QT_INCDIR%%/QtWidgets/QPanGesture
%%QT_INCDIR%%/QtWidgets/QPinchGesture
%%QT_INCDIR%%/QtWidgets/QPlainTextDocumentLayout
@@ -349,6 +387,8 @@
%%QT_INCDIR%%/QtWidgets/QtWidgets
%%QT_INCDIR%%/QtWidgets/QtWidgetsDepends
%%QT_INCDIR%%/QtWidgets/QtWidgetsVersion
+%%QT_INCDIR%%/QtWidgets/complexwidgets.h
+%%QT_INCDIR%%/QtWidgets/itemviews.h
%%QT_INCDIR%%/QtWidgets/qabstractbutton.h
%%QT_INCDIR%%/QtWidgets/qabstractitemdelegate.h
%%QT_INCDIR%%/QtWidgets/qabstractitemview.h
@@ -355,7 +395,9 @@
%%QT_INCDIR%%/QtWidgets/qabstractscrollarea.h
%%QT_INCDIR%%/QtWidgets/qabstractslider.h
%%QT_INCDIR%%/QtWidgets/qabstractspinbox.h
+%%QT_INCDIR%%/QtWidgets/qaccessiblemenu.h
%%QT_INCDIR%%/QtWidgets/qaccessiblewidget.h
+%%QT_INCDIR%%/QtWidgets/qaccessiblewidgets.h
%%QT_INCDIR%%/QtWidgets/qaction.h
%%QT_INCDIR%%/QtWidgets/qactiongroup.h
%%QT_INCDIR%%/QtWidgets/qapplication.h
@@ -428,6 +470,7 @@
%%QT_INCDIR%%/QtWidgets/qmenubar.h
%%QT_INCDIR%%/QtWidgets/qmessagebox.h
%%QT_INCDIR%%/QtWidgets/qmouseeventtransition.h
+%%QT_INCDIR%%/QtWidgets/qopenglwidget.h
%%QT_INCDIR%%/QtWidgets/qplaintextedit.h
%%QT_INCDIR%%/QtWidgets/qprogressbar.h
%%QT_INCDIR%%/QtWidgets/qprogressdialog.h
@@ -478,11 +521,12 @@
%%QT_INCDIR%%/QtWidgets/qwidgetaction.h
%%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h
%%QT_INCDIR%%/QtWidgets/qwizard.h
+%%QT_INCDIR%%/QtWidgets/rangecontrols.h
+%%QT_INCDIR%%/QtWidgets/simplewidgets.h
%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake
%%QT_LIBDIR%%/libQt5Widgets.prl
%%QT_LIBDIR%%/libQt5Widgets.so
%%QT_LIBDIR%%/libQt5Widgets.so.5
@@ -492,7 +536,5 @@
%%QT_BINDIR%%/uic
%%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
%%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
-%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so
-%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so.debug
libdata/pkgconfig/Qt5Widgets.pc
share/pixmaps/qt5logo.png
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
