On Thu Nov 09, 2023 at 08:52:17AM +0100, Rafael Sadowski wrote:
> On Tue Nov 07, 2023 at 08:13:06AM +0100, Rafael Sadowski wrote:
> > qtbase-5.15.11pl138. I still have to test an pkg_add -u update with it
> > but it should actually work.
>
> env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D unsigned
> qtbase-5.15.11p0->5.15.11pl138
>
> >
> > What has changed in the port?
> >
> > - Upstream Qt project ships which a "includes" directory in the tarball.
> > Qt*/KDE repository does not contain the include directory.
> > We have to run syncqt.pl so I added QT5_GEN_INCLUDES.
> > - Looks like mapbox-gl-native is an Qt upstream tarball thing. It's not
> > present in the source code. A lot has changed here. But only on the
> > plugin side.
> > - I went through all shared libs and adjusted them.
> > - Some cosmetic corrections.
> >
> > What do you think? I would like to play it safe with a bulk build.
> >
>
> Another small fix (s/MODQT5_SYNCQT_BIN/QT5_SYNCQT_BIN leftover form a
> previous version)
>
Yet another diff that includes a fix for meta/qt5. I introduced
MODQT5_NEXT_VERSION in the qt module to use it in meta package.
An installation runs smoothly.
Rafael
diff --git a/meta/qt5/Makefile b/meta/qt5/Makefile
index a189c3604f5..5d938f6d0c1 100644
--- a/meta/qt5/Makefile
+++ b/meta/qt5/Makefile
@@ -4,6 +4,8 @@ COMMENT-examples = examples for Qt5, meta-package
PKGNAME = qt5-${MODQT5_VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-examples = qt5-examples-${MODQT5_VERSION}
+REVISION-examples = 0
+REVISION-main = 0
MULTI_PACKAGES = -main -examples
@@ -14,66 +16,66 @@ MODQT5_USE_CXX11 = No
WANTLIB-main =
LIB_DEPENDS-main =
RUN_DEPENDS-main = \
- x11/qt5/qt3d,-main=${MODQT5_VERSION} \
- x11/qt5/qtbase,-main=${MODQT5_VERSION} \
- x11/qt5/qtcharts,-main=${MODQT5_VERSION} \
- x11/qt5/qtdatavis3d,-main=${MODQT5_VERSION} \
- x11/qt5/qtdeclarative,-main=${MODQT5_VERSION} \
- x11/qt5/qtgamepad,-main=${MODQT5_VERSION} \
- x11/qt5/qtgraphicaleffects=${MODQT5_VERSION} \
- x11/qt5/qtimageformats=${MODQT5_VERSION} \
- x11/qt5/qtlocation,-main=${MODQT5_VERSION} \
- x11/qt5/qtlottie=${MODQT5_VERSION} \
- x11/qt5/qtmultimedia,-main=${MODQT5_VERSION} \
- x11/qt5/qtnetworkauth,-main=${MODQT5_VERSION} \
- x11/qt5/qtpurchasing,-main=${MODQT5_VERSION} \
- x11/qt5/qtquickcontrols,-main=${MODQT5_VERSION} \
- x11/qt5/qtquickcontrols2,-main=${MODQT5_VERSION} \
- x11/qt5/qtremoteobjects,-main=${MODQT5_VERSION} \
- x11/qt5/qtscript,-main=${MODQT5_VERSION} \
- x11/qt5/qtscxml,-main=${MODQT5_VERSION} \
- x11/qt5/qtsensors,-main=${MODQT5_VERSION} \
- x11/qt5/qtserialbus,-main=${MODQT5_VERSION} \
- x11/qt5/qtserialport,-main=${MODQT5_VERSION} \
- x11/qt5/qtspeech,-main=${MODQT5_VERSION} \
- x11/qt5/qtsvg,-main=${MODQT5_VERSION} \
- x11/qt5/qttools,-main=${MODQT5_VERSION} \
- x11/qt5/qttranslations=${MODQT5_VERSION} \
- x11/qt5/qtvirtualkeyboard,-main=${MODQT5_VERSION} \
- x11/qt5/qtwebchannel,-main=${MODQT5_VERSION} \
- x11/qt5/qtwayland=${MODQT5_VERSION} \
+
x11/qt5/qt3d,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtbase,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtcharts,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtdatavis3d,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtdeclarative,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtgamepad,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtgraphicaleffects>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtimageformats>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtlocation,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtlottie>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtmultimedia,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtnetworkauth,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtpurchasing,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtquickcontrols,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtquickcontrols2,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtremoteobjects,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtscript,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtscxml,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtsensors,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtserialbus,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtserialport,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtspeech,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtsvg,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qttools,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qttranslations>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtvirtualkeyboard,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtwebchannel,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtwayland>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
x11/qt5/qtwebkit \
- x11/qt5/qtwebsockets,-main=${MODQT5_VERSION} \
- x11/qt5/qtx11extras=${MODQT5_VERSION} \
- x11/qt5/qtxmlpatterns,-main=${MODQT5_VERSION}
+
x11/qt5/qtwebsockets,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtx11extras>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtxmlpatterns,-main>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION}
WANTLIB-examples =
LIB_DEPENDS-examples =
RUN_DEPENDS-examples = \
- x11/qt5/qt3d,-examples=${MODQT5_VERSION} \
- x11/qt5/qtbase,-examples=${MODQT5_VERSION} \
- x11/qt5/qtcharts,-examples=${MODQT5_VERSION} \
- x11/qt5/qtdatavis3d,-examples=${MODQT5_VERSION} \
- x11/qt5/qtdeclarative,,-examples=${MODQT5_VERSION} \
- x11/qt5/qtgamepad,-examples=${MODQT5_VERSION} \
- x11/qt5/qtlocation,-examples=${MODQT5_VERSION} \
- x11/qt5/qtmultimedia,,-examples=${MODQT5_VERSION} \
- x11/qt5/qtnetworkauth,-examples=${MODQT5_VERSION} \
- x11/qt5/qtpurchasing,-examples=${MODQT5_VERSION} \
- x11/qt5/qtquickcontrols,-examples=${MODQT5_VERSION} \
- x11/qt5/qtquickcontrols2,-examples=${MODQT5_VERSION} \
- x11/qt5/qtremoteobjects,-examples=${MODQT5_VERSION} \
- x11/qt5/qtscript,-examples=${MODQT5_VERSION} \
- x11/qt5/qtscxml,-examples=${MODQT5_VERSION} \
- x11/qt5/qtsensors,-examples=${MODQT5_VERSION} \
- x11/qt5/qtserialbus,-examples=${MODQT5_VERSION} \
- x11/qt5/qtserialport,-examples=${MODQT5_VERSION} \
- x11/qt5/qtspeech,-examples=${MODQT5_VERSION} \
- x11/qt5/qtsvg,-examples=${MODQT5_VERSION} \
- x11/qt5/qttools,,-examples=${MODQT5_VERSION} \
- x11/qt5/qtvirtualkeyboard,-examples=${MODQT5_VERSION} \
- x11/qt5/qtwebchannel,-examples=${MODQT5_VERSION} \
- x11/qt5/qtwebsockets,-examples=${MODQT5_VERSION} \
- x11/qt5/qtxmlpatterns,-examples=${MODQT5_VERSION}
+
x11/qt5/qt3d,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtbase,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtcharts,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtdatavis3d,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtdeclarative,,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtgamepad,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtlocation,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtmultimedia,,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtnetworkauth,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtpurchasing,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtquickcontrols,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtquickcontrols2,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtremoteobjects,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtscript,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtscxml,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtsensors,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtserialbus,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtserialport,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtspeech,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtsvg,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qttools,,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtvirtualkeyboard,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtwebchannel,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtwebsockets,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION} \
+
x11/qt5/qtxmlpatterns,-examples>=${MODQT5_VERSION},<${MODQT5_NEXT_VERSION}
.include <bsd.port.mk>
diff --git a/x11/qt5/Makefile.inc b/x11/qt5/Makefile.inc
index b2a1323284b..1e9fcf76e87 100644
--- a/x11/qt5/Makefile.inc
+++ b/x11/qt5/Makefile.inc
@@ -10,11 +10,19 @@ FIX_EXTRACT_PERMISSIONS = Yes
VERSION ?= ${QT5_VERSION}
DIST_VERSION ?= ${QT5_DIST_VERSION}
NEXT_VERSION ?= ${QT5_NEXT_VERSION}
+
+.if defined(KDE_VERSION)
+QT5_KDE_VERSION = ${QT5_VERSION}pl${KDE_VERSION}
+PKGNAME ?= ${QT5NAME:L}-${QT5_KDE_VERSION}
+.else
+DISTNAME ?= ${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
+PKGNAME ?=
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
+.endif
+
DISTNAME ?= ${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
MAINTAINER ?= Rafael Sadowski <rsadow...@openbsd.org>
-PKGNAME ?=
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
PKGNAME-main ?= ${PKGNAME}
PKGNAME-examples ?= ${PKGNAME:C/(-[0-9])/-examples\1/}
@@ -40,8 +48,13 @@ RUN_DEPENDS-examples +=
${BUILD_PKGPATH},-main>=${VERSION:R},<${NEXT_VERSION}
# A few components, including QtWebEngine, are LGPLv3 only, no LGPLv2.1.
PERMIT_PACKAGE ?= Yes
+.if defined(KDE_VERSION) && defined(KDE_COMMIT)
+DIST_TUPLE = kde qt qt/${QT5NAME:L} ${KDE_COMMIT} .
+.else
SITES ?=
https://download.qt.io/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
\
https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
+.endif
+
DIST_SUBDIR ?= qt
EXTRACT_SUFX ?= .tar.xz
@@ -64,7 +77,11 @@ MAKE_FLAGS = -B -j ${MAKE_JOBS} \
MAKE_FLAGS += LIB${_l}_VERSION=${_v}
.endfor
+.if defined(KDE_COMMIT)
+WRKDIST = ${WRKDIR}/${QT5NAME:L}-${KDE_COMMIT}
+.else
WRKDIST ?= ${WRKDIR}/${DISTNAME:S/opensource-//}
+.endif
# qmake supports so-called "shadow" builds: it's like normal
# out-of-source build but build directory is required to be located
@@ -96,6 +113,10 @@ ALL_TARGET ?= first
FAKE_TARGET ?= install
TEST_TARGET ?= check
+QT5_SYNCQT_BIN ?= ${LOCALBASE}/lib/qt5/bin/syncqt.pl
+QT5_GEN_INCLUDES = cd ${WRKDIST} && \
+ ${SETENV} ${QT5_SYNCQT_BIN} -version ${MODQT5_VERSION} -quiet ${WRKDIST}
+
.include <bsd.port.arch.mk>
FLAVOR ?=
diff --git a/x11/qt5/Makefile.version b/x11/qt5/Makefile.version
index 364e4985643..cfe9c189b0c 100644
--- a/x11/qt5/Makefile.version
+++ b/x11/qt5/Makefile.version
@@ -2,7 +2,7 @@
QT5_VERSION = 5.15.11
QT5_WEBENGINE_VERSION = 5.15.10
-QT5_DIST_VERSION = 5.15.11
+QT5_DIST_VERSION ?= 5.15.11
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk
index f7e6b5e8e48..2115f090dfb 100644
--- a/x11/qt5/qt5.port.mk
+++ b/x11/qt5/qt5.port.mk
@@ -180,6 +180,7 @@ SUBST_VARS += MODQT5_COMMENT
.include "Makefile.version"
MODQT5_VERSION = ${QT5_VERSION}
+MODQT5_NEXT_VERSION = ${QT5_NEXT_VERSION}
MODQT_VERSION ?= ${MODQT5_VERSION}
show_deps: patch
diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile
index c7d38713f75..fe16229375c 100644
--- a/x11/qt5/qtbase/Makefile
+++ b/x11/qt5/qtbase/Makefile
@@ -1,5 +1,7 @@
-DISTNAME = qtbase-everywhere-opensource-src-${DIST_VERSION}
-QT5NAME = Qt5 core
+QT5NAME = QtBase
+
+KDE_COMMIT = ea7a183732c17005f08ca14fd70cdd305c90396d
+KDE_VERSION = 138
COMMENT-main = C++ general-purpose toolkit
COMMENT-global = global Qt5 documentation internals
@@ -7,28 +9,26 @@ COMMENT-mysql = MySQL plugin for Qt5
COMMENT-psql = PostgresSQL plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
-PKGNAME-mysql = qt5-mysql-${VERSION}
-PKGNAME-global = qt5-global-${VERSION}
-PKGNAME-psql = qt5-postgresql-${VERSION}
-PKGNAME-tds = qt5-tds-${VERSION}
+PKGNAME-mysql = qt5-mysql-${QT5_KDE_VERSION}
+PKGNAME-global = qt5-global-${QT5_KDE_VERSION}
+PKGNAME-psql = qt5-postgresql-${QT5_KDE_VERSION}
+PKGNAME-tds = qt5-tds-${QT5_KDE_VERSION}
PKG_ARCH-global = *
PKG_ARCH-examples = *
-REVISION-main = 0
-
DPB_PROPERTIES = parallel
SHARED_LIBS += Qt5Concurrent 4.1 # 5.15
SHARED_LIBS += Qt5Core 5.0 # 5.15
SHARED_LIBS += Qt5DBus 3.0 # 5.15
-SHARED_LIBS += Qt5Gui 4.0 # 5.15
+SHARED_LIBS += Qt5Gui 4.1 # 5.15
SHARED_LIBS += Qt5Network 4.0 # 5.15
SHARED_LIBS += Qt5OpenGL 3.0 # 5.15
SHARED_LIBS += Qt5PrintSupport 3.0 # 5.15
SHARED_LIBS += Qt5Sql 3.0 # 5.15
SHARED_LIBS += Qt5Test 3.1 # 5.15
-SHARED_LIBS += Qt5Widgets 4.0 # 5.15
+SHARED_LIBS += Qt5Widgets 4.1 # 5.15
SHARED_LIBS += Qt5Xml 3.0 # 5.15
SHARED_LIBS += Qt5EglFSDeviceIntegration 1.0 # 5.15
SHARED_LIBS += Qt5EglFsKmsSupport 1.0 # 5.15
@@ -61,7 +61,7 @@ MULTI_PACKAGES = -main -examples -global -mysql -psql
-tds
# qmake module is used only for running tests and setting vars
MODQT_DEPS = No
-MODQMAKE_PROJECTS = tests/tests.pro
+MODQMAKE_PROJECTS = src/tools/bootstrap src/corelib src/tools/qlalr
USE_GMAKE = Yes
# no leveldb dependency, requires -lmemenv; QtWebKit uses internal version
@@ -141,7 +141,7 @@ CONFIGURE_ARGS += -confirm-license \
-verbose
# We have to wait until arm64 is vulkan ready.
-#BUILD_DEPENDS = graphics/vulkan-loader
+#BUILD_DEPENDS = graphics/vulkan-loader
CONFIGURE_ARGS += -no-vulkan
# Let's wait a little until we have more experience and test results
@@ -233,6 +233,12 @@ CONFIGURE_ARGS += -platform openbsd-g++
# See qtbase/tests/README for details
TEST_IS_INTERACTIVE = X11
+WRKDIST = ${WRKDIR}/qtbase-${KDE_COMMIT}
+
+QT5_SYNCQT_BIN = ${WRKDIST}/bin/syncqt.pl
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
post-extract:
mkdir -p ${WRKDIST}/mkspecs/openbsd-{clang,g++}
cp ${FILESDIR}/clang-qmake.conf \
diff --git a/x11/qt5/qtbase/distinfo b/x11/qt5/qtbase/distinfo
index 50382d949f1..eb97bed919d 100644
--- a/x11/qt5/qtbase/distinfo
+++ b/x11/qt5/qtbase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-opensource-src-5.15.11.tar.xz) =
QlrTAazZHKZsEMDavuBwTi0M0oAaa2cBFYAMu5X4SEY=
-SIZE (qt/qtbase-everywhere-opensource-src-5.15.11.tar.xz) = 50825756
+SHA256 (qt/qt-qt/qtbase-ea7a183732c17005f08ca14fd70cdd305c90396d.tar.gz) =
0booh2SMGeZ5NOx0dvyrF+koEqXjpNAWk8yNchqiIOk=
+SIZE (qt/qt-qt/qtbase-ea7a183732c17005f08ca14fd70cdd305c90396d.tar.gz) =
68763263
diff --git a/x11/qt5/qtbase/patches/patch-src_gui_configure_json
b/x11/qt5/qtbase/patches/patch-src_gui_configure_json
deleted file mode 100644
index 60e73ad2d1e..00000000000
--- a/x11/qt5/qtbase/patches/patch-src_gui_configure_json
+++ /dev/null
@@ -1,27 +0,0 @@
-EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
-code out there, including Qt:
-https://github.com/KhronosGroup/EGL-Registry/pull/130
-
-Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
-
-Fixes: QTBUG-96392
-Pick-to: 6.2
-Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
-Reviewed-by: default avatarAndy Nichols <andy.nich...@qt.io>
-(cherry picked from commit 4cc54285)
-
-https://invent.kde.org/qt/qt/qtbase/-/commit/7a44796c813ab9661a68d42a67c18759d0a3f9ed
-
-Index: src/gui/configure.json
---- src/gui/configure.json.orig
-+++ src/gui/configure.json
-@@ -834,7 +834,8 @@
- "// embedded devices, are not intended to be used
together with X. EGL support",
- "// has to be disabled in plugins like xcb in this case
since the native display,",
- "// window and pixmap types will be different than what
an X-based platform",
-- "// plugin would expect."
-+ "// plugin would expect.",
-+ "#define USE_X11"
- ],
- "include": [ "EGL/egl.h", "X11/Xlib.h" ],
- "main": [
diff --git
a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
index b9a9ef23e66..5d8eb1df8e5 100644
--- a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
+++ b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslcontext_openssl_cpp
@@ -13,36 +13,7 @@ Index: src/network/ssl/qsslcontext_openssl.cpp
const long anyVersion =
#if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
- maxVersion = DTLS1_VERSION;
- break;
- case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
- minVersion = DTLS1_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
- break;
- case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS1_2_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
- break;
- case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
- break;
- case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -722,6 +724,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
@@ -50,7 +21,7 @@ Index: src/network/ssl/qsslcontext_openssl.cpp
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(),
&q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -768,7 +771,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
sslContext->errorStr =
msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
diff --git
a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
index dedbc1eb238..af8c5ac8422 100644
---
a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
+++
b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
@@ -63,7 +63,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return
nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return
nullptr, return)
-@@ -872,16 +891,21 @@ bool q_resolveOpenSslSymbols()
+@@ -870,16 +889,21 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free)
RESOLVEFUNC(EVP_PKEY_up_ref)
@@ -85,7 +85,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp
RESOLVEFUNC(DH_get0_pqg)
RESOLVEFUNC(SSL_CTX_set_options)
RESOLVEFUNC(SSL_CTX_get_security_level)
-@@ -1097,6 +1121,7 @@ bool q_resolveOpenSslSymbols()
+@@ -1095,6 +1119,7 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
@@ -93,7 +93,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols.cpp
RESOLVEFUNC(SSL_CTX_get_cert_store);
RESOLVEFUNC(SSL_CONF_CTX_new);
RESOLVEFUNC(SSL_CONF_CTX_free);
-@@ -1104,6 +1129,7 @@ bool q_resolveOpenSslSymbols()
+@@ -1102,6 +1127,7 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CONF_CTX_set_flags);
RESOLVEFUNC(SSL_CONF_CTX_finish);
RESOLVEFUNC(SSL_CONF_cmd);
diff --git
a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
index 1b825101708..13369df04cb 100644
---
a/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
+++
b/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
@@ -65,7 +65,7 @@ Index: src/network/ssl/qsslsocket_openssl_symbols_p.h
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -764,8 +791,14 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
+@@ -761,8 +788,14 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
void *q_CRYPTO_malloc(size_t num, const char *file, int line);
#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
diff --git
a/x11/qt5/qtbase/patches/patch-src_platformsupport_eglconvenience_qt_egl_p_h
b/x11/qt5/qtbase/patches/patch-src_platformsupport_eglconvenience_qt_egl_p_h
deleted file mode 100644
index ca9dd440ae5..00000000000
--- a/x11/qt5/qtbase/patches/patch-src_platformsupport_eglconvenience_qt_egl_p_h
+++ /dev/null
@@ -1,30 +0,0 @@
-EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
-code out there, including Qt:
-https://github.com/KhronosGroup/EGL-Registry/pull/130
-
-Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
-
-Fixes: QTBUG-96392
-Pick-to: 6.2
-Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
-Reviewed-by: default avatarAndy Nichols <andy.nich...@qt.io>
-(cherry picked from commit 4cc54285)
-
-https://invent.kde.org/qt/qt/qtbase/-/commit/7a44796c813ab9661a68d42a67c18759d0a3f9ed
-
-Index: src/platformsupport/eglconvenience/qt_egl_p.h
---- src/platformsupport/eglconvenience/qt_egl_p.h.orig
-+++ src/platformsupport/eglconvenience/qt_egl_p.h
-@@ -61,7 +61,11 @@
- # if !defined(Q_OS_INTEGRITY)
- # define WIN_INTERFACE_CUSTOM // NV
- # endif // Q_OS_INTEGRITY
--#endif // QT_EGL_NO_X11
-+#else // QT_EGL_NO_X11
-+// If one has an eglplatform.h with
https://github.com/KhronosGroup/EGL-Registry/pull/130
-+// that needs USE_X11 to be defined.
-+# define USE_X11
-+#endif
-
- #ifdef QT_EGL_WAYLAND
- # define WAYLAND // NV
diff --git
a/x11/qt5/qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon_cpp
b/x11/qt5/qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon_cpp
deleted file mode 100644
index ac7c62c6b8a..00000000000
---
a/x11/qt5/qtbase/patches/patch-src_platformsupport_input_xkbcommon_qxkbcommon_cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang...@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-
-Index: src/platformsupport/input/xkbcommon/qxkbcommon.cpp
---- src/platformsupport/input/xkbcommon/qxkbcommon.cpp.orig
-+++ src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-@@ -273,10 +273,14 @@ static constexpr const auto KeyTbl = qMakeArray(
- Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
- Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
- Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+ The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
- Xkb2Qt<XKB_KEY_dead_aboveverticalline,
Qt::Key_Dead_Aboveverticalline>,
- Xkb2Qt<XKB_KEY_dead_belowverticalline,
Qt::Key_Dead_Belowverticalline>,
- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay,
Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
-
- // Special keys from X.org - This include multimedia keys,
- // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/x11/qt5/qtbase/pkg/PLIST-main b/x11/qt5/qtbase/pkg/PLIST-main
index 578e67bc631..d35c2ecdc04 100644
--- a/x11/qt5/qtbase/pkg/PLIST-main
+++ b/x11/qt5/qtbase/pkg/PLIST-main
@@ -767,6 +767,7 @@ include/X11/qt5/QtCore/qtimer.h
include/X11/qt5/QtCore/qtimezone.h
include/X11/qt5/QtCore/qtranslator.h
include/X11/qt5/QtCore/qtransposeproxymodel.h
+include/X11/qt5/QtCore/qtsan_impl.h
include/X11/qt5/QtCore/qtypeinfo.h
include/X11/qt5/QtCore/qtypetraits.h
include/X11/qt5/QtCore/qurl.h
diff --git a/x11/qt5/qtconnectivity/Makefile b/x11/qt5/qtconnectivity/Makefile
index 335feb5520b..7a98b50616a 100644
--- a/x11/qt5/qtconnectivity/Makefile
+++ b/x11/qt5/qtconnectivity/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtConnectivity
COMMENT-main = Bluetooth and NFC support for Qt5
+KDE_COMMIT = e33b82889625b6a72e0be91c5023a30d53136a80
+KDE_VERSION = 6
+
SHARED_LIBS += Qt5Bluetooth 3.0 # 5.9
SHARED_LIBS += Qt5Nfc 3.0 # 5.9
@@ -17,4 +20,7 @@ FLAVORS = debug
MODQMAKE_RECURSIVE = No
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtconnectivity/distinfo b/x11/qt5/qtconnectivity/distinfo
index c4cf93d9930..f11f53ad5b9 100644
--- a/x11/qt5/qtconnectivity/distinfo
+++ b/x11/qt5/qtconnectivity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtconnectivity-everywhere-opensource-src-5.15.11.tar.xz) =
MefS1cLP66n7qSG4WIvIOffggfYb+dm/TXU/byXsIXg=
-SIZE (qt/qtconnectivity-everywhere-opensource-src-5.15.11.tar.xz) = 2829704
+SHA256
(qt/qt-qt/qtconnectivity-e33b82889625b6a72e0be91c5023a30d53136a80.tar.gz) =
1ktU7lwXfqqHEW/VV85pLgJjymfBdqTXpzg6o9QvTsE=
+SIZE (qt/qt-qt/qtconnectivity-e33b82889625b6a72e0be91c5023a30d53136a80.tar.gz)
= 3433440
diff --git a/x11/qt5/qtdeclarative/Makefile b/x11/qt5/qtdeclarative/Makefile
index 43be253305b..874ab3e824e 100644
--- a/x11/qt5/qtdeclarative/Makefile
+++ b/x11/qt5/qtdeclarative/Makefile
@@ -1,16 +1,19 @@
QT5NAME = QtDeclarative
COMMENT-main = Qt5 Quick and QML components
+KDE_COMMIT = 453b1cb207cf3ce35b906c21c9f04a17d66074a7
+KDE_VERSION = 31
+
MULTI_PACKAGES = -main -examples
DPB_PROPERTIES = parallel
-SHARED_LIBS = Qt5Qml 3.4 # 5.9
-SHARED_LIBS += Qt5Quick 6.0 # 5.9
+SHARED_LIBS = Qt5Qml 4.0 # 5.9
+SHARED_LIBS += Qt5Quick 6.1 # 5.9
SHARED_LIBS += Qt5QuickParticles 3.0 # 5.9
SHARED_LIBS += Qt5QuickTest 3.0 # 5.9
SHARED_LIBS += Qt5QuickWidgets 3.0 # 5.9
SHARED_LIBS += Qt5QuickShapes 0.0 # 5.13
-SHARED_LIBS += Qt5QmlModels 0.0 # 5.15
+SHARED_LIBS += Qt5QmlModels 0.1 # 5.15
SHARED_LIBS += Qt5QmlWorkerScript 0.0 # 5.15
WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Sql
@@ -51,5 +54,6 @@ MODQMAKE_RECURSIVE = No
pre-configure:
# Python is used for building, this path does not get into final packages.
ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
+ ${QT5_GEN_INCLUDES}
.include <bsd.port.mk>
diff --git a/x11/qt5/qtdeclarative/distinfo b/x11/qt5/qtdeclarative/distinfo
index 4f105394ca1..805116a1e52 100644
--- a/x11/qt5/qtdeclarative/distinfo
+++ b/x11/qt5/qtdeclarative/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz) =
SR6Ec4CO48VwAIGmjMIJX+5r0+NtoH5ESjfy5dqkMsg=
-SIZE (qt/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz) = 21601640
+SHA256
(qt/qt-qt/qtdeclarative-453b1cb207cf3ce35b906c21c9f04a17d66074a7.tar.gz) =
Ye+rrgTRmjYq/NSp4ME8qG3np9sl9dNkmPMFMl79VK8=
+SIZE (qt/qt-qt/qtdeclarative-453b1cb207cf3ce35b906c21c9f04a17d66074a7.tar.gz)
= 24414595
diff --git a/x11/qt5/qtdeclarative/pkg/PLIST-main
b/x11/qt5/qtdeclarative/pkg/PLIST-main
index 72b34a6bf6e..55e2d431a6b 100644
--- a/x11/qt5/qtdeclarative/pkg/PLIST-main
+++ b/x11/qt5/qtdeclarative/pkg/PLIST-main
@@ -782,6 +782,8 @@ include/X11/qt5/QtQuickWidgets/
include/X11/qt5/QtQuickWidgets/${VERSION}/
include/X11/qt5/QtQuickWidgets/${VERSION}/QtQuickWidgets/
include/X11/qt5/QtQuickWidgets/${VERSION}/QtQuickWidgets/private/
+include/X11/qt5/QtQuickWidgets/${VERSION}/QtQuickWidgets/private/qaccessiblequickwidget_p.h
+include/X11/qt5/QtQuickWidgets/${VERSION}/QtQuickWidgets/private/qaccessiblequickwidgetfactory_p.h
include/X11/qt5/QtQuickWidgets/${VERSION}/QtQuickWidgets/private/qquickwidget_p.h
include/X11/qt5/QtQuickWidgets/QQuickWidget
include/X11/qt5/QtQuickWidgets/QtQuickWidgets
diff --git a/x11/qt5/qtimageformats/Makefile b/x11/qt5/qtimageformats/Makefile
index 24bddba695b..faac51d3890 100644
--- a/x11/qt5/qtimageformats/Makefile
+++ b/x11/qt5/qtimageformats/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtImageFormats
COMMENT = support for additional image formats in Qt5
+KDE_COMMIT = b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd
+KDE_VERSION = 12
+
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui jasper m mng tiff
WANTLIB += webp webpdemux webpmux
@@ -11,4 +14,7 @@ LIB_DEPENDS = graphics/jasper \
FLAVORS = debug
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtimageformats/distinfo b/x11/qt5/qtimageformats/distinfo
index 0bf49be18c0..6a2838393c1 100644
--- a/x11/qt5/qtimageformats/distinfo
+++ b/x11/qt5/qtimageformats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.11.tar.xz) =
Evs6FfkntGF45ziR7+0+YzE5l7AlEpzfBT/SEf3JtH8=
-SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.11.tar.xz) = 1869312
+SHA256
(qt/qt-qt/qtimageformats-b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd.tar.gz) =
tG7ahXdyHjfJJNBYZGSHRGT+X2QMonUmTqSEnbc/O9s=
+SIZE (qt/qt-qt/qtimageformats-b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd.tar.gz)
= 2487943
diff --git a/x11/qt5/qtlocation/Makefile b/x11/qt5/qtlocation/Makefile
index 8025429492c..b619c918e44 100644
--- a/x11/qt5/qtlocation/Makefile
+++ b/x11/qt5/qtlocation/Makefile
@@ -1,15 +1,18 @@
QT5NAME = QtLocation
COMMENT-main = Qt5 geo positioning APIs
-SHARED_LIBS += Qt5Location 3.0 # 5.15
+KDE_COMMIT = 48a17e88fc1df5b6ae82a9787466226c830bcbf2
+KDE_VERSION = 5
+
+SHARED_LIBS += Qt5Location 3.1 # 5.15
SHARED_LIBS += Qt5Positioning 3.0 # 5.9
SHARED_LIBS += Qt5PositioningQuick 0.0 # 5.13
MULTI_PACKAGES = -main -examples
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5SerialPort
-WANTLIB += Qt5Sql crypto icudata icui18n icuuc m ssl z
+WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5DBus
+WANTLIB-main += Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5SerialPort
+WANTLIB-main += m
LIB_DEPENDS =
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
x11/qt5/qtserialport>=${QT5_VERSION},<${QT5_NEXT_VERSION}
@@ -20,4 +23,7 @@ FLAVORS = debug
MODQMAKE_RECURSIVE = No
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtlocation/distinfo b/x11/qt5/qtlocation/distinfo
index 16c5dfdb1b1..cb127138ec9 100644
--- a/x11/qt5/qtlocation/distinfo
+++ b/x11/qt5/qtlocation/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.11.tar.xz) =
qjvtjpO11nXE/srF3+H+bFpQvW2N1yvLz/jIgzSEXBQ=
-SIZE (qt/qtlocation-everywhere-opensource-src-5.15.11.tar.xz) = 6554216
+SHA256 (qt/qt-qt/qtlocation-48a17e88fc1df5b6ae82a9787466226c830bcbf2.tar.gz) =
7x+zANRyJFD8B5qBxlVocGGqxm8VYu+2+cjqziQqa3c=
+SIZE (qt/qt-qt/qtlocation-48a17e88fc1df5b6ae82a9787466226c830bcbf2.tar.gz) =
5434007
diff --git
a/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_unique_any_hpp
b/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_unique_any_hpp
deleted file mode 100644
index 723e31804e9..00000000000
---
a/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_unique_any_hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-fix no member named 'forward' and 'move' in namespace 'std'
-
-Index: src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
---- src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp.orig
-+++ src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
-@@ -3,6 +3,7 @@
- #include <typeinfo>
- #include <type_traits>
- #include <stdexcept>
-+#include <utility>
- namespace mbgl {
- namespace util {
-
diff --git
a/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_platform_default_thread_cpp
b/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_platform_default_thread_cpp
deleted file mode 100644
index 41ea32034e7..00000000000
---
a/x11/qt5/qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_platform_default_thread_cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: src/3rdparty/mapbox-gl-native/platform/default/thread.cpp
---- src/3rdparty/mapbox-gl-native/platform/default/thread.cpp.orig
-+++ src/3rdparty/mapbox-gl-native/platform/default/thread.cpp
-@@ -4,6 +4,7 @@
- #include <string>
-
- #include <pthread.h>
-+#include <pthread_np.h>
- #include <sched.h>
-
- namespace mbgl {
-@@ -11,16 +12,16 @@ namespace platform {
-
- std::string getCurrentThreadName() {
- char name[32] = "unknown";
-- pthread_getname_np(pthread_self(), name, sizeof(name));
-+ pthread_get_name_np(pthread_self(), name, sizeof(name));
-
- return name;
- }
-
- void setCurrentThreadName(const std::string& name) {
- if (name.size() > 15) { // Linux hard limit (see manpages).
-- pthread_setname_np(pthread_self(), name.substr(0, 15).c_str());
-+ pthread_set_name_np(pthread_self(), name.substr(0, 15).c_str());
- } else {
-- pthread_setname_np(pthread_self(), name.c_str());
-+ pthread_set_name_np(pthread_self(), name.c_str());
- }
- }
-
-@@ -28,9 +29,11 @@ void makeThreadLowPriority() {
- struct sched_param param;
- param.sched_priority = 0;
-
-+ /*
- if (sched_setscheduler(0, SCHED_IDLE, ¶m) != 0) {
- Log::Warning(Event::General, "Couldn't set thread scheduling policy");
- }
-+ */
- }
-
- } // namespace platform
diff --git a/x11/qt5/qtlocation/pkg/PLIST-main
b/x11/qt5/qtlocation/pkg/PLIST-main
index ac46fe4b8c1..6cb5f461bce 100644
--- a/x11/qt5/qtlocation/pkg/PLIST-main
+++ b/x11/qt5/qtlocation/pkg/PLIST-main
@@ -327,7 +327,6 @@ lib/qt5/cmake/Qt5Location/Qt5LocationConfigVersion.cmake
lib/qt5/cmake/Qt5Location/Qt5Location_GeoServiceProviderFactoryEsri.cmake
lib/qt5/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryItemsOverlay.cmake
lib/qt5/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake
-lib/qt5/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapboxGL.cmake
lib/qt5/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake
lib/qt5/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
lib/qt5/cmake/Qt5Positioning/
@@ -362,7 +361,6 @@ lib/qt5/plugins/geoservices/
@so lib/qt5/plugins/geoservices/libqtgeoservices_esri.so
@so lib/qt5/plugins/geoservices/libqtgeoservices_itemsoverlay.so
@so lib/qt5/plugins/geoservices/libqtgeoservices_mapbox.so
-@so lib/qt5/plugins/geoservices/libqtgeoservices_mapboxgl.so
@so lib/qt5/plugins/geoservices/libqtgeoservices_nokia.so
@so lib/qt5/plugins/geoservices/libqtgeoservices_osm.so
lib/qt5/plugins/position/
@@ -370,6 +368,10 @@ lib/qt5/plugins/position/
@so lib/qt5/plugins/position/libqtposition_geoclue2.so
@so lib/qt5/plugins/position/libqtposition_positionpoll.so
@so lib/qt5/plugins/position/libqtposition_serialnmea.so
+lib/qt5/qml/Qt/labs/location/
+@so lib/qt5/qml/Qt/labs/location/liblocationlabsplugin.so
+lib/qt5/qml/Qt/labs/location/plugins.qmltypes
+lib/qt5/qml/Qt/labs/location/qmldir
lib/qt5/qml/QtLocation/
@so lib/qt5/qml/QtLocation/libdeclarative_location.so
lib/qt5/qml/QtLocation/plugins.qmltypes
diff --git a/x11/qt5/qtmultimedia/Makefile b/x11/qt5/qtmultimedia/Makefile
index a37da13be2a..15eeda43c93 100644
--- a/x11/qt5/qtmultimedia/Makefile
+++ b/x11/qt5/qtmultimedia/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtMultimedia
COMMENT-main = Qt5 multimedia components
+KDE_COMMIT = f587b18db4abd68cb6d4d77fbcec1b94c38d2a51
+KDE_VERSION = 2
+
MULTI_PACKAGES = -main -examples
SHARED_LIBS += Qt5Multimedia 3.0 # 5.9
@@ -8,11 +11,11 @@ SHARED_LIBS += Qt5MultimediaWidgets 3.0 # 5.9
SHARED_LIBS += Qt5MultimediaGstTools 0.0 # 5.13
SHARED_LIBS += Qt5MultimediaQuick 0.0 # 5.13
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
-WANTLIB += Qt5Qml Qt5Quick Qt5Widgets glib-2.0 gobject-2.0 gstapp-1.0
-WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstphotography-1.0
-WANTLIB += gstreamer-1.0 gstvideo-1.0 intl m openal pulse pulse-mainloop-glib
-WANTLIB += Qt5QmlModels gstallocators-1.0 gstgl-1.0
+WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
+WANTLIB-main += Qt5QmlModels Qt5Quick Qt5Widgets glib-2.0 gobject-2.0
+WANTLIB-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
+WANTLIB-main += gstgl-1.0 gstpbutils-1.0 gstphotography-1.0 gstreamer-1.0
+WANTLIB-main += gstvideo-1.0 intl m openal pulse pulse-mainloop-glib
BUILD_DEPENDS = multimedia/gstreamer1/mm
@@ -40,4 +43,7 @@ PSEUDO_FLAVORS = bootstrap no_examples
MODQMAKE_ARGS = GST_VERSION=1.0
MODQMAKE_RECURSIVE = No
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtmultimedia/distinfo b/x11/qt5/qtmultimedia/distinfo
index 901c8ea9b06..ee4d3e13ac2 100644
--- a/x11/qt5/qtmultimedia/distinfo
+++ b/x11/qt5/qtmultimedia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz) =
KLo17+kEwF8tKMJ17JvZCgCz9YV0V7vSHG08VcKqUhw=
-SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz) = 3849160
+SHA256 (qt/qt-qt/qtmultimedia-f587b18db4abd68cb6d4d77fbcec1b94c38d2a51.tar.gz)
= NVwiZCQ0HstEaA3X8qM3qqT4mwevsuXIbop+emNNcFg=
+SIZE (qt/qt-qt/qtmultimedia-f587b18db4abd68cb6d4d77fbcec1b94c38d2a51.tar.gz) =
6063974
diff --git a/x11/qt5/qtquickcontrols2/Makefile
b/x11/qt5/qtquickcontrols2/Makefile
index 3d1478ff445..e2e9fe556bd 100644
--- a/x11/qt5/qtquickcontrols2/Makefile
+++ b/x11/qt5/qtquickcontrols2/Makefile
@@ -1,9 +1,12 @@
-QT5NAME = Qt Labs Controls
-DISTNAME = qtquickcontrols2-everywhere-opensource-src-${DIST_VERSION}
+QT5NAME = QtQuickcontrols2
+
COMMENT-main = Qt5 Quick based UI controls from Qt Labs
+KDE_COMMIT = a2d56960dd76c94a5115b5415be5ee174d377718
+KDE_VERSION = 5
+
SHARED_LIBS += Qt5QuickControls2 1.1 # 5.9
-SHARED_LIBS += Qt5QuickTemplates2 2.1 # 5.9
+SHARED_LIBS += Qt5QuickTemplates2 2.2 # 5.9
MULTI_PACKAGES = -main -examples
@@ -16,4 +19,7 @@ FLAVORS = debug
MODQMAKE_RECURSIVE = No
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtquickcontrols2/distinfo
b/x11/qt5/qtquickcontrols2/distinfo
index 2445e5b5a50..047e96336e1 100644
--- a/x11/qt5/qtquickcontrols2/distinfo
+++ b/x11/qt5/qtquickcontrols2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtquickcontrols2-everywhere-opensource-src-5.15.11.tar.xz) =
Jj07h1EAekXtCD68WFtXJVKrNuL9woRomU/ynzhMatI=
-SIZE (qt/qtquickcontrols2-everywhere-opensource-src-5.15.11.tar.xz) = 8294208
+SHA256
(qt/qt-qt/qtquickcontrols2-a2d56960dd76c94a5115b5415be5ee174d377718.tar.gz) =
BidHaWWNNWWaZ7p4R5LVF6FNkAirbCry2lvTwb4M2Os=
+SIZE
(qt/qt-qt/qtquickcontrols2-a2d56960dd76c94a5115b5415be5ee174d377718.tar.gz) =
9256883
diff --git a/x11/qt5/qtspeech/Makefile b/x11/qt5/qtspeech/Makefile
index 6251d37e181..d4aacca3f4d 100644
--- a/x11/qt5/qtspeech/Makefile
+++ b/x11/qt5/qtspeech/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtSpeech
COMMENT-main = Qt5 text-to-speech components
+KDE_COMMIT = 3b163bfd46d96bc9ee848dcee49e9cabe6699287
+KDE_VERSION = 1
+
MULTI_PACKAGES = -main -examples
SHARED_LIBS += Qt5TextToSpeech 1.0 # 5.9
@@ -18,4 +21,7 @@ LIB_DEPENDS = audio/speech-dispatcher
FLAVORS = debug
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtspeech/distinfo b/x11/qt5/qtspeech/distinfo
index ac0c9a95789..f7944442efd 100644
--- a/x11/qt5/qtspeech/distinfo
+++ b/x11/qt5/qtspeech/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.11.tar.xz) =
Pg6bLfZWuGwYoA90qhI6o6qFTAsHz83pf/Tx7C5wpC0=
-SIZE (qt/qtspeech-everywhere-opensource-src-5.15.11.tar.xz) = 104996
+SHA256 (qt/qt-qt/qtspeech-3b163bfd46d96bc9ee848dcee49e9cabe6699287.tar.gz) =
7dIv1/FkUvr/2b59mBE1NNrYlicCTsgL9l+yWKd3YOM=
+SIZE (qt/qt-qt/qtspeech-3b163bfd46d96bc9ee848dcee49e9cabe6699287.tar.gz) =
93380
diff --git a/x11/qt5/qtsvg/Makefile b/x11/qt5/qtsvg/Makefile
index 2915a65dfc3..64639edfa18 100644
--- a/x11/qt5/qtsvg/Makefile
+++ b/x11/qt5/qtsvg/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtSVG
COMMENT-main = SVG support for Qt5
+KDE_COMMIT = 7d6e373c7db9c05ef586db0eb50c87cd894229ad
+KDE_VERSION = 6
+
DPB_PROPERTIES = parallel
SHARED_LIBS = Qt5Svg 3.0 # 5.9
@@ -11,4 +14,7 @@ MULTI_PACKAGES = -main -examples
FLAVORS = debug
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtsvg/distinfo b/x11/qt5/qtsvg/distinfo
index b25298a73fd..de22465876d 100644
--- a/x11/qt5/qtsvg/distinfo
+++ b/x11/qt5/qtsvg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.11.tar.xz) =
2oDI8IQlREgee+qGk8A/u6SAyzvZ2lm6A+POOOumSvo=
-SIZE (qt/qtsvg-everywhere-opensource-src-5.15.11.tar.xz) = 1890072
+SHA256 (qt/qt-qt/qtsvg-7d6e373c7db9c05ef586db0eb50c87cd894229ad.tar.gz) =
Ze7uKH3IeXbcDYr6qUiPgv4DgzNccedKigRDueyIgvk=
+SIZE (qt/qt-qt/qtsvg-7d6e373c7db9c05ef586db0eb50c87cd894229ad.tar.gz) = 2780218
diff --git a/x11/qt5/qttools/Makefile b/x11/qt5/qttools/Makefile
index aa4e8d8b6a7..08efdbc6646 100644
--- a/x11/qt5/qttools/Makefile
+++ b/x11/qt5/qttools/Makefile
@@ -1,7 +1,11 @@
QT5NAME = QtTools
+
COMMENT-main = Qt development tools
COMMENT-webview = Webkit-based Qt Designer plugin
-PKGNAME-webview = qwebview-${VERSION}
+PKGNAME-webview = qwebview-${QT5_KDE_VERSION}
+
+KDE_COMMIT = 38ae810be3fb4984f75b55a16d3413e35d701af1
+KDE_VERSION = 3
DPB_PROPERTIES = parallel
@@ -12,8 +16,8 @@ SHARED_LIBS += Qt5DesignerComponents 3.0 # 5.9
SHARED_LIBS += Qt5Help 3.0 # 5.9
WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network
-WANTLIB-main += Qt5PrintSupport Qt5Qml Qt5QmlModels Qt5Quick Qt5Sql
-WANTLIB-main += Qt5Widgets Qt5Xml c m
+WANTLIB-main += Qt5PrintSupport Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets
+WANTLIB-main += Qt5Sql Qt5Widgets Qt5Xml c m
WANTLIB-main += llvm${MODCLANG_VERSION}/lib/clang
WANTLIB-webview += ${COMPILER_LIBCXX} GL Qt5Core Qt5Designer Qt5Gui Qt5Network
@@ -45,8 +49,11 @@ CONFIGURE_ENV =
LLVM_INSTALL_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}
.include <bsd.port.arch.mk>
-.if !${BUILD_PACKAGES:M-webview}
pre-configure:
+ ${QT5_GEN_INCLUDES}
+
+.if !${BUILD_PACKAGES:M-webview}
+post-configure:
perl -pi -e 's/^qtHaveModule.*webkitwidgets/\# $$&/' \
${WRKSRC}/src/designer/src/plugins/plugins.pro
.endif
diff --git a/x11/qt5/qttools/distinfo b/x11/qt5/qttools/distinfo
index d1b3c789eda..c6ca0847014 100644
--- a/x11/qt5/qttools/distinfo
+++ b/x11/qt5/qttools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qttools-everywhere-opensource-src-5.15.11.tar.xz) =
fNhHrm/wlBbfYXE26tyvDrmOO8m4mXkhmj6oER+40zk=
-SIZE (qt/qttools-everywhere-opensource-src-5.15.11.tar.xz) = 8898428
+SHA256 (qt/qt-qt/qttools-38ae810be3fb4984f75b55a16d3413e35d701af1.tar.gz) =
zebIBDvuznz01XsmIca3tSz2e5u54GgVBR8y2cAVGQc=
+SIZE (qt/qt-qt/qttools-38ae810be3fb4984f75b55a16d3413e35d701af1.tar.gz) =
12268466
diff --git a/x11/qt5/qttranslations/Makefile b/x11/qt5/qttranslations/Makefile
index 0859e254d82..9b03468da98 100644
--- a/x11/qt5/qttranslations/Makefile
+++ b/x11/qt5/qttranslations/Makefile
@@ -3,7 +3,7 @@ COMMENT = unofficial Qt5 translations
RUN_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION}
BUILD_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
- x11/qt5/qttools=${QT5_VERSION},<${QT5_NEXT_VERSION}
+ x11/qt5/qttools>=${QT5_VERSION},<${QT5_NEXT_VERSION}
MODQT5_DEPS = no
MODQT5_USE_CXX11 = No
diff --git a/x11/qt5/qtwayland/Makefile b/x11/qt5/qtwayland/Makefile
index aecf558fcae..f60bb49a19c 100644
--- a/x11/qt5/qtwayland/Makefile
+++ b/x11/qt5/qtwayland/Makefile
@@ -1,7 +1,10 @@
QT5NAME = QtWayland
COMMENT = Qt5 module for Wayland support
-SHARED_LIBS += Qt5WaylandClient 0.0 # 5.15
+KDE_COMMIT = 49c8a8d3c29998a3a160a139948ad8730b35a3d5
+KDE_VERSION = 60
+
+SHARED_LIBS += Qt5WaylandClient 1.0 # 5.15
SHARED_LIBS += Qt5WaylandCompositor 0.0 # 5.15
WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt5Core Qt5DBus Qt5Gui Qt5Network
@@ -25,5 +28,6 @@ MODQMAKE_RECURSIVE = No
pre-configure:
${SUBST_CMD} ${WRKSRC}/config.tests/wayland_scanner/wayland_scanner.pro
\
${WRKSRC}/features/wayland-scanner-client-wayland-protocol-include.prf
+ ${QT5_GEN_INCLUDES}
.include <bsd.port.mk>
diff --git a/x11/qt5/qtwayland/distinfo b/x11/qt5/qtwayland/distinfo
index be637658108..1474a687f79 100644
--- a/x11/qt5/qtwayland/distinfo
+++ b/x11/qt5/qtwayland/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtwayland-everywhere-opensource-src-5.15.11.tar.xz) =
E+TYqVk3aFiHcY3SiXR7bErr/AosPcxf5luHqHCxouQ=
-SIZE (qt/qtwayland-everywhere-opensource-src-5.15.11.tar.xz) = 569072
+SHA256 (qt/qt-qt/qtwayland-49c8a8d3c29998a3a160a139948ad8730b35a3d5.tar.gz) =
HVHQBiUPYu+XRFQnQEsvjH/+dhjKaX/f8gOG3TWZp8s=
+SIZE (qt/qt-qt/qtwayland-49c8a8d3c29998a3a160a139948ad8730b35a3d5.tar.gz) =
835256
diff --git a/x11/qt5/qtwebchannel/Makefile b/x11/qt5/qtwebchannel/Makefile
index f26cdc49b8e..913c47c7e5a 100644
--- a/x11/qt5/qtwebchannel/Makefile
+++ b/x11/qt5/qtwebchannel/Makefile
@@ -1,7 +1,10 @@
QT5NAME = QtWebChannel
COMMENT-main = Qt5 seamless HTML/JavaScript integration
-SHARED_LIBS += Qt5WebChannel 2.0 # 5.9
+KDE_COMMIT = f84887c1aee4ab04af375e639ae965c9ea2186a5
+KDE_VERSION = 3
+
+SHARED_LIBS += Qt5WebChannel 2.1 # 5.9
MULTI_PACKAGES = -main -examples
@@ -15,4 +18,7 @@ LIB_DEPENDS =
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
FLAVORS = debug
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtwebchannel/distinfo b/x11/qt5/qtwebchannel/distinfo
index c78f4c6231d..075960d9f5c 100644
--- a/x11/qt5/qtwebchannel/distinfo
+++ b/x11/qt5/qtwebchannel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.11.tar.xz) =
zz/t/QVwn+KbrD7DsqMwnGpavGrZFQfaDpQoqI8bPew=
-SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.11.tar.xz) = 211992
+SHA256 (qt/qt-qt/qtwebchannel-f84887c1aee4ab04af375e639ae965c9ea2186a5.tar.gz)
= ECrNpM5HP1KGRoUTsaBP+RQj7I++PWQUZt28OLpM1aU=
+SIZE (qt/qt-qt/qtwebchannel-f84887c1aee4ab04af375e639ae965c9ea2186a5.tar.gz) =
383838
diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile
index 644b03f442b..2d08980019b 100644
--- a/x11/qt5/qtwebengine/Makefile
+++ b/x11/qt5/qtwebengine/Makefile
@@ -13,9 +13,12 @@ DPB_PROPERTIES += lonesome
COMMENT = Chromium-based web engine for Qt5
# Many parts are copied from www/chromium port, so keep in sync
-DISTNAME =
qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
+#DISTNAME =
qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
QT5NAME = QtWebEngine
-REVISION = 8
+VERSION = ${QT5_WEBENGINE_VERSION}
+DIST_VERSION = ${QT5_WEBENGINE_VERSION}
+QT5_DIST_VERSION = ${QT5_WEBENGINE_VERSION}
+REVISION = 9
CATEGORIES = www
@@ -130,6 +133,8 @@ pre-configure:
@cd ${CHROMESRC}/third_party/boringssl && ${MODPY_BIN}
src/util/generate_build_files.py json
@cd ${WRKSRC} && env -i ${MAKE_ENV}
${CHROMESRC}/build/linux/unbundle/replace_gn_files.py \
--system-libraries ${GN_SYSTEM_LIBS}
+ # # Rerun syncqt.pl -- otherwise the resulting package misses some
forwarding headers.
+ ${QT5_GEN_INCLUDES}
pre-build:
${SUBST_CMD} ${CHROMESRC}/build/gn_run_binary.py \
diff --git a/x11/qt5/qtwebengine/pkg/PLIST b/x11/qt5/qtwebengine/pkg/PLIST
index deb8a9dcb0f..2ef058c5682 100644
--- a/x11/qt5/qtwebengine/pkg/PLIST
+++ b/x11/qt5/qtwebengine/pkg/PLIST
@@ -1,31 +1,31 @@
include/X11/qt5/QtWebEngine/
-include/X11/qt5/QtWebEngine/5.15.10/
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineaction_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineaction_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginecertificateerror_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginedialogrequests_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginedownloaditem_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginehistory_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginehistory_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineloadrequest_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginenavigationrequest_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginenewviewrequest_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineprofile_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginescript_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginesettings_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginesingleton_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginetestsupport_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineview_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qquickwebengineview_p_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qtwebengine-config_p.h
-include/X11/qt5/QtWebEngine/5.15.10/QtWebEngine/private/qtwebengineglobal_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineaction_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineaction_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginecertificateerror_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginedialogrequests_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginedownloaditem_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginehistory_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginehistory_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineloadrequest_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginenavigationrequest_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginenewviewrequest_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineprofile_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginescript_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginesettings_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginesingleton_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginetestsupport_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineview_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qquickwebengineview_p_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qtwebengine-config_p.h
+include/X11/qt5/QtWebEngine/${VERSION}/QtWebEngine/private/qtwebengineglobal_p.h
include/X11/qt5/QtWebEngine/QQuickWebEngineProfile
include/X11/qt5/QtWebEngine/QQuickWebEngineScript
include/X11/qt5/QtWebEngine/QtWebEngine
@@ -37,15 +37,15 @@ include/X11/qt5/QtWebEngine/qtwebengine-config.h
include/X11/qt5/QtWebEngine/qtwebengineglobal.h
include/X11/qt5/QtWebEngine/qtwebengineversion.h
include/X11/qt5/QtWebEngineCore/
-include/X11/qt5/QtWebEngineCore/5.15.10/
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qtwebenginecore-config_p.h
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qwebenginecallback_p.h
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qwebenginecookiestore_p.h
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h
-include/X11/qt5/QtWebEngineCore/5.15.10/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qtwebenginecore-config_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginecallback_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginecookiestore_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h
+include/X11/qt5/QtWebEngineCore/${VERSION}/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
include/X11/qt5/QtWebEngineCore/QWebEngineCallback
include/X11/qt5/QtWebEngineCore/QWebEngineClientCertificateStore
include/X11/qt5/QtWebEngineCore/QWebEngineCookieStore
@@ -79,17 +79,17 @@ include/X11/qt5/QtWebEngineCore/qwebengineurlrequestjob.h
include/X11/qt5/QtWebEngineCore/qwebengineurlscheme.h
include/X11/qt5/QtWebEngineCore/qwebengineurlschemehandler.h
include/X11/qt5/QtWebEngineWidgets/
-include/X11/qt5/QtWebEngineWidgets/5.15.10/
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebenginehistory_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebenginepage_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebengineprofile_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
-include/X11/qt5/QtWebEngineWidgets/5.15.10/QtWebEngineWidgets/private/qwebengineview_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginehistory_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginepage_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebengineprofile_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h
+include/X11/qt5/QtWebEngineWidgets/${VERSION}/QtWebEngineWidgets/private/qwebengineview_p.h
include/X11/qt5/QtWebEngineWidgets/QWebEngineCertificateError
include/X11/qt5/QtWebEngineWidgets/QWebEngineClientCertificateSelection
include/X11/qt5/QtWebEngineWidgets/QWebEngineContextMenuData
diff --git a/x11/qt5/qtwebsockets/Makefile b/x11/qt5/qtwebsockets/Makefile
index 796f63212cb..37deb88effa 100644
--- a/x11/qt5/qtwebsockets/Makefile
+++ b/x11/qt5/qtwebsockets/Makefile
@@ -1,6 +1,9 @@
QT5NAME = QtWebSockets
COMMENT-main = Qt5 implementation of WebSocket protocol
+KDE_COMMIT = d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00
+KDE_VERSION = 2
+
SHARED_LIBS += Qt5WebSockets 3.0 # 5.9
MULTI_PACKAGES = -main -examples
@@ -11,4 +14,7 @@ LIB_DEPENDS =
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
FLAVORS = debug
+pre-configure:
+ ${QT5_GEN_INCLUDES}
+
.include <bsd.port.mk>
diff --git a/x11/qt5/qtwebsockets/distinfo b/x11/qt5/qtwebsockets/distinfo
index 9fcba3b3dd6..ab9f288c3f7 100644
--- a/x11/qt5/qtwebsockets/distinfo
+++ b/x11/qt5/qtwebsockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.11.tar.xz) =
HjGlhU6ph8q7GVtwTTY5aj7qnE0UFHSdNiXEjSJipHg=
-SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.11.tar.xz) = 261948
+SHA256 (qt/qt-qt/qtwebsockets-d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00.tar.gz)
= Px3bAVAZrVrG7Hli37xKWMQH6mvyy5ZAz9zK/KbGBhs=
+SIZE (qt/qt-qt/qtwebsockets-d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00.tar.gz) =
434880
