From nobody Mon Aug 22 17:34:57 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBKJ211ZLz4ZDDN; Mon, 22 Aug 2022 17:35:14 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBKJ10R3Sz3VvS; Mon, 22 Aug 2022 17:35:13 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id f17so4860740pfk.11; Mon, 22 Aug 2022 10:35:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc; bh=Z11fWZGg/NGyMWCRg5wSHKyaLl+il7wL2zsZFmlEZWo=; b=yRkAYMt+Bow0B97WHhXAzNIb5Xoyhv4T5iojRt032ZuYsnxJykoj8+r0pXDYfmu6EH Yk+KgU7D+XF8aI3nLc+7/VTswQhbI94PmbaplEeK3bX8TB06SI6cWcHaGJD9AZhGAPMF MZcwvt9W/erGF1xmNpyzC25f147GPe5jpi4Kjt2TQKNcbSGYLnzuoDIvV3Aqt6MwQKM4 ec1qQNCJYyO+S7eaQx2WAfvX2vRaI1WY9B+5aO9bLO1RsGuNhf2VG/HCqXypI7rRLsYz m8H6XM6Kh5RC4wmHGy9vIqCeYf9hJq35hH4sO/rY58qyRqe3Cv1B8z2hm4HHEmg7rGXF /4ag== X-Gm-Message-State: ACgBeo3D6M/UKEpTJILyJtCko4A1awPxaq9OPNwCDwT544xQHRWhTzq1 R6iuG2WsbskRl3ZPARYanjqQsjF5JzSrCg== X-Google-Smtp-Source: AA6agR5A/Z0Xye8jMNhElCz7WAQ73zsLf4+v3FfUOLbW/auFsaQeX78P3/gfs8pz+X8OzP3JEBj3vA== X-Received: by 2002:a63:cf44:0:b0:42a:277:1cb8 with SMTP id b4-20020a63cf44000000b0042a02771cb8mr17644228pgj.198.1661189710629; Mon, 22 Aug 2022 10:35:10 -0700 (PDT) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com. [209.85.214.172]) by smtp.gmail.com with ESMTPSA id y5-20020aa79ae5000000b0052db82ad8b2sm7674904pfp.123.2022.08.22.10.35.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Aug 2022 10:35:10 -0700 (PDT) Received: by mail-pl1-f172.google.com with SMTP id x19so10561976plc.5; Mon, 22 Aug 2022 10:35:10 -0700 (PDT) X-Received: by 2002:a17:90b:3911:b0:1fb:23c1:2ec6 with SMTP id ob17-20020a17090b391100b001fb23c12ec6mr8067495pjb.45.1661189709490; Mon, 22 Aug 2022 10:35:09 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202208211646.27LGkH8A054396@gitrepo.freebsd.org> In-Reply-To: From: "Tobias C. Berner" Date: Mon, 22 Aug 2022 19:34:57 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 66259c9c641b - main - Qt6: Import Qt6 ports form kde@'s repository To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Cc: "Tobias C. Berner" , "ports-committers@FreeBSD.org" , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4MBKJ10R3Sz3VvS X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of tcberner@gmail.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=tcberner@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; FORGED_SENDER(0.30)[tcberner@freebsd.org,tcberner@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[tcberner]; TO_DN_EQ_ADDR_SOME(0.00)[]; TAGGED_RCPT(0.00)[]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.172:from,209.85.214.172:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[tcberner@freebsd.org,tcberner@gmail.com]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.210.172:from] X-ThisMailContainsUnwantedMimeParts: N Moin moin addressed in https://cgit.freebsd.org/ports/commit/?id=3D027335b321a92ce64c= c968104aa1801fef9b6762 mfg Tobias On Mon, 22 Aug 2022 at 10:56, Fernando Apestegu=C3=ADa wrote: > > On Sun, Aug 21, 2022 at 6:46 PM Tobias C. Berner w= rote: > > > > The branch main has been updated by tcberner: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D66259c9c641b1fc828becb= e2959dbe7380e55fe1 > > > > commit 66259c9c641b1fc828becbe2959dbe7380e55fe1 > > Author: Tobias C. Berner > > AuthorDate: 2022-08-12 17:55:36 +0000 > > Commit: Tobias C. Berner > > CommitDate: 2022-08-21 16:42:38 +0000 > > > > Qt6: Import Qt6 ports form kde@'s repository > > > > This change brings in the new Qt6 stack, which might still be a bit > > in flux in the ports tree for a while. > > > > Obtained from https://github.com/freebsd/freebsd-ports-kde/tree/qt6= -6.3.1 > > with commits from lbartoletti and myself. > > > > Note: > > ww/qt6-webengine will land once kai wins another round of patching = boundled > > chromiums sources. > > > > Exp-run by: antoine > > PR: 265843 > > Differential Revision: https://reviews.freebsd.org/D36179 > > --- > > Mk/Uses/qmake.mk | 2 +- > > Mk/Uses/qt-dist.mk | 94 +- > > Mk/Uses/qt.mk | 40 +- > > devel/Makefile | 4 + > > devel/qt6-5compat/Makefile | 21 + > > devel/qt6-5compat/distinfo | 3 + > > devel/qt6-5compat/pkg-descr | 8 + > > devel/qt6-5compat/pkg-plist | 85 + > > devel/qt6-base/Makefile | 125 + > > devel/qt6-base/distinfo | 3 + > > devel/qt6-base/files/patch-cmake_FindMySQL.cmake | 13 + > > devel/qt6-base/files/patch-cmake_QtBuild.cmake | 11 + > > .../files/patch-cmake_QtFlagHandlingHelpers.cmake | 13 + > > .../files/patch-cmake_QtPkgConfigHelpers.cmake | 10 + > > .../files/patch-cmake_QtRpathHelpers.cmake | 11 + > > ...rt_devicediscovery_qdevicediscovery__static.cpp | 14 + > > ...port_devicediscovery_qdevicediscovery__udev.cpp | 14 + > > ...t_evdevkeyboard_qevdevkeyboard__defaultmap__p.h | 14 + > > ...t_input_evdevkeyboard_qevdevkeyboardhandler.cpp | 14 + > > ...support_input_evdevmouse_qevdevmousehandler.cpp | 15 + > > ...pport_input_evdevtablet_qevdevtablethandler.cpp | 14 + > > ...support_input_evdevtouch_qevdevtouchhandler.cpp | 14 + > > devel/qt6-base/pkg-descr | 3 + > > devel/qt6-base/pkg-plist | 3746 ++++++++++++= ++++++++ > > devel/qt6-tools/Makefile | 45 + > > devel/qt6-tools/distinfo | 3 + > > devel/qt6-tools/pkg-descr | 7 + > > devel/qt6-tools/pkg-plist | 430 +++ > > devel/qt6-translations/Makefile | 16 + > > devel/qt6-translations/distinfo | 3 + > > devel/qt6-translations/pkg-descr | 4 + > > devel/qt6-translations/pkg-plist | 267 ++ > > graphics/Makefile | 4 + > > graphics/qt6-3d/Makefile | 40 + > > graphics/qt6-3d/distinfo | 3 + > > ...src_3rdparty_assimp_src_contrib_zip_src_miniz.h | 13 + > > graphics/qt6-3d/pkg-descr | 7 + > > graphics/qt6-3d/pkg-plist | 1458 ++++++++ > > graphics/qt6-imageformats/Makefile | 35 + > > graphics/qt6-imageformats/distinfo | 3 + > > graphics/qt6-imageformats/pkg-descr | 6 + > > graphics/qt6-imageformats/pkg-plist | 45 + > > graphics/qt6-svg/Makefile | 31 + > > graphics/qt6-svg/distinfo | 3 + > > graphics/qt6-svg/pkg-descr | 8 + > > graphics/qt6-svg/pkg-plist | 87 + > > graphics/qt6-wayland/Makefile | 35 + > > graphics/qt6-wayland/distinfo | 3 + > > graphics/qt6-wayland/files/patch-CMakeLists.txt | 11 + > > graphics/qt6-wayland/pkg-descr | 6 + > > graphics/qt6-wayland/pkg-plist | 621 ++++ > > misc/Makefile | 1 + > > misc/qt6-doc/Makefile | 16 + > > misc/qt6-doc/distinfo | 3 + > > misc/qt6-doc/pkg-descr | 6 + > > misc/qt6-doc/pkg-plist | 1 + > > net/Makefile | 1 + > > net/qt6-networkauth/Makefile | 22 + > > net/qt6-networkauth/distinfo | 3 + > > net/qt6-networkauth/pkg-descr | 6 + > > net/qt6-networkauth/pkg-plist | 51 + > > www/Makefile | 1 + > > x11-toolkits/Makefile | 4 + > > x11-toolkits/qt6-declarative/Makefile | 44 + > > x11-toolkits/qt6-declarative/distinfo | 3 + > > x11-toolkits/qt6-declarative/pkg-descr | 7 + > > x11-toolkits/qt6-declarative/pkg-plist | 2622 ++++++++++++= ++ > > x11-toolkits/qt6-quick3d/Makefile | 33 + > > x11-toolkits/qt6-quick3d/distinfo | 3 + > > x11-toolkits/qt6-quick3d/pkg-descr | 7 + > > x11-toolkits/qt6-quick3d/pkg-plist | 931 +++++ > > x11-toolkits/qt6-quicktimeline/Makefile | 31 + > > x11-toolkits/qt6-quicktimeline/distinfo | 3 + > > x11-toolkits/qt6-quicktimeline/pkg-descr | 6 + > > x11-toolkits/qt6-quicktimeline/pkg-plist | 46 + > > x11-toolkits/qt6-shadertools/Makefile | 31 + > > x11-toolkits/qt6-shadertools/distinfo | 3 + > > x11-toolkits/qt6-shadertools/pkg-descr | 8 + > > x11-toolkits/qt6-shadertools/pkg-plist | 48 + > > 79 files changed, 11386 insertions(+), 40 deletions(-) > > > > diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk > > index 1524aed3d95d..48304c742493 100644 > > --- a/Mk/Uses/qmake.mk > > +++ b/Mk/Uses/qmake.mk > > @@ -109,7 +109,7 @@ QMAKE_SOURCE_PATH?=3D # empty > > . endif > > > > # Add qmake to USE_QT -- unless it's qmake itself > > -. if !${PORTNAME} =3D=3D qmake > > +. if !${PORTNAME} =3D=3D qmake && ${_QT_VER:M5} > > USE_QT+=3D qmake_build > > . endif > > > > diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk > > index d644f0b44d58..7a8ed434bf0b 100644 > > --- a/Mk/Uses/qt-dist.mk > > +++ b/Mk/Uses/qt-dist.mk > > @@ -28,6 +28,9 @@ _QT5_DISTS=3D 3d activeqt androidextras bas= e charts connectivity datavis3d \ > > serialport speech svg tools translations virtua= lkeyboard wayland \ > > webchannel webengine webglplugin websockets web= view winextras \ > > x11extras xmlpatterns > > +_QT6_DISTS=3D 3d 5compat base declarative doc imageformats = quick3d quickcontrols2 \ > > + quicktimeline networkauth shadertools svg tools= translations webengine wayland > > + > > I'm not very familiar with qt.mk, but 3d, declarative, doc, > imageformats... are in both _QT5_DISTS and _QT6_DISTS. Shouldn't they > be in _USE_QT_ALL then? > Only shadertools, tools and translations are declared in _QT6_DISTS > and not in _QT5_DISTS > > Cheers. > > > > _QT_DISTS=3D ${_QT${_QT_VER}_DISTS} > > > > # We only accept one item as an argument. The fetch target further bel= ow works > > @@ -45,9 +48,7 @@ IGNORE=3D cannot be installed: differen= t Qt dists specified via qt-dist:[${qt-dis > > > > # Fall back to sensible defaults for _QT_DIST > > . if empty(_QT_DIST) > > -. if ${_QT_VER:M5} > > _QT_DIST=3D ${PORTNAME} # don't force qt-dist to be set f= or Qt5 ports which 75% of time are ${PORTNAME} > > -. endif > > . endif > > > > # Check validitiy > > @@ -56,18 +57,47 @@ IGNORE=3D Unsupported qt-dist $= {_QT_DIST} for qt:${_QT_VER} > > . endif > > ######################################################################= ########## > > > > -# Set standard bsd.port.mk variables > > +# Set standard bsd.port.mk variables. > > LICENSE?=3D LGPL21 > > > > . if !exists(${PKGDIR}/pkg-descr) > > DESCR?=3D ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-= descr > > . endif > > > > + > > # Stage support. > > -DESTDIRNAME=3D INSTALL_ROOT > > +_QT5_DESTDIRNAME=3D INSTALL_ROOT > > +_QT6_DESTDIRNAME=3D DESTDIR > > +DESTDIRNAME=3D ${_QT${_QT_VER}_DESTDIRNAME} > > > > -. if ${_QT_VER:M5} > > +# Qt's tarballs are xz compressed. > > +. if empty(USES:Mtar) > > +EXTRACT_SUFX?=3D .tar.xz > > +. endif > > > > +# Qt5 specific master sites > > +_QT5_MASTER_SITES_kde=3D LOCAL > > +_QT5_MASTER_SITE_SUBDIR_kde=3D tcberner/KDE/Qt/${_QT_VERSION} > > +_QT5_MASTER_SITES=3D ${MASTER_SITE_QT} > > +_QT5_MASTER_SITE_SUBDIR=3D official_releases/qt/${_QT_VERSION:R}= /${_QT_VERSION}/submodules/ > > +# Qt6 specific master sites > > +_QT6_MASTER_SITES=3D ${MASTER_SITE_QT} > > +_QT6_MASTER_SITE_SUBDIR=3D official_releases/qt/${_QT_VERSION:R}= /${_QT_VERSION}/submodules \ > > + official_releases/additional_libraries/= ${_QT_VERSION:R}/${_QT_VERSION}/ > > +# Qt5 specific distnames > > +_QT5_DISTNAME=3D ${_QT_DIST:S,^,qt,:S,$,-everywhere-sr= c-${DISTVERSION},} > > +_QT5_DISTNAME_kde=3D ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVER= SION},} > > +# Qt6 specific distnames > > +_QT6_DISTNAME=3D ${_QT_DIST:S,^,qt,:S,$,-everywhere-sr= c-${DISTVERSION},} > > + > > +# Effective master sites and disfile valus > > +MASTER_SITES=3D ${_QT${_QT_VER}_MASTER_SITES${_KDE_${= _QT_DIST}:D_kde}} > > +MASTER_SITE_SUBDIR=3D ${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_= KDE_${_QT_DIST}:D_kde}} > > +DISTNAME=3D ${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_= DIST}:D_kde}} > > +DISTFILES=3D ${DISTNAME:S,$,${EXTRACT_SUFX},} > > +DIST_SUBDIR=3D KDE/Qt/${_QT_VERSION} > > + > > +. if ${_QT_VER:M5} > > # KDE maintains a repository with a patched Qt5 distribution. > > _KDE_3d=3D 15 > > _KDE_base=3D 165 > > @@ -105,26 +135,18 @@ _KDE_websockets=3D 3 > > _KDE_webview=3D 0 > > _KDE_x11extras=3D 0 > > _KDE_xmlpatterns=3D 0 > > - > > . if defined(_KDE_${_QT_DIST}) > > -# KDE patched Qt parts > > QT5_KDE_PATCH=3D p${_KDE_${_QT_DIST}} > > _KDE_${_QT_DIST}_VERSION?=3D ${_QT_VERSION} > > _KDE_${_QT_DIST}_ORIGIN_TAG?=3D v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl > > -MASTER_SITES=3D LOCAL/tcberner/KDE/Qt/${_QT_VERSION} > > -DISTNAME=3D ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},} > > COMMENT+=3D (KDE patched) > > . else > > -# non KDE patched Qt parts > > QT5_KDE_PATCH=3D # > > -MASTER_SITES=3D ${MASTER_SITE_QT} > > -MASTER_SITE_SUBDIR?=3D official_releases/qt/${_QT_VERSION:R}/${_QT_V= ERSION}/submodules/ > > -DISTNAME=3D ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DIST= VERSION},} > > . endif > > +. endif # ${_QT_VER:M5} > > > > -DISTFILES=3D ${DISTNAME:S,$,${EXTRACT_SUFX},} > > -DIST_SUBDIR=3D KDE/Qt/${_QT_VERSION} > > - > > +# Environment setup for Qt5 > > +. if ${_QT_VER:M5} > > # Qt (at least when used with qmake) has a tendency to overlink: some = libraries > > # have dependencies on others in the mkspec configurations and the lat= ter are > > # always passed to the linker even if they are not actually used. By p= assing > > @@ -132,17 +154,6 @@ DIST_SUBDIR=3D KDE/Qt/${_QT_VERSION} > > # have to declare a lot of unnecessary dependencies in USE_QT5. > > LDFLAGS+=3D -Wl,--as-needed > > > > -. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ > > - defined(DISABLE_SIZE) && defined(NO_CHECKSUM) > > -# Ensure that the "makesum" target (with its inner "fetch" one) uses > > -# devel/qt*/distinfo for every port. > > -. endif > > - > > -# Qt5's tarballs are xz compressed. > > -. if empty(USES:Mtar) > > -EXTRACT_SUFX?=3D .tar.xz > > -. endif > > - > > . if ${_QT_DIST} =3D=3D "base" && ${PORTNAME} !=3D "qmake" > > # Qt configure requires pkg-config to detect dependencies. > > .include "${USESDIR}/pkgconfig.mk" > > @@ -156,6 +167,26 @@ EXTRACT_AFTER_ARGS?=3D ${DISTNAME:S,$,/examp= les,:S,^,--exclude ,} \ > > --no-same-owner --no-same-permissions > > . endif # ! ${_QT_VER:M5} > > > > +# Build setup for Qt6 > > +. if ${_QT_VER:M6} > > +CMAKE_ARGS+=3D -DCMAKE_INSTALL_PREFIX=3D${PREFIX} \ > > + -DINSTALL_BINDIR=3D${PREFIX}/${QT_BINDIR_REL} \ > > + -DINSTALL_PUBLICBINDIR=3D${PREFIX}/bin \ > > + -DINSTALL_LIBDIR=3D${PREFIX}/${QT_LIBDIR_REL} \ > > + -DINSTALL_LIBEXECDIR=3D${PREFIX}/${QT_LIBEXECDI= R_REL} \ > > + -DINSTALL_DOCDIR=3D${PREFIX}/${QT_DOCDIR_REL} \ > > + -DINSTALL_ARCHDATADIR=3D${PREFIX}/${QT_ARCHDIR_= REL} \ > > + -DINSTALL_DATADIR=3D${PREFIX}/${QT_DATADIR_REL}= \ > > + -DINSTALL_INCLUDEDIR=3D${PREFIX}/${QT_INCDIR_RE= L} \ > > + -DINSTALL_MKSPECSDIR=3D${PREFIX}/${QT_MKSPECDIR= _REL} \ > > + -DINSTALL_EXAMPLESDIR=3D${PREFIX}/${QT_EXAMPLED= IR_REL} \ > > + -DINSTALL_DESCRIPTIONSDIR=3D${PREFIX}/${QT_DESC= RIPTIONSDIR_REL} \ > > + -DQT_QMAKE_TARGET_MKSPEC:String=3Dfreebsd-clang= \ > > + --log-level=3DTRACE > > +. endif > > + > > +# Build setup for Qt5 > > +. if ${_QT_VER:M5} > > CONFIGURE_ENV+=3D MAKE=3D"${MAKE:T}" > > > > CONFIGURE_ARGS+=3D -opensource -confirm-license \ > > @@ -169,10 +200,8 @@ CONFIGURE_ARGS+=3D -opensource -confirm-license = \ > > -datadir ${PREFIX}/${QT_DATADIR_REL} \ > > -docdir ${PREFIX}/${QT_DOCDIR_REL} \ > > -translationdir ${PREFIX}/${QT_L10NDIR_REL} \ > > - -sysconfdir ${PREFIX}/${QT_ETCDIR_REL} > > - > > -. if ${_QT_VER:M5} > > -CONFIGURE_ARGS+=3D -nomake examples -nomake tests \ > > + -sysconfdir ${PREFIX}/${QT_ETCDIR_REL} \ > > + -nomake examples -nomake tests \ > > -platform ${QMAKESPECNAME} \ > > -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ > > -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ > > @@ -224,9 +253,11 @@ _EXTRA_PATCHES_QT5+=3D ${PORTSDIR}/devel/${_= QT_RELNAME}/files/extra-patch-mkspecs_ > > ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-pa= tch-mkspecs_common_gcc-base.conf \ > > ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapat= ch-mkspecs_freebsd-g++_qmake.conf > > . endif > > +. if ${_QT_VER:M5} > > EXTRA_PATCHES?=3D ${PORTSDIR}/devel/${_QT_RELNAME}/file= s/extrapatch-configure \ > > ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapat= ch-sync.profiles \ > > ${_EXTRA_PATCHES_QT5} > > +. endif # ${_QT_VER:M5} > > . endif # ${_QT_DIST} =3D=3D "base" > > > > # Override settings installed in qconfig.h and *.pri files. The flags = will be > > @@ -469,3 +500,4 @@ qt-create-kde-distfile: > > ${_KDE_${_QT_DIST}_ORIGIN_TAG} > > > > .endif # defined(_QT_DIST_MK_INCLUDED) > > + > > diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk > > index 659dda05c8c8..9fb06dad9578 100644 > > --- a/Mk/Uses/qt.mk > > +++ b/Mk/Uses/qt.mk > > @@ -21,8 +21,9 @@ > > _QT_MK_INCLUDED=3D qt.mk > > > > # Qt versions currently supported by the framework. > > -_QT_SUPPORTED?=3D 5 > > +_QT_SUPPORTED?=3D 5 6 > > QT5_VERSION?=3D 5.15.5 > > +QT6_VERSION?=3D 6.3.1 > > > > # We accept the Qt version to be passed by either or all of the three = mk files. > > . if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS) > > @@ -54,12 +55,12 @@ IGNORE?=3D cannot decide what Qt version= to use: specify one via qt:[${_QT_SUPPOR > > _QT_RELNAME=3D qt${_QT_VER} > > _QT_VERSION=3D ${QT${_QT_VER}_VERSION} > > > > -# A wrapper (qtchooser) is used to invoke binaries. > > QT_BINDIR_REL?=3D ${QT_ARCHDIR_REL}/bin > > QT_INCDIR_REL?=3D include/${_QT_RELNAME} > > QT_LIBDIR_REL?=3D lib/${_QT_RELNAME} > > QT_ARCHDIR_REL?=3D ${QT_LIBDIR_REL} > > QT_PLUGINDIR_REL?=3D ${QT_ARCHDIR_REL}/plugins > > +QT_DESCRIPTIONSDIR_REL?=3D${QT_DATADIR_REL}/modules > > QT_LIBEXECDIR_REL?=3D libexec/${_QT_RELNAME} > > QT_IMPORTDIR_REL?=3D ${QT_ARCHDIR_REL}/imports > > QT_QMLDIR_REL?=3D ${QT_ARCHDIR_REL}/qml > > @@ -107,7 +108,6 @@ PLIST_SUB+=3D QT_${dir}DIR=3D"${QT_${dir}DI= R_REL}" > > . endif > > . endfor > > > > -# Pass the chosen Qt version to the environment for qtchooser. > > CONFIGURE_ENV+=3D QT_SELECT=3D${_QT_RELNAME} > > MAKE_ENV+=3D QT_SELECT=3D${_QT_RELNAME} > > > > @@ -138,17 +138,29 @@ _USE_QT_ALL+=3D sql-ibase > > . endif > > > > _USE_QT5_ONLY=3D 3d buildtools charts concurrent connectivity = \ > > - core datavis3d diag examples gamepad \ > > - graphicaleffects location networkauth paths pho= non4 plugininfo printsupport \ > > + core datavis3d diag examples gamepad graphicale= ffects \ > > + location networkauth paths phonon4 plugininfo p= rintsupport \ > > qdbus qdoc qdoc-data qev quick3d quickcontrols = quickcontrols2 \ > > - quicktimeline remoteobjects scxml sensors seria= lbus serialport speech \ > > - sql-tds uiplugin uitools virtualkeyboard waylan= d webchannel webglplugin \ > > - webengine websockets websockets-qml webview wid= gets x11extras > > + quicktimeline remoteobjects scxml sensors seria= lbus serialport \ > > + speech sql-tds uiplugin uitools virtualkeyboard= wayland \ > > + webchannel webglplugin webengine websockets we= bsockets-qml \ > > + webview widgets x11extras assistant dbus declar= ative designer \ > > + doc gui help imageformats l10n linguist linguis= ttools \ > > + multimedia network opengl pixeltool qdbusviewer= qmake script \ > > + scripttools sql sql-mysql sql-odbc sql-pgsql sq= l-sqlite2 \ > > + sql-sqlite3 svg testlib webkit xml xmlpatterns > > + > > +_USE_QT6_ONLY=3D 3d 5compat base declarative doc imageformats = quick3d \ > > + quickcontrols2 quicktimeline networkauth shader= tools \ > > + svg tools translations wayland > > > > # Dependency tuples: _LIB should be preferred if possible. > > qt-3d_PORT=3D graphics/${_QT_RELNAME}-3d > > qt-3d_LIB=3D libQt${_QT_LIBVER}3DCore.so > > > > +qt-5compat_PORT=3D devel/${_QT_RELNAME}-5compat > > +qt-5compat_LIB=3D libQt${_QT_LIBVER}Core5Compat.so > > + > > qt-assistant_PORT=3D devel/${_QT_RELNAME}-assistant > > qt-assistant_PATH=3D ${LOCALBASE}/${QT_BINDIR_REL}/assistant > > > > @@ -156,6 +168,9 @@ qt-assistant_PATH=3D ${LOCALBASE}/${QT_BINDIR_REL}= /assistant > > qt-buildtools_PORT=3D devel/${_QT_RELNAME}-buildtools > > qt-buildtools_PATH=3D ${_QT_RELNAME}-buildtools>=3D${_QT_VERSION:R} > > > > +qt-base_PORT=3D devel/${_QT_RELNAME}-base > > +qt-base_LIB=3D libQt${_QT_LIBVER}Core.so > > + > > qt-charts_PORT=3D x11-toolkits/${_QT_RELNAME}-charts > > qt-charts_LIB=3D libQt${_QT_LIBVER}Charts.so > > > > @@ -298,6 +313,9 @@ qt-serialbus_LIB=3D libQt${_QT_LIBVER}SerialBus.s= o > > qt-serialport_PORT=3D comms/${_QT_RELNAME}-serialport > > qt-serialport_LIB=3D libQt${_QT_LIBVER}SerialPort.so > > > > +qt-shadertools_PORT=3D x11-toolkits/${_QT_RELNAME}-shadertools > > +qt-shadertools_LIB=3D libQt${_QT_LIBVER}ShaderTools.so > > + > > qt-speech_PORT=3D accessibility/${_QT_RELNAME}-speech > > qt-speech_LIB=3D libQt${_QT_LIBVER}TextToSpeech.so > > > > @@ -319,6 +337,12 @@ qt-svg_LIB=3D libQt${_QT_LIBVER}Svg= .so > > qt-testlib_PORT=3D devel/${_QT_RELNAME}-testlib > > qt-testlib_LIB=3D libQt${_QT_LIBVER}Test.so > > > > +qt-tools_PORT=3D devel/${_QT_RELNAME}-tools > > +qt-tools_PATH=3D ${LOCALBASE}/${QT_BINDIR_REL}/lupdate > > + > > +qt-translations_PORT=3D devel/${_QT_RELNAME}-translations > > +qt-translations_PATH=3D ${LOCALBASE}/${QT_DATADIR_REL}/translations > > + > > qt-uiplugin_PORT=3D x11-toolkits/${_QT_RELNAME}-uiplugin > > qt-uiplugin_PATH=3D ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUi= Plugin > > > > diff --git a/devel/Makefile b/devel/Makefile > > index 0e0c824919a9..e7049c5222d2 100644 > > --- a/devel/Makefile > > +++ b/devel/Makefile > > @@ -5612,6 +5612,10 @@ > > SUBDIR +=3D qt5-scxml > > SUBDIR +=3D qt5-testlib > > SUBDIR +=3D qt5-uitools > > + SUBDIR +=3D qt6-5compat > > + SUBDIR +=3D qt6-base > > + SUBDIR +=3D qt6-tools > > + SUBDIR +=3D qt6-translations > > SUBDIR +=3D qtcreator > > SUBDIR +=3D quantum > > SUBDIR +=3D quickcheck++ > > diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile > > new file mode 100644 > > index 000000000000..738de343914f > > --- /dev/null > > +++ b/devel/qt6-5compat/Makefile > > @@ -0,0 +1,21 @@ > > +PORTNAME=3D 5compat > > +DISTVERSION=3D ${QT6_VERSION} > > +CATEGORIES=3D devel > > +PKGNAMEPREFIX=3D qt6- > > + > > +MAINTAINER=3D kde@FreeBSD.org > > +COMMENT=3D Qt 6 module that contains unsupported Qt 5 APIs > > + > > +LIB_DEPENDS=3D libicuuc.so:devel/icu \ > > + libdouble-conversion.so:devel/double-conversion \ > > + libpcre.so:devel/pcre \ > > + libpcre2-16.so:devel/pcre2 \ > > + libzstd.so:archivers/zstd > > + > > +USES=3D cmake compiler:c++17-lang gettext-runtime gnome \ > > + qt-dist:6 > > +USE_GNOME=3D glib20 > > +USE_QT=3D base > > +USE_LDCONFIG=3D ${PREFIX}/${QT_LIBDIR_REL} > > + > > +.include > > diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo > > new file mode 100644 > > index 000000000000..1c392c597d97 > > --- /dev/null > > +++ b/devel/qt6-5compat/distinfo > > @@ -0,0 +1,3 @@ > > +TIMESTAMP =3D 1660482594 > > +SHA256 (KDE/Qt/6.3.1/qt5compat-everywhere-src-6.3.1.tar.xz) =3D a43ec6= 2bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd > > +SIZE (KDE/Qt/6.3.1/qt5compat-everywhere-src-6.3.1.tar.xz) =3D 8195804 > > diff --git a/devel/qt6-5compat/pkg-descr b/devel/qt6-5compat/pkg-descr > > new file mode 100644 > > index 000000000000..a525c54b94b8 > > --- /dev/null > > +++ b/devel/qt6-5compat/pkg-descr > > @@ -0,0 +1,8 @@ > > +Qt is a cross-platform application and UI framework for developers > > +using C++ or QML, a CSS/JavaScript-like language. > > + > > +The Qt 5 Core Compat module contains the Qt Core APIs which will be no= longer > > +supported in Qt 6 and therefore were removed from Qt 6. The module is = provided > > +to facilitate the transition to Qt 6. > > + > > +WWW: http://qt-project.org > > diff --git a/devel/qt6-5compat/pkg-plist b/devel/qt6-5compat/pkg-plist > > new file mode 100644 > > index 000000000000..37836dea775f > > --- /dev/null > > +++ b/devel/qt6-5compat/pkg-plist > > @@ -0,0 +1,85 @@ > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/cp949cod= etbl_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbig5cod= ec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryj= son_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryj= sonarray_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryj= sonobject_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryj= sonvalue_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qeucjpco= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qeuckrco= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qgb18030= codec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qiconvco= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qicucode= c_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qisciico= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qjiscode= c_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qjpunico= de_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qlatinco= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qsimplec= odec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qsjiscod= ec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtcore5c= ompat-config_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtextcod= ec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtsciico= dec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qutfcode= c_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qwindows= codec_p.h > > +%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qxml_p.h > > +%%QT_INCDIR%%/QtCore5Compat/QBinaryJson > > +%%QT_INCDIR%%/QtCore5Compat/QConcatenable > > +%%QT_INCDIR%%/QtCore5Compat/QLinkedList > > +%%QT_INCDIR%%/QtCore5Compat/QLinkedListData > > +%%QT_INCDIR%%/QtCore5Compat/QLinkedListIterator > > +%%QT_INCDIR%%/QtCore5Compat/QLinkedListNode > > +%%QT_INCDIR%%/QtCore5Compat/QMutableLinkedListIterator > > +%%QT_INCDIR%%/QtCore5Compat/QRegExp > > +%%QT_INCDIR%%/QtCore5Compat/QStringRef > > +%%QT_INCDIR%%/QtCore5Compat/QTextCodec > > +%%QT_INCDIR%%/QtCore5Compat/QTextDecoder > > +%%QT_INCDIR%%/QtCore5Compat/QTextEncoder > > +%%QT_INCDIR%%/QtCore5Compat/QXmlAttributes > > +%%QT_INCDIR%%/QtCore5Compat/QXmlContentHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlDTDHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlDeclHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlDefaultHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlEntityResolver > > +%%QT_INCDIR%%/QtCore5Compat/QXmlErrorHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlInputSource > > +%%QT_INCDIR%%/QtCore5Compat/QXmlLexicalHandler > > +%%QT_INCDIR%%/QtCore5Compat/QXmlLocator > > +%%QT_INCDIR%%/QtCore5Compat/QXmlNamespaceSupport > > +%%QT_INCDIR%%/QtCore5Compat/QXmlParseException > > +%%QT_INCDIR%%/QtCore5Compat/QXmlReader > > +%%QT_INCDIR%%/QtCore5Compat/QXmlSimpleReader > > +%%QT_INCDIR%%/QtCore5Compat/QtCore5Compat > > +%%QT_INCDIR%%/QtCore5Compat/QtCore5CompatDepends > > +%%QT_INCDIR%%/QtCore5Compat/QtCore5CompatVersion > > +%%QT_INCDIR%%/QtCore5Compat/qbinaryjson.h > > +%%QT_INCDIR%%/QtCore5Compat/qcore5global.h > > +%%QT_INCDIR%%/QtCore5Compat/qlinkedlist.h > > +%%QT_INCDIR%%/QtCore5Compat/qregexp.h > > +%%QT_INCDIR%%/QtCore5Compat/qstringref.h > > +%%QT_INCDIR%%/QtCore5Compat/qtcore5compat-config.h > > +%%QT_INCDIR%%/QtCore5Compat/qtcore5compatversion.h > > +%%QT_INCDIR%%/QtCore5Compat/qtextcodec.h > > +%%QT_INCDIR%%/QtCore5Compat/qxml.h > > +lib/cmake/Qt6/FindWrapIconv.cmake > > +lib/cmake/Qt6BuildInternals/StandaloneTests/Qt5CompatTestsConfig.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatAdditionalTargetInfo.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfig.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfigVersion.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfigVersionImpl.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatDependencies.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets-%%CMAKE_BUILD_TYPE%%.cm= ake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets.cmake > > +lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake > > +%%QT_LIBDIR%%/libQt6Core5Compat.prl > > +%%QT_LIBDIR%%/libQt6Core5Compat.so > > +%%QT_LIBDIR%%/libQt6Core5Compat.so.6 > > +%%QT_LIBDIR%%/libQt6Core5Compat.so.%%FULLVER%% > > +%%QT_LIBDIR%%/metatypes/qt6core5compat_%%CMAKE_BUILD_TYPE%%_metatypes.= json > > +%%QT_MKSPECDIR%%/modules/qt_lib_core5compat.pri > > +%%QT_MKSPECDIR%%/modules/qt_lib_core5compat_private.pri > > +libdata/pkgconfig/Qt6Core5Compat.pc > > +%%QT_DATADIR%%/modules/Core5Compat.json > > +@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests > > +@dir %%QT_CMAKEDIR%%/Qt6Core5Compat > > +@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests > > +@dir %%QT_LIBDIR%%/cmake/Qt6Core5Compat > > +@dir %%QT_LIBDIR%%/pkgconfig > > diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile > > new file mode 100644 > > index 000000000000..c9d8465d21a5 > > --- /dev/null > > +++ b/devel/qt6-base/Makefile > > @@ -0,0 +1,125 @@ > > +PORTNAME=3D base > > +DISTVERSION=3D ${QT6_VERSION} > > +CATEGORIES=3D devel > > +PKGNAMEPREFIX=3D qt6- > > + > > +MAINTAINER=3D kde@FreeBSD.org > > +COMMENT=3D Qt base (core, gui, widgets, network,...) > > + > > +BUILD_DEPENDS=3D xml:textproc/xmlstarlet \ > > + ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-he= aders \ > > + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto > > +LIB_DEPENDS=3D \ > > + libatk-1.0.so:accessibility/atk \ > > + libatk-bridge-2.0.so:accessibility/at-spi2-atk \ > > + libatspi.so:accessibility/at-spi2-core \ > > + libavahi-client.so:net/avahi-app \ > > + libbrotlidec.so:archivers/brotli \ > > + libcups.so:print/cups \ > > + libdbus-1.so:devel/dbus \ > > + libdouble-conversion.so:devel/double-conversion \ > > + libdrm.so:graphics/libdrm \ > > + libepoll-shim.so:devel/libepoll-shim \ > > + libepoxy.so:graphics/libepoxy \ > > + libevdev.so:devel/libevdev \ > > + libexpat.so:textproc/expat2 \ > > + libffi.so:devel/libffi \ > > + libfontconfig.so:x11-fonts/fontconfig \ > > + libfreetype.so:print/freetype2 \ > > + libfribidi.so:converters/fribidi \ > > + libgmp.so:math/gmp \ > > + libgnutls.so:security/gnutls \ > > + libgraphite2.so:graphics/graphite2 \ > > + libgudev-1.0.so:devel/libgudev \ > > + libharfbuzz.so:print/harfbuzz \ > > + libicui18n.so:devel/icu \ > > + libidn2.so:dns/libidn2 \ > > + libinput.so:x11/libinput \ > > + libintl.so:devel/gettext-runtime \ > > + libjpeg.so:graphics/jpeg-turbo \ > > + libmtdev.so:devel/libmtdev \ > > + libnettle.so:security/nettle \ > > + libp11-kit.so:security/p11-kit \ > > + libpcre.so:devel/pcre \ > > + libpcre2-16.so:devel/pcre2 \ > > + libpng16.so:graphics/png \ > > + libtasn1.so:security/libtasn1 \ > > + libudev.so:devel/libudev-devd \ > > + libunistring.so:devel/libunistring \ > > + libvulkan.so:graphics/vulkan-loader \ > > + libwacom.so:x11/libwacom \ > > + libwayland-client.so:graphics/wayland \ > > + libxcb-cursor.so:x11/xcb-util-cursor \ > > + libxcb-ewmh.so:x11/xcb-util-wm \ > > + libxcb-image.so:x11/xcb-util-image \ > > + libxcb-keysyms.so:x11/xcb-util-keysyms \ > > + libxcb-render-util.so:x11/xcb-util-renderutil \ > > + libxcb-util.so:x11/xcb-util \ > > + libxkbcommon.so:x11/libxkbcommon \ > > + libzstd.so:archivers/zstd > > + > > +USES=3D cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconf= ig python \ > > + qt-dist:6 shebangfix xorg > > +USE_GL=3D egl gl > > +USE_GNOME=3D cairo gdkpixbuf2 glib20 gtk30 pango > > +USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage = xdmcp \ > > + xext xfixes xi xinerama xrandr xrender > > +CMAKE_ON=3D QT_AVOID_CMAKE_ARCHIVING_API \ > > + QT_FIND_ALL_PACKAGES_ALWAYS > > +CMAKE_OFF=3D QT_FEATURE_eglfs \ > > + QT_FEATURE_gssapi > > +SHEBANG_FILES=3D ${WRKSRC}/mkspecs/features/uikit/device_destinations.= sh \ > > + ${WRKSRC}/mkspecs/features/uikit/devices.py \ > > + ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ > > + ${WRKSRC}/util/android/android_emulator_launcher.sh \ > > + ${WRKSRC}/util/testrunner/qt-testrunner.py > > +USE_LDCONFIG=3D ${PREFIX}/${QT_LIBDIR_REL} > > + > > +# zstd from base fails to compress files during the build (error 11: u= nsupported argument) > > +BINARY_ALIAS=3D zstd=3D${LOCALBASE}/bin/zstd > > + > > +#=3D=3D Option handling > > +OPTIONS_GROUP=3D SQL > > +OPTIONS_GROUP_SQL=3D IBASE MYSQL ODBC PSQL SQLITE > > +OPTIONS_DEFAULT=3D SQLITE > > +OPTIONS_SUB=3D yes > > + > > +IBASE_DESC=3D InterBase database support > > +IBASE_CMAKE_ON=3D -DFEATURE_sql_ibase=3DON > > +IBASE_CMAKE_OFF=3D -DFEATURE_sql_ibase=3DOFF > > +IBASE_USES=3D firebird:4.0 > > +IBASE_BROKEN=3D IBASE: fatal error: 'gen/iberror.h' file not = found > > + > > +MYSQL_DESC=3D MySQL database support > > +MYSQL_CMAKE_ON=3D -DFEATURE_sql_mysql=3DON > > +MYSQL_CMAKE_OFF=3D -DFEATURE_sql_mysql=3DOFF > > +MYSQL_USES=3D mysql > > + > > +ODBC_DESC=3D ODBC database support > > +ODBC_CMAKE_ON=3D -DFEATURE_sql_odbc=3DON > > +ODBC_CMAKE_OFF=3D -DFEATURE_sql_odbc=3DOFF > > +ODBC_LIB_DEPENDS=3D libodbc.so:databases/unixODBC > > + > > +PSQL_DESC=3D PostgreSQL database support > > +PSQL_CMAKE_ON=3D -DFEATURE_sql_psql=3DON > > +PSQL_CMAKE_OFF=3D -DFEATURE_sql_psql=3DOFF > > +PSQL_USES=3D pgsql > > + > > +SQLITE_DESC=3D Sqlite database support > > +SQLITE_CMAKE_ON=3D -DFEATURE_sql_sqlite=3DON \ > > + -DQT_FEATURE_system_sqlite=3DON > > +SQLITE_CMAKE_OFF=3D -DFEATURE_sql_sqlite=3DOFF > > +SQLITE_USES=3D sqlite:3 > > + > > +# TODO: do this cleaner -- somewhere cmake/qmake still creates empty d= irectories > > +# for the cmake files in INSTALL_PREFIX/lib/cmake > > +post-install: > > + ${RM} -vr ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake > > + # Install symlinks for user-facing tools > > + ${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \ > > + ${WRKDIR}/.build/user_facing_tool_links.txt > > + while read t; do \ > > + ${RLN} $$t; \ > > + done <${WRKDIR}/.build/user_facing_tool_links.txt > > + > > +.include > > diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo > > new file mode 100644 > > index 000000000000..3e8a1c398cca > > --- /dev/null > > +++ b/devel/qt6-base/distinfo > > @@ -0,0 +1,3 @@ > > +TIMESTAMP =3D 1660482596 > > +SHA256 (KDE/Qt/6.3.1/qtbase-everywhere-src-6.3.1.tar.xz) =3D 0a64421d9= c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 > > +SIZE (KDE/Qt/6.3.1/qtbase-everywhere-src-6.3.1.tar.xz) =3D 47118260 > > diff --git a/devel/qt6-base/files/patch-cmake_FindMySQL.cmake b/devel/q= t6-base/files/patch-cmake_FindMySQL.cmake > > new file mode 100644 > > index 000000000000..512ac3cb969a > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake > > @@ -0,0 +1,13 @@ > > +Help cmake figure out the locations of the headers when mariadb is use= d. > > + > > +--- cmake/FindMySQL.cmake.orig 2021-10-20 11:54:23 UTC > > ++++ cmake/FindMySQL.cmake > > +@@ -19,7 +19,7 @@ > > + # The mysql client library > > + > > + find_package(PkgConfig QUIET) > > +-pkg_check_modules(PC_MySQL QUIET mysqlclient) > > ++pkg_search_module(PC_MySQL QUIET mysqlclient mariadb) > > + > > + find_path(MySQL_INCLUDE_DIR > > + NAMES mysql.h > > diff --git a/devel/qt6-base/files/patch-cmake_QtBuild.cmake b/devel/qt6= -base/files/patch-cmake_QtBuild.cmake > > new file mode 100644 > > index 000000000000..ffc68f2e1314 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-cmake_QtBuild.cmake > > @@ -0,0 +1,11 @@ > > +--- cmake/QtBuild.cmake.orig 2022-05-25 08:58:52 UTC > > ++++ cmake/QtBuild.cmake > > +@@ -198,7 +198,7 @@ function(qt_internal_set_up_global_paths) > > + if(QT_CONFIG_INSTALL_DIR) > > + string(APPEND QT_CONFIG_INSTALL_DIR "/") > > + endif() > > +- string(APPEND QT_CONFIG_INSTALL_DIR ${__config_path_part}) > > ++ string(APPEND QT_CONFIG_INSTALL_DIR "lib/cmake") > > + > > + set(QT_BUILD_DIR "${QT_BUILD_DIR}" PARENT_SCOPE) > > + set(QT_INSTALL_DIR "${QT_INSTALL_DIR}" PARENT_SCOPE) > > diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cma= ke b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake > > new file mode 100644 > > index 000000000000..bdde060014ad > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake > > @@ -0,0 +1,13 @@ > > +--- cmake/QtFlagHandlingHelpers.cmake.orig 2022-05-25 08:58:52 UTC > > ++++ cmake/QtFlagHandlingHelpers.cmake > > +@@ -64,6 +64,10 @@ function(qt_internal_add_link_flags_no_undefined ta= rge > > + set(no_undefined_flag "-Wl,--no-undefined") > > + endif() > > + > > ++ if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") > > ++ set(no_undefined_flag "") > > ++ endif() > > ++ > > + set(CMAKE_REQUIRED_LINK_OPTIONS ${previous_CMAKE_REQUIRED_LIN= K_OPTIONS}) > > + > > + if (NOT HAVE_DASH_UNDEFINED_SYMBOLS AND NOT HAVE_DASH_DASH_NO= _UNDEFINED) > > diff --git a/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake = b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake > > new file mode 100644 > > index 000000000000..2c03e159894c > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake > > @@ -0,0 +1,10 @@ > > +--- cmake/QtPkgConfigHelpers.cmake.orig 2022-08-07 11:26:08 UTC > > ++++ cmake/QtPkgConfigHelpers.cmake > > +@@ -144,6 +144,6 @@ function(qt_internal_generate_pkg_config_file modu= le) > > + # This is inspired by https://gitlab.kitware.com/cmake/cmake/= -/issues/20842 > > + target_sources(${module} PRIVATE "${final_pc_path}") > > + > > +- qt_install(FILES "${final_pc_path}" DESTINATION "${install_di= r}") > > ++ qt_install(FILES "${final_pc_path}" DESTINATION "${CMAKE_INST= ALL_PREFIX}/libdata/pkgconfig") > > + endforeach() > > + endfunction() > > diff --git a/devel/qt6-base/files/patch-cmake_QtRpathHelpers.cmake b/de= vel/qt6-base/files/patch-cmake_QtRpathHelpers.cmake > > new file mode 100644 > > index 000000000000..4cb568c0c01f > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-cmake_QtRpathHelpers.cmake > > @@ -0,0 +1,11 @@ > > +--- cmake/QtRpathHelpers.cmake.orig 2022-05-25 08:58:52 UTC > > ++++ cmake/QtRpathHelpers.cmake > > +@@ -29,6 +29,8 @@ function(qt_compute_relative_rpath_base rpath instal= l_ > > + set(rpath_rel_base "@loader_path") > > + elseif(LINUX OR SOLARIS OR FREEBSD) > > + set(rpath_rel_base "$ORIGIN") > > ++ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") > > ++ set(rpath_rel_base "$ORIGIN") > > + else() > > + message(WARNING "No known RPATH_REL_BASE for target platform.= ") > > + set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE") > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_devicedisco= very_qdevicediscovery__static.cpp b/devel/qt6-base/files/patch-src_platform= support_devicediscovery_qdevicediscovery__static.cpp > > new file mode 100644 > > index 000000000000..6ebffd0f4c5a > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qd= evicediscovery__static.cpp > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.or= ig 2020-07-03 14:25:13 UTC > > ++++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp > > +@@ -47,11 +47,7 @@ > > + #include > > + #include > > + > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include > > +-#endif > > + #include > > + > > + /* android (and perhaps some other linux-derived stuff) don't define = everything > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_devicedisco= very_qdevicediscovery__udev.cpp b/devel/qt6-base/files/patch-src_platformsu= pport_devicediscovery_qdevicediscovery__udev.cpp > > new file mode 100644 > > index 000000000000..205ff82ee4d5 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qd= evicediscovery__udev.cpp > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp.orig= 2020-07-03 14:25:13 UTC > > ++++ src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp > > +@@ -46,11 +46,7 @@ > > + #include > > + #include > > + > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include > > +-#endif > > + > > + QT_BEGIN_NAMESPACE > > + > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdev= keyboard_qevdevkeyboard__defaultmap__p.h b/devel/qt6-base/files/patch-src_p= latformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h > > new file mode 100644 > > index 000000000000..c5e925a03f38 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboar= d_qevdevkeyboard__defaultmap__p.h > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_= p.h.orig 2020-07-03 14:25:13 UTC > > ++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_= p.h > > +@@ -52,11 +52,7 @@ > > + // > > + > > + #include "qnamespace.h" > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include "linux/input.h" > > +-#endif > > + > > + // no QT_BEGIN_NAMESPACE, since we include it internally... > > + > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdev= keyboard_qevdevkeyboardhandler.cpp b/devel/qt6-base/files/patch-src_platfor= msupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp > > new file mode 100644 > > index 000000000000..95ad75033670 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboar= d_qevdevkeyboardhandler.cpp > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.= orig 2020-12-04 10:14:27 UTC > > ++++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp > > +@@ -53,11 +53,7 @@ > > + #include > > + #include > > + > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include > > +-#endif > > + > > + #ifndef input_event_sec > > + #define input_event_sec time.tv_sec > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdev= mouse_qevdevmousehandler.cpp b/devel/qt6-base/files/patch-src_platformsuppo= rt_input_evdevmouse_qevdevmousehandler.cpp > > new file mode 100644 > > index 000000000000..4e4b6053d6d7 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevmouse_q= evdevmousehandler.cpp > > @@ -0,0 +1,15 @@ > > +--- src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp.orig = 2020-07-03 14:25:13 UTC > > ++++ src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp > > +@@ -53,12 +53,7 @@ > > + > > + #include > > + > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > +-#include > > + #include > > +-#endif > > + > > + #define TEST_BIT(array, bit) (array[bit/8] & (1<<(bit%8))) > > + > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdev= tablet_qevdevtablethandler.cpp b/devel/qt6-base/files/patch-src_platformsup= port_input_evdevtablet_qevdevtablethandler.cpp > > new file mode 100644 > > index 000000000000..fa1194a91f71 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_= qevdevtablethandler.cpp > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig= 2020-07-03 14:25:13 UTC > > ++++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp > > +@@ -46,11 +46,7 @@ > > + #include > > + #include > > + #include > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include > > +-#endif > > + > > + QT_BEGIN_NAMESPACE > > + > > diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdev= touch_qevdevtouchhandler.cpp b/devel/qt6-base/files/patch-src_platformsuppo= rt_input_evdevtouch_qevdevtouchhandler.cpp > > new file mode 100644 > > index 000000000000..d4f725ce6e87 > > --- /dev/null > > +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_q= evdevtouchhandler.cpp > > @@ -0,0 +1,14 @@ > > +--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig = 2022-05-25 08:58:52 UTC > > ++++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp > > +@@ -53,11 +53,7 @@ > > + > > + #include > > + > > +-#ifdef Q_OS_FREEBSD > > +-#include > > +-#else > > + #include > > +-#endif > > + > > + #ifndef input_event_sec > > + #define input_event_sec time.tv_sec > > diff --git a/devel/qt6-base/pkg-descr b/devel/qt6-base/pkg-descr > > new file mode 100644 > > index 000000000000..cc23400cc6b0 > > --- /dev/null > > +++ b/devel/qt6-base/pkg-descr > > @@ -0,0 +1,3 @@ > > +Qt Base > > + > > +WWW: https://www.qt.io/ > > diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist > > new file mode 100644 > > index 000000000000..60595f5486d9 > > --- /dev/null > > +++ b/devel/qt6-base/pkg-plist > > @@ -0,0 +1,3746 @@ > > +bin/qmake6 > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrent > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrentDepends > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrentFilter > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrentMap > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrentRun > > +%%QT_INCDIR%%/QtConcurrent/QtConcurrentVersion > > +%%QT_INCDIR%%/QtConcurrent/qtaskbuilder.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrent_global.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentcompilertest.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentexports.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentfilter.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentfilterkernel.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentfunctionwrappers.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentiteratekernel.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentmap.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentmapkernel.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentmedian.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentreducekernel.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentrun.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentrunbase.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentstoredfunctioncall.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrenttask.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentthreadengine.h > > +%%QT_INCDIR%%/QtConcurrent/qtconcurrentversion.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/minimum-linux_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractanimation_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracteventdispatch= er_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractfileengine_p.= h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractitemmodel_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractproxymodel_p.= h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qandroidextras_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborcommon_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoffpeparser_p.h > > +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h > > *** 11194 LINES SKIPPED ***