diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index 209dc7432189..1ac27eb742c3 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -1,550 +1,552 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk # - qt-dist: The port is a port for a part of Qt # - auto includes qt.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # # Usage # qt-dist:[,yes|modulename] # # MAINTAINER: kde@FreeBSD.org .if !defined(_QT_DIST_MK_INCLUDED) _QT_DIST_MK_INCLUDED= qt-dist.mk # Suck in qt.mk and qmake.mk qt_ARGS?= # empty .include "${USESDIR}/qt.mk" qmake_ARGS?= # empty .include "${USESDIR}/qmake.mk" # Supported distribution arguments _COMMON_DISTS= 3d base charts connectivity datavis3d declarative imageformats location multimedia \ networkauth quick3d quicktimeline remoteobjects scxml sensors \ serialbus serialport speech svg tools translations virtualkeyboard \ wayland webchannel webengine websockets webview _QT5_DISTS= gamepad graphicaleffects quickcontrols \ quickcontrols2 script webglplugin \ x11extras xmlpatterns _QT6_DISTS= 5compat coap doc graphs grpc httpserver languageserver lottie positioning \ quick3dphysics quickeffectmaker shadertools _QT_DISTS= ${_COMMON_DISTS} \ ${_QT${_QT_VER}_DISTS} # We only accept one item as an argument. The fetch target further below works # around this. _QT_DIST= # empty . for dist in ${_QT_DISTS:O:u} . if ${qt-dist_ARGS:M${dist}} . if empty(_QT_DIST) _QT_DIST= ${dist} . else IGNORE= cannot be installed: different Qt dists specified via qt-dist:[${qt-dist_ARGS:S/ /,/g}] . endif . endif . endfor # Fall back to sensible defaults for _QT_DIST . if empty(_QT_DIST) _QT_DIST= ${PORTNAME} # don't force qt-dist to be set for Qt5 ports which 75% of time are ${PORTNAME} . endif # Check validitiy . if empty(_QT_DISTS:M${_QT_DIST}) IGNORE= Unsupported qt-dist ${_QT_DIST} for qt:${_QT_VER} . endif ################################################################################ # Set standard bsd.port.mk variables. LICENSE?= LGPL21 WWW?= https://www.qt.io/ . if !exists(${PKGDIR}/pkg-descr) DESCR?= ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr . endif # Stage support. _QT5_DESTDIRNAME= INSTALL_ROOT _QT6_DESTDIRNAME= DESTDIR DESTDIRNAME= ${_QT${_QT_VER}_DESTDIRNAME} # Qt's tarballs are xz compressed. . if empty(USES:Mtar) EXTRACT_SUFX?= .tar.xz . endif # Qt5 specific master sites _QT5_MASTER_SITES_kde= LOCAL _QT5_MASTER_SITE_SUBDIR_kde= kde/KDE/Qt/${_QT_VERSION} _QT5_MASTER_SITES= ${MASTER_SITE_QT} _QT5_MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ # Qt6 specific master sites _QT6_MASTER_SITES= ${MASTER_SITE_QT} _QT6_MASTER_SITE_SUBDIR= ${_QT6_RELEASE_TYPE}_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules # Qt5 specific distnames . if ${_QT_DIST} == webengine _QT5_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},} . else _QT5_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} . endif _QT5_DISTNAME_kde= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},} # Qt6 specific distnames _QT6_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} # Effective master sites and distfile values # net/qt6-coap has no submodule distfile and uses USE_GITHUB . if ${_QT_DIST} != coap MASTER_SITES= ${_QT${_QT_VER}_MASTER_SITES${_KDE_${_QT_DIST}:D_kde}} MASTER_SITE_SUBDIR= ${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_KDE_${_QT_DIST}:D_kde}} DISTNAME= ${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_DIST}:D_kde}} DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} . endif DIST_SUBDIR= KDE/Qt/${_QT_VERSION} . if ${_QT_VER:M5} # KDE maintains a repository with a patched Qt5 distribution. _KDE_3d= 0 -_KDE_base= 127 +_KDE_base= 130 _KDE_charts= 0 -_KDE_connectivity= 3 +_KDE_connectivity= 1 _KDE_datavis3d= 0 -_KDE_declarative= 25 +_KDE_declarative= 22 _KDE_gamepad= 0 _KDE_graphicaleffects= 0 -_KDE_imageformats= 4 +_KDE_imageformats= 2 _KDE_location= 7 _KDE_multimedia= 2 _KDE_networkauth= 1 _KDE_quick3d= 1 _KDE_quickcontrols= 0 _KDE_quickcontrols2= 5 _KDE_quicktimeline= 0 _KDE_remoteobjects= 0 _KDE_script= 0 _KDE_script_ORIGIN_TAG= v5.15.18-lts _KDE_script_VERSION= 5.15.18 _KDE_scxml= 0 _KDE_sensors= 0 _KDE_serialbus= 0 _KDE_serialport= 0 _KDE_speech= 1 _KDE_svg= 5 _KDE_tools= 3 _KDE_translations= 0 _KDE_virtualkeyboard= 0 _KDE_wayland= 59 _KDE_webchannel= 3 -_KDE_webengine= 2 +# We track the 5.15 branch for www/qt5-webengine to make it easier to +# stay on top of Chromium security patches. +_KDE_webengine= 5 _KDE_webengine_BRANCH= 5.15 _KDE_webengine_ORIGIN_TAG= v5.15.18-lts _KDE_webengine_VERSION= 5.15.18 _KDE_webglplugin= 0 _KDE_websockets= 2 _KDE_webview= 0 _KDE_x11extras= 0 _KDE_xmlpatterns= 0 . if defined(_KDE_${_QT_DIST}) . if defined(_KDE_${_QT_DIST}_ORIGIN_TAG) _KDE_${_QT_DIST}_BRANCH?= ${_KDE_${_QT_DIST}_VERSION} . else _KDE_${_QT_DIST}_BRANCH= kde/5.15 COMMENT+= (KDE patched) . endif QT5_KDE_PATCH= p${_KDE_${_QT_DIST}} _KDE_${_QT_DIST}_VERSION?= ${_QT_VERSION} _KDE_${_QT_DIST}_ORIGIN_TAG?= v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl . else QT5_KDE_PATCH= # . endif . endif # ${_QT_VER:M5} # 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 latter are # always passed to the linker even if they are not actually used. By passing # --as-needed to the linker by default when building the Qt ports we do not # have to declare a lot of unnecessary dependencies in USE_QT5. LDFLAGS+= -Wl,--as-needed . if ${_QT_DIST} == "base" && ${PORTNAME} != "qmake" # Qt configure requires pkg-config to detect dependencies. .include "${USESDIR}/pkgconfig.mk" . endif # -nomake is only used by qtbase's configure script. # Other ports from other Qt modules will automatically build examples and # tests if the directories exist because of mkspecs/features/qt_parts.prf. EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ ${DISTNAME:S,$,/tests,:S,^,--exclude ,} \ --no-same-owner --no-same-permissions . endif # ! ${_QT_VER:M5} # Build setup for Qt6 . if ${_QT_VER:M6} CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DINSTALL_BINDIR=${PREFIX}/${QT_BINDIR_REL} \ -DINSTALL_PUBLICBINDIR=${PREFIX}/bin \ -DINSTALL_LIBDIR=${PREFIX}/${QT_LIBDIR_REL} \ -DINSTALL_LIBEXECDIR=${PREFIX}/${QT_LIBEXECDIR_REL} \ -DINSTALL_DOCDIR=${PREFIX}/${QT_DOCDIR_REL} \ -DINSTALL_ARCHDATADIR=${PREFIX}/${QT_ARCHDIR_REL} \ -DINSTALL_DATADIR=${PREFIX}/${QT_DATADIR_REL} \ -DINSTALL_INCLUDEDIR=${PREFIX}/${QT_INCDIR_REL} \ -DINSTALL_MKSPECSDIR=${PREFIX}/${QT_MKSPECDIR_REL} \ -DINSTALL_EXAMPLESDIR=${PREFIX}/${QT_EXAMPLEDIR_REL} \ -DINSTALL_DESCRIPTIONSDIR=${PREFIX}/${QT_DESCRIPTIONSDIR_REL} \ -DQT_QMAKE_TARGET_MKSPEC:String=freebsd-clang \ --log-level=TRACE . endif # Build setup for Qt5 . if ${_QT_VER:M5} CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ARGS+= -opensource -confirm-license \ -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/${QT_BINDIR_REL} \ -headerdir ${PREFIX}/${QT_INCDIR_REL} \ -libdir ${PREFIX}/${QT_LIBDIR_REL} \ -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \ -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \ -datadir ${PREFIX}/${QT_DATADIR_REL} \ -docdir ${PREFIX}/${QT_DOCDIR_REL} \ -translationdir ${PREFIX}/${QT_L10NDIR_REL} \ -sysconfdir ${PREFIX}/${QT_ETCDIR_REL} \ -nomake examples -nomake tests \ -platform ${QMAKESPECNAME} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \ -testsdir ${PREFIX}/${QT_TESTDIR_REL} . if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2) CONFIGURE_ARGS+= -no-sse2 . endif # Work around a bug in current binutils, where the gold linker creates # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports. CONFIGURE_ARGS+= -no-use-gold-linker # Pass -recheck-all so that multiple calls to the configure script really # re-run all checks. CONFIGURE_ARGS+= -recheck-all . endif # ${_QT_VER:M5} . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) WITH_DEBUG= yes STRIP= # It's done prior to bsd.qt.mk inclusion. CONFIGURE_ARGS+= -debug -separate-debug-info # Override configuration in global qconfig.pri. QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \ QT_CONFIG-="release" . else CONFIGURE_ARGS+= -release -no-separate-debug-info QMAKE_ARGS+= QT_CONFIG+="release" \ QT_CONFIG-="debug separate_debug_info" . endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) . if defined(WANT_QT_VERBOSE_CONFIGURE) CONFIGURE_ARGS+= -verbose . endif . if ${_QT_DIST} == "base" _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf . if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf USE_GCC= yes . elif ${ARCH} == armv7 || ${ARCH} == powerpc _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf . endif . if ${_QT_VER:M5} EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-sync.profiles \ ${_EXTRA_PATCHES_QT5} . endif # ${_QT_VER:M5} . endif # ${_QT_DIST} == "base" # Override settings installed in qconfig.h and *.pri files. The flags will be # installed along with the port, but have to be passed as arguments while # building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups") # are needed to disable some features. . if !defined(${QT_MODNAME}) || empty(${QT_MODNAME}) # Used for both qconfig-*.h and qt_config_*.pri; it can't be empty. QT_MODNAME= ${PORTNAME} . endif QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix). QT_CONFIG?= # For *.pri files QT_CONFIG flags. . if ${QT_DEFINES} QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}" . endif # ${QT_DEFINES} PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install . if ${QT_CONFIG:N-*} QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" . endif . if ${QT_CONFIG:M-*} QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" . endif PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ FULLVER=${_QT_VERSION:C/-.*//} . if defined(WITH_DEBUG) PLIST_SUB+= DEBUG="" \ NO_DEBUG="@comment " . else PLIST_SUB+= DEBUG="@comment " \ NO_DEBUG="" . endif # Handle additional PLIST directories, which should only be used for Qt-dist ports. . for dir in ETC # Export QT_ETCDIR. PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endfor . if ${_QT_VER:M5} . for dir in CMAKE # Export QT_CMAKEDIR. PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endfor . endif . if ${_QT_VER:M5} . if ${_QT_DIST} == "base" # qtbase requires some tools to be symlinked to the build directory. _QT_TOOLS= # empty . if ${PORTNAME} != "qmake" _QT_TOOLS+= ${QMAKE} . endif . if ${PORTNAME} != "buildtools" _QT_TOOLS+= ${MOC} ${RCC} . endif . if ${PORTNAME} != "qdoc" _QT_TOOLS+= qdoc . endif . if ${PORTNAME} != "dbus" _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp . endif . if ${PORTNAME} != "widgets" _QT_TOOLS+= ${UIC} . endif # The list of QtBase components that need to be linked into WRKSRC/lib for # other QtBase ports. See below. _QT5_BASE= core dbus gui network sql widgets _QT5_ADDITIONAL_LINK?= # Ensure definition . if ${_QT_VER:M5} post-patch: gcc-post-patch gcc-post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mkspecs/common/gcc-base.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ ${WRKSRC}/mkspecs/common/gcc-base.conf \ ${WRKSRC}/mkspecs/common/g++-base.conf \ ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf . endif pre-configure: qtbase-pre-configure qtbase-pre-configure: . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${TRUE} . endfor # The following is a fix for the inplace upgrade problem we faced (see # QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously, # which previously was adressed by making sure, that ${LOCALBASE}/lib, which # would often gets added by pkgconf for the dependencies, was passed after # ${WRKSRC}/lib. # * We fix the inplace upgrade problem by moving the Qt5 libraries into # ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore. # * However, this means, that the ports belonging to the split up QtBase package # now no longer can find their depending QtBase libraries. We fix this by # linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends # on them. . if ${_QT_DIST:Mbase} . for basedep in ${_QT5_BASE} . if ! empty(USE_QT:M${basedep}) ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib . endif . endfor . endif # # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** # # Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out # certain paths from pkg-config calls (see the explanation in # devel/qt5/files/patch-configure) as well as for setting # QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for # ports/194088. post-patch: qtbase-post-patch qtbase-post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf . if ${PORTNAME} != "qmake" _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake . endif . endif pre-configure: qt5-pre-configure qt5-pre-configure: # Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that # requires tests/auto/cmake to be present, otherwise the configure stage will # fail. # Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same # time, we have to disable the check in a cache file (the only way to get this # value through to the configure script in qtbase). ${MKDIR} ${CONFIGURE_WRKSRC} ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache # configure will run syncqt.pl if it finds a .git entry in the working directory touch ${WRKSRC}/.git # As the patch collection was created after a version bump, all module verisions # are tagged as 5.15.3 touch ${WRKSRC}/.qmake.conf # easier than to -f before the sed ${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.\([0-9]*\)|${_QT_VERSION}|g' \ ${WRKSRC}/.qmake.conf # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** # # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # the linker before -L/usr/local/lib. By default, the opposite happens, which # is a problem when a Qt port is being upgraded, since an existing library # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache # Allow linking of further libraries to the configure directory. . if !empty(_QT5_ADDITIONAL_LINK) . for dep in ${_QT5_ADDITIONAL_LINK} ${MKDIR} ${CONFIGURE_WRKSRC}/lib . if ! empty(USE_QT:M${dep}) ${LN} -sf ${QT_LIBDIR}/${qt-${dep}_LIB} ${CONFIGURE_WRKSRC}/lib . endif . endfor . endif . if ${QT_DEFINES:N-*} # There **are** defines, so we need to **add** this port to the # qconfig-modules.h header; make @need_add empty and comment out # the @need_remove lines in the script (see below in qt-post-install). # If there are no defines, do it the other way around. _sub_need_add= _sub_need_remove= \#\# . else _sub_need_add= \#\# _sub_need_remove= . endif # If a port installs Qt version-specific binaries (e.g. "designer" which # existed as a Qt4 application and exists as a Qt5 application and will # probably be a Qt6 application) the port should set `QT_BINARIES=yes`. . if defined(QT_BINARIES) _sub_need_bin= . else _sub_need_bin= \#\# . endif . if ${QT_MODNAME} == core # QtCore (e.g. devel/qt5-core) is the one that starts the header, # and is also the one that can clean it up when deinstalled. _sub_need_clean= . else _sub_need_clean= \#\# . endif # The Qt modules have an install- and deinstall-step for wrangling # the qconfig-modules.h header, but qmake does not. . if ${PORTNAME} != "qmake" post-install: qt-post-install . endif # PORTNAME != qmake qt-post-install: # We can't use SUB_FILES with the shared pkg-change.in. # We need it to be a script instead of a group of @unexecs. # Do two steps of processing -- introducing the Qt variables, # and replacing the @tags with comment (or nothing) characters # according to the port's settings -- in one sed and write # to pkg-change.tmp. Then split it up and minify for the # install and deinstall step. @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \ -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \ -e 's,@need_add,${_sub_need_add},' \ -e 's,@need_remove,${_sub_need_remove},' \ -e 's,@need_clean,${_sub_need_clean},' \ -e 's,@need_bin,${_sub_need_bin},' \ ${PORTSDIR}/devel/${_QT_RELNAME}/${FILESDIR:T}/pkg-change.in > \ ${WRKDIR}/pkg-change.tmp @${SED} -e 's,@install,,' -e 's,@deinstall,##,' ${WRKDIR}/pkg-change.tmp | ${SED} -e '/##/d' > ${PKGINSTALL} @${SED} -e 's,@install,##,' -e 's,@deinstall,,' ${WRKDIR}/pkg-change.tmp | ${SED} -e '/##/d' > ${PKGDEINSTALL} # Drop all leading spaces in the script, to minify @${REINPLACE_CMD} 's/^ *//' ${PKGINSTALL} ${PKGDEINSTALL} . if ${QT_DEFINES:N-*} @${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules @${ECHO_CMD} -n \ > ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . for def in ${QT_DEFINES:N-*:O:u:C/=.*$//} @${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h ${ECHO_CMD} "# define QT_${def}" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} "#endif" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . endfor @${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \ >> ${TMPPLIST} . endif # ${QT_DEFINES:N-*} . if ${QT_CONFIG:N-*} @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \ >> ${TMPPLIST} . endif # ${QT_CONFIG:N-*} . endif # M5 . if ${_QT_VER:M6} post-stage: qt6-post-stage # Clean-up of empty directories, as we install # * cmake to ${LOCALBASE}/lib/cmake not ${QT_LIBDIR}/cmake. # * pkgconfig to ${LOCALBASE}/libexec/pkgconfig not ${QT_LIBDIR}/pkgconfig qt6-post-stage: ${RM} -r ${STAGEDIR}${QT_LIBDIR}/cmake ${RM} -r ${STAGEDIR}${QT_LIBDIR}/pkgconfig . endif qt-create-kde-distfile: ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} ${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \ ${_QT_DIST} \ ${DISTDIR}/${DIST_SUBDIR} \ ${_KDE_${_QT_DIST}_VERSION} \ ${_KDE_${_QT_DIST}_ORIGIN_TAG} \ ${_KDE_${_QT_DIST}_BRANCH} .endif # defined(_QT_DIST_MK_INCLUDED) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 368589d3f24f..ef8f11a57041 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -1,479 +1,479 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk # - qt-dist: The port is a port for a part of Qt # - auto includes qt.mk and qmake.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # Usage: # USES=qt:[,no_env] # # Versions: 5, 6 # # Port variables: # USE_QT - List of Qt modules to depend on, with optional ':build' # and ':run' suffixes. Define it empty to include this file # without depending on Qt ports. # # MAINTAINER: kde@FreeBSD.org .if !defined(_QT_MK_INCLUDED) _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 -QT5_VERSION?= 5.15.15 +QT5_VERSION?= 5.15.16 QT6_VERSION?= 6.7.3 PYSIDE6_VERSION?= 6.7.3 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, # but misc/qt6-examples needs this too. . if ${QT6_VERSION:M*beta*} || ${QT6_VERSION:M*rc*} _QT6_RELEASE_TYPE= development . else _QT6_RELEASE_TYPE= official . endif # 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) IGNORE= qt needs a version (${_QT_SUPPORTED}) passed via qt, qmake or qt-dist. . endif # Gather all the args together _QT_GLOBAL_ARGS= ${qt_ARGS} ${qmake_ARGS} ${qt-dist_ARGS} # Check fo the Qt version to be used _QT_VER= # empty . for ver in ${_QT_SUPPORTED:O:u} . if ${_QT_GLOBAL_ARGS:M${ver}} . if !defined(_QT_VERSION) _QT_VER= ${ver} . else . if ${_QT_VERSION} != ${ver} IGNORE?= cannot be installed: different Qt versions specified via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] a qt-dist:[${_QT_SUPPORTED:S/ //g}] . endif . endif . endif . endfor . if empty(_QT_VER) IGNORE?= cannot decide what Qt version to use: specify one via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] or qt-dist:[${_QT_SUPPORTED:S/ //g}] . endif # Set the shortcuts used from now on _QT_RELNAME= qt${_QT_VER} _QT_VERSION= ${QT${_QT_VER}_VERSION} QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin QT_INCDIR_REL?= include/${_QT_RELNAME} QT_LIBDIR_REL?= lib/${_QT_RELNAME} QT_ARCHDIR_REL?= ${QT_LIBDIR_REL} QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins QT_DESCRIPTIONSDIR_REL?=${QT_DATADIR_REL}/modules QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml QT_DATADIR_REL?= share/${_QT_RELNAME} QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} QT_L10NDIR_REL?= ${QT_DATADIR_REL}/translations QT_ETCDIR_REL?= etc/xdg QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} QT_TESTDIR_REL?= ${QT_DATADIR_REL}/tests QT_CMAKEDIR_REL?= lib/cmake _QT5_TOOLDIR_REL= ${QT_BINDIR_REL} _QT6_TOOLDIR_REL= ${QT_LIBEXECDIR_REL} QT_TOOLDIR_REL= ${_QT${_QT_VER}_TOOLDIR_REL} # Not customizable. QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs _QT_LIBVER= ${_QT_VERSION:R:R} LCONVERT?= ${QT_BINDIR}/lconvert LRELEASE?= ${QT_BINDIR}/lrelease LUPDATE?= ${QT_BINDIR}/lupdate MOC?= ${QT_TOOLDIR}/moc RCC?= ${QT_TOOLDIR}/rcc UIC?= ${QT_TOOLDIR}/uic QMAKE?= ${QT_BINDIR}/qmake QCOLLECTIONGENERATOR?= ${QT_TOOLDIR}/qcollectiongenerator QHELPGENERATOR?= ${QT_TOOLDIR}/qhelpgenerator # Needed to redefine the qmake target for internal Qt configuration. _QMAKE?= ${QMAKE} QMAKESPECNAME?= freebsd-${QMAKE_COMPILER} QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME} # The whole Qt distribution should be built with the same compiler, but it's # better to support custom settings. Dereferencing the detection allows to # avoid forking a shell on each inclusion of this file, and to catch any CXX # customization (via USE_GCC, etc.). QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) . for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ CMAKE TOOL QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. # For the others, exclude QT_CMAKEDIR and QT_ETCDIR. . if ${dir:NCMAKE} && ${dir:NETC} PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endif . endfor # Suppress warnings from rcc about not using a UTF-8 locale. . if ${_QT_VER:M6} USE_LOCALE?= C.UTF-8 . endif CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} # Make sure both the installed mkspecs as well as the ones being built are # found, with the ones from the port being built having preference. CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" # Qt uses generated linker version scripts which always have a qt_version_tag # symbol, but that symbol is only defined in the main Qt shared library. For # other Qt components, this leads to lld >= 17 erroring out due to the symbol # being undefined. Supress these errors. LDFLAGS+= -Wl,--undefined-version _USES_POST+= qt .endif # _QT_MK_INCLUDED # ============================================================================= # # ============================================================================= .if defined(_POSTMKINCLUDED) && !defined(_QT_MK_POST_INCLUDED) _QT_MK_POST_INCLUDED= qt.mk # The Qt components supported by qt.mk: list of shared, and version specific ones _USE_QT_COMMON= 3d charts connectivity datavis3d declarative doc examples imageformats location \ multimedia networkauth quick3d quicktimeline remoteobjects scxml \ sensors serialbus serialport speech svg virtualkeyboard wayland \ webchannel webengine websockets webview _USE_QT5_ONLY= assistant buildtools concurrent core dbus \ declarative-test designer diag gamepad \ graphicaleffects gui help l10n linguist linguisttools \ network opengl paths pixeltool plugininfo printsupport \ qdbus qdbusviewer qdoc qdoc-data qev qmake quickcontrols \ quickcontrols2 script scripttools sql sql-mysql sql-odbc \ sql-pgsql sql-sqlite2 sql-sqlite3 sql-tds testlib uiplugin \ uitools webglplugin websockets-qml \ widgets x11extras xml xmlpatterns _USE_QT6_ONLY= 5compat base coap graphs grpc httpserver languageserver lottie pdf positioning \ quick3dphysics quickeffectmaker shadertools tools translations \ sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc # Dependency tuples: _LIB should be preferred if possible. qt-3d_PORT= graphics/${_QT_RELNAME}-3d qt-3d_LIB= libQt${_QT_LIBVER}3DCore.so qt-5compat_PORT= devel/${_QT_RELNAME}-5compat qt-5compat_LIB= libQt${_QT_LIBVER}Core5Compat.so qt-assistant_PORT= devel/${_QT_RELNAME}-assistant qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant # Always build with *this* version's buildtools qt-buildtools_PORT= devel/${_QT_RELNAME}-buildtools qt-buildtools_PATH= ${_QT_RELNAME}-buildtools>=${_QT_VERSION:R} qt-base_PORT= devel/${_QT_RELNAME}-base qt-base_LIB= libQt${_QT_LIBVER}Core.so qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts qt-charts_LIB= libQt${_QT_LIBVER}Charts.so qt-coap_PORT= net/${_QT_RELNAME}-coap qt-coap_LIB= libQt${_QT_LIBVER}Coap.so qt-concurrent_PORT= devel/${_QT_RELNAME}-concurrent qt-concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so qt-connectivity_PORT= comms/${_QT_RELNAME}-connectivity qt-connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so qt-core_PORT= devel/${_QT_RELNAME}-core qt-core_LIB= libQt${_QT_LIBVER}Core.so qt-datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d qt-datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so qt-dbus_PORT= devel/${_QT_RELNAME}-dbus qt-dbus_LIB= libQt${_QT_LIBVER}DBus.so qt-declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative qt-declarative_LIB= libQt${_QT_LIBVER}Qml.so qt-declarative-test_PORT= x11-toolkits/${_QT_RELNAME}-declarative-test qt-declarative-test_LIB= libQt${_QT_LIBVER}QuickTest.so qt-designer_PORT= devel/${_QT_RELNAME}-designer qt-designer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/designer qt-diag_PORT= sysutils/${_QT_RELNAME}-qtdiag qt-diag_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdiag qt-doc_PORT= misc/${_QT_RELNAME}-doc qt-doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} qt-examples_PORT= misc/${_QT_RELNAME}-examples qt-examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R} qt-gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad qt-gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so qt-graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects qt-graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir qt-graphs_PORT= x11-toolkits/${_QT_RELNAME}-graphs qt-graphs_LIB= libQt${_QT_LIBVER}Graphs.so qt-grpc_PORT= devel/${_QT_RELNAME}-grpc qt-grpc_LIB= libQt${_QT_LIBVER}Grpc.so qt-gui_PORT= x11-toolkits/${_QT_RELNAME}-gui qt-gui_LIB= libQt${_QT_LIBVER}Gui.so qt-help_PORT= devel/${_QT_RELNAME}-help qt-help_LIB= libQt${_QT_LIBVER}Help.so qt-httpserver_PORT= www/${_QT_RELNAME}-httpserver qt-httpserver_LIB= libQt${_QT_LIBVER}HttpServer.so qt-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats qt-imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so qt-languageserver_PORT= devel/${_QT_RELNAME}-languageserver qt-languageserver_LIB= libQt${_QT_LIBVER}LanguageServer.so qt-lottie_PORT= graphics/${_QT_RELNAME}-lottie qt-lottie_LIB= libQt${_QT_LIBVER}Bodymovin.so qt-linguist_PORT= devel/${_QT_RELNAME}-linguist qt-linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist qt-linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools qt-linguisttools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/lrelease qt-location_PORT= devel/${_QT_RELNAME}-location qt-location_LIB= libQt${_QT_LIBVER}Location.so qt-l10n_PORT= misc/${_QT_RELNAME}-l10n qt-l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} qt-multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia qt-multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so qt-network_PORT= net/${_QT_RELNAME}-network qt-network_LIB= libQt${_QT_LIBVER}Network.so qt-networkauth_PORT= net/${_QT_RELNAME}-networkauth qt-networkauth_LIB= libQt${_QT_LIBVER}NetworkAuth.so qt-opengl_PORT= graphics/${_QT_RELNAME}-opengl qt-opengl_LIB= libQt${_QT_LIBVER}OpenGL.so qt-paths_PORT= sysutils/${_QT_RELNAME}-qtpaths qt-paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths qt-pdf_PORT= print/${_QT_RELNAME}-pdf qt-pdf_LIB= libQt${_QT_LIBVER}Pdf.so qt-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool qt-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool qt-positioning_PORT= devel/${_QT_RELNAME}-positioning qt-positioning_LIB= libQt${_QT_LIBVER}Positioning.so qt-plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo qt-plugininfo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtplugininfo qt-printsupport_PORT= print/${_QT_RELNAME}-printsupport qt-printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so qt-qdbus_PORT= devel/${_QT_RELNAME}-qdbus qt-qdbus_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbus qt-qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer qt-qdbusviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbusviewer qt-qdoc_PORT= devel/${_QT_RELNAME}-qdoc qt-qdoc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc qt-qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data qt-qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf qt-qev_PORT= x11/${_QT_RELNAME}-qev qt-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev # Always build with *this* version's qmake qt-qmake_PORT= devel/${_QT_RELNAME}-qmake qt-qmake_PATH= ${_QT_RELNAME}-qmake>=${_QT_VERSION:R} qt-quick3d_PORT= x11-toolkits/${_QT_RELNAME}-quick3d qt-quick3d_LIB= libQt${_QT_LIBVER}Quick3D.so qt-quick3dphysics_PORT= science/${_QT_RELNAME}-quick3dphysics qt-quick3dphysics_LIB= libQt${_QT_LIBVER}Quick3DPhysics.so qt-quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols qt-quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir qt-quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 qt-quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so qt-quickeffectmaker_PORT= graphics/${_QT_RELNAME}-quickeffectmaker qt-quickeffectmaker_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qqem qt-quicktimeline_PORT= x11-toolkits/${_QT_RELNAME}-quicktimeline qt-quicktimeline_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Timeline/libqtquicktimelineplugin.so qt-remoteobjects_PORT= devel/${_QT_RELNAME}-remoteobjects qt-remoteobjects_LIB= libQt${_QT_LIBVER}RemoteObjects.so qt-sensors_PORT= comms/${_QT_RELNAME}-sensors qt-sensors_LIB= libQt${_QT_LIBVER}Sensors.so qt-script_PORT= devel/${_QT_RELNAME}-script qt-script_LIB= libQt${_QT_LIBVER}Script.so qt-scripttools_PORT= devel/${_QT_RELNAME}-scripttools qt-scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so qt-scxml_PORT= devel/${_QT_RELNAME}-scxml qt-scxml_LIB= libQt${_QT_LIBVER}Scxml.so qt-serialbus_PORT= comms/${_QT_RELNAME}-serialbus qt-serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so qt-serialport_PORT= comms/${_QT_RELNAME}-serialport qt-serialport_LIB= libQt${_QT_LIBVER}SerialPort.so qt-shadertools_PORT= x11-toolkits/${_QT_RELNAME}-shadertools qt-shadertools_LIB= libQt${_QT_LIBVER}ShaderTools.so qt-speech_PORT= accessibility/${_QT_RELNAME}-speech qt-speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so qt-sql_PORT= databases/${_QT_RELNAME}-sql qt-sql_LIB= libQt${_QT_LIBVER}Sql.so qt-sql-pgsql_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so qt-sql-sqlite3_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlite.so . for db in mysql odbc pgsql sqlite2 sqlite3 tds qt-sql-${db}_PORT= databases/${_QT_RELNAME}-sqldrivers-${db} qt-sql-${db}_PATH?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsql${db:C/^sql//}.so . endfor . for db in sqlite mysql psql odbc qt-sqldriver-${db}_PORT= databases/${_QT_RELNAME}-base_sqldriver@${db} qt-sqldriver-${db}_PATH?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsql${db:C/^sql//}.so . endfor qt-svg_PORT= graphics/${_QT_RELNAME}-svg qt-svg_LIB= libQt${_QT_LIBVER}Svg.so qt-testlib_PORT= devel/${_QT_RELNAME}-testlib qt-testlib_LIB= libQt${_QT_LIBVER}Test.so qt-tools_PORT= devel/${_QT_RELNAME}-tools qt-tools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/lupdate qt-translations_PORT= devel/${_QT_RELNAME}-translations qt-translations_PATH= ${LOCALBASE}/${QT_DATADIR_REL}/translations/qt_en.qm qt-uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin qt-uiplugin_PATH= ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUiPlugin qt-uitools_PORT= devel/${_QT_RELNAME}-uitools qt-uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_QT_LIBVER}UiTools.a qt-virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard qt-virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so qt-wayland_PORT= graphics/${_QT_RELNAME}-wayland qt-wayland_LIB= libQt${_QT_LIBVER}WaylandClient.so qt-webchannel_PORT= www/${_QT_RELNAME}-webchannel qt-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so qt-webengine_PORT= www/${_QT_RELNAME}-webengine qt-webengine_LIB= libQt${_QT_LIBVER}WebEngineCore.so qt-webglplugin_PORT= www/${_QT_RELNAME}-webglplugin qt-webglplugin_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforms/libqwebgl.so qt-websockets_PORT= www/${_QT_RELNAME}-websockets qt-websockets_LIB= libQt${_QT_LIBVER}WebSockets.so qt-websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml qt-websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir qt-webview_PORT= www/${_QT_RELNAME}-webview qt-webview_LIB= libQt${_QT_LIBVER}WebView.so qt-widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets qt-widgets_LIB= libQt${_QT_LIBVER}Widgets.so qt-x11extras_PORT= x11/${_QT_RELNAME}-x11extras qt-x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so qt-xml_PORT= textproc/${_QT_RELNAME}-xml qt-xml_LIB= libQt${_QT_LIBVER}Xml.so qt-xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns qt-xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so # Actually add the dependencies to the proper lists. _USE_QT_ALL= ${_USE_QT_COMMON} \ ${_USE_QT${_QT_VER}_ONLY} _USE_QT= ${USE_QT} # Iterate through components deprived of suffix. . for component in ${_USE_QT:O:u:C/:(build|run)$//} # Check that the component is valid. . if ${_USE_QT_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) || defined(qt-${component}_LIB)) # Check if a dependency type is explicitly requested. . if ${_USE_QT:M${component}\:*} != "" && ${_USE_QT:M${component}} == "" qt-${component}_TYPE= # empty . if ${_USE_QT:M${component}\:build} != "" qt-${component}_TYPE+= build . endif . if ${_USE_QT:M${component}\:run} != "" qt-${component}_TYPE+= run . endif . endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" # If no dependency type is set, default to full dependency. . if !defined(qt-${component}_TYPE) qt-${component}_TYPE= build run . endif # Set real dependencies. . if defined(qt-${component}_LIB) && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun} LIB_DEPENDS+= ${qt-${component}_LIB}:${qt-${component}_PORT} . else qt-${component}_PATH?= ${QT_LIBDIR}/${qt-${component}_LIB} qt-${component}_DEPENDS= ${qt-${component}_PATH}:${qt-${component}_PORT} . if ${qt-${component}_TYPE:Mbuild} != "" BUILD_DEPENDS+= ${qt-${component}_DEPENDS} . endif . if ${qt-${component}_TYPE:Mrun} != "" RUN_DEPENDS+= ${qt-${component}_DEPENDS} . endif . endif # ${qt-${component}_LIB} && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun} . endif # defined(qt-${component}_PORT) && defined(qt-${component}_PATH) . else # ! ${_USE_QT_ALL:M${component}} != "" IGNORE= cannot be installed: unknown USE_QT component '${component}' . endif # ${_USE_QT_ALL:M${component}} != "" . endfor .endif # defined(_QT_MK_POST_INCLUDED) diff --git a/accessibility/qt5-speech/distinfo b/accessibility/qt5-speech/distinfo index 82d932b7b0aa..56b4d61e7c64 100644 --- a/accessibility/qt5-speech/distinfo +++ b/accessibility/qt5-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433090 -SHA256 (KDE/Qt/5.15.15/kde-qtspeech-5.15.15p1.tar.xz) = 1d3f02b23af06d5a40e1c3b6b114ca11b25adf2bbfacf2c151b81a34e4080464 -SIZE (KDE/Qt/5.15.15/kde-qtspeech-5.15.15p1.tar.xz) = 80376 +TIMESTAMP = 1732217202 +SHA256 (KDE/Qt/5.15.16/kde-qtspeech-5.15.16p1.tar.xz) = 9ca99836c73c846fa785fff9fd3217b6a707eeb830d302222ebf850ec34411ec +SIZE (KDE/Qt/5.15.16/kde-qtspeech-5.15.16p1.tar.xz) = 80172 diff --git a/comms/qt5-connectivity/distinfo b/comms/qt5-connectivity/distinfo index cc10c9dda531..cb2cc51a52fc 100644 --- a/comms/qt5-connectivity/distinfo +++ b/comms/qt5-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433091 -SHA256 (KDE/Qt/5.15.15/kde-qtconnectivity-5.15.15p3.tar.xz) = 5a4438fd0faa99cda2ac681a9247ef179ded2f773eaf4d27be0aa1d10e989de9 -SIZE (KDE/Qt/5.15.15/kde-qtconnectivity-5.15.15p3.tar.xz) = 2796472 +TIMESTAMP = 1732217203 +SHA256 (KDE/Qt/5.15.16/kde-qtconnectivity-5.15.16p1.tar.xz) = 3969bbe77846e14afba0f82fbe69ef01e45f1ed6a8250bcd2be192c3e4295d03 +SIZE (KDE/Qt/5.15.16/kde-qtconnectivity-5.15.16p1.tar.xz) = 2796384 diff --git a/comms/qt5-sensors/distinfo b/comms/qt5-sensors/distinfo index d5aa32b50156..85f815be5609 100644 --- a/comms/qt5-sensors/distinfo +++ b/comms/qt5-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433093 -SHA256 (KDE/Qt/5.15.15/kde-qtsensors-5.15.15p0.tar.xz) = da38e600883e374b01cc947d759bc95af024095384551807bcd676c311b8369f -SIZE (KDE/Qt/5.15.15/kde-qtsensors-5.15.15p0.tar.xz) = 2030696 +TIMESTAMP = 1732217204 +SHA256 (KDE/Qt/5.15.16/kde-qtsensors-5.15.16p0.tar.xz) = 62a94c32e6badd73c894fd5ab1e1f43cff66409cf76e9d20f6c6add9eb80ac57 +SIZE (KDE/Qt/5.15.16/kde-qtsensors-5.15.16p0.tar.xz) = 2031128 diff --git a/comms/qt5-serialbus/distinfo b/comms/qt5-serialbus/distinfo index cf24ee64d851..1bd43b5eac49 100644 --- a/comms/qt5-serialbus/distinfo +++ b/comms/qt5-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433094 -SHA256 (KDE/Qt/5.15.15/kde-qtserialbus-5.15.15p0.tar.xz) = 11409aeea72d984b82f2325bb0595e244e4e9173cb89ebe86fb5aad7f9b488aa -SIZE (KDE/Qt/5.15.15/kde-qtserialbus-5.15.15p0.tar.xz) = 333868 +TIMESTAMP = 1732217205 +SHA256 (KDE/Qt/5.15.16/kde-qtserialbus-5.15.16p0.tar.xz) = a37f66a9a34f5b3e6150a5022ac12edccda3e7c6e2366f6ecbd97768bd66d683 +SIZE (KDE/Qt/5.15.16/kde-qtserialbus-5.15.16p0.tar.xz) = 333808 diff --git a/comms/qt5-serialport/distinfo b/comms/qt5-serialport/distinfo index 8ffe541967fc..6d267c334c32 100644 --- a/comms/qt5-serialport/distinfo +++ b/comms/qt5-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433096 -SHA256 (KDE/Qt/5.15.15/kde-qtserialport-5.15.15p0.tar.xz) = b601f0df2e51f863b109b1fbdd34a0a5bd96b052b07821dee9caaf89abbbee90 -SIZE (KDE/Qt/5.15.15/kde-qtserialport-5.15.15p0.tar.xz) = 299612 +TIMESTAMP = 1732217205 +SHA256 (KDE/Qt/5.15.16/kde-qtserialport-5.15.16p0.tar.xz) = 94cd4e2aaadfc46a687c428e77584ef3901c1149e0b6f0ec5301f8d539d603d4 +SIZE (KDE/Qt/5.15.16/kde-qtserialport-5.15.16p0.tar.xz) = 299568 diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo index 1d2064d1db08..66c268edaaf2 100644 --- a/databases/qt5-sql/distinfo +++ b/databases/qt5-sql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433097 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250579 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo index 2636fab0b472..bb3b2d2a0f86 100644 --- a/databases/qt5-sqldrivers-mysql/distinfo +++ b/databases/qt5-sqldrivers-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433099 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250580 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo index 10b3e97f3526..c890e13d8f64 100644 --- a/databases/qt5-sqldrivers-odbc/distinfo +++ b/databases/qt5-sqldrivers-odbc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433233 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250581 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo index fa670aaefc3c..9524794b27f4 100644 --- a/databases/qt5-sqldrivers-pgsql/distinfo +++ b/databases/qt5-sqldrivers-pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433234 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250582 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo index d0b6c6276321..ed95b79711b5 100644 --- a/databases/qt5-sqldrivers-sqlite2/distinfo +++ b/databases/qt5-sqldrivers-sqlite2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433235 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250583 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo index 4666fa2f6e4b..b9c7decafb26 100644 --- a/databases/qt5-sqldrivers-sqlite3/distinfo +++ b/databases/qt5-sqldrivers-sqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433236 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250584 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo index 562c47660a4e..29f1e5240a90 100644 --- a/databases/qt5-sqldrivers-tds/distinfo +++ b/databases/qt5-sqldrivers-tds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433237 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250585 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/pyside2-tools/distinfo b/devel/pyside2-tools/distinfo index a6a16edd4e41..d34911418e43 100644 --- a/devel/pyside2-tools/distinfo +++ b/devel/pyside2-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725517050 -SHA256 (pyside-setup-opensource-src-5.15.15.tar.xz) = 21d6818b064834b08501180e48890e5fd87df2fb3769f80c58143457f548c408 -SIZE (pyside-setup-opensource-src-5.15.15.tar.xz) = 3586600 +TIMESTAMP = 1732265019 +SHA256 (pyside-setup-opensource-src-5.15.16.tar.xz) = 6d3ed6fd17275ea74829ab56df9c2e7641bfca6b5b201cf244998fa81cf07360 +SIZE (pyside-setup-opensource-src-5.15.16.tar.xz) = 3586100 diff --git a/devel/pyside2/distinfo b/devel/pyside2/distinfo index ee0a0f85bc92..7de6fb001c7a 100644 --- a/devel/pyside2/distinfo +++ b/devel/pyside2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725517037 -SHA256 (pyside-setup-opensource-src-5.15.15.tar.xz) = 21d6818b064834b08501180e48890e5fd87df2fb3769f80c58143457f548c408 -SIZE (pyside-setup-opensource-src-5.15.15.tar.xz) = 3586600 +TIMESTAMP = 1732264987 +SHA256 (pyside-setup-opensource-src-5.15.16.tar.xz) = 6d3ed6fd17275ea74829ab56df9c2e7641bfca6b5b201cf244998fa81cf07360 +SIZE (pyside-setup-opensource-src-5.15.16.tar.xz) = 3586100 diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo index bee545f2e68f..2c539b068188 100644 --- a/devel/qt5-assistant/distinfo +++ b/devel/qt5-assistant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433238 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217213 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo index 130fc0f62fd6..03d32217f4b2 100644 --- a/devel/qt5-buildtools/distinfo +++ b/devel/qt5-buildtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433239 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250587 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo index 61a6d480af73..295ebaba90c6 100644 --- a/devel/qt5-concurrent/distinfo +++ b/devel/qt5-concurrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433240 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250588 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo index 870734996abf..e270c075f5b6 100644 --- a/devel/qt5-core/distinfo +++ b/devel/qt5-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433241 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250589 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo index 74a32a897964..ac0a94d8c118 100644 --- a/devel/qt5-dbus/distinfo +++ b/devel/qt5-dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433242 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250590 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo index 17be551b6142..91954a77a48e 100644 --- a/devel/qt5-designer/distinfo +++ b/devel/qt5-designer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433243 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217217 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo index 240444a5a9c7..49502d2aaacb 100644 --- a/devel/qt5-help/distinfo +++ b/devel/qt5-help/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433244 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217218 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo index 1c62453b10af..197feb1521ad 100644 --- a/devel/qt5-linguist/distinfo +++ b/devel/qt5-linguist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433245 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217219 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo index 4909b5c52f2f..197feb1521ad 100644 --- a/devel/qt5-linguisttools/distinfo +++ b/devel/qt5-linguisttools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433246 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217219 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo index 7c4ef532142d..4a6700619809 100644 --- a/devel/qt5-location/distinfo +++ b/devel/qt5-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433247 -SHA256 (KDE/Qt/5.15.15/kde-qtlocation-5.15.15p7.tar.xz) = 4acab7e930fe59040fd38edf4451c9ee2cd4f091ae0b413e593e3f8930af6462 -SIZE (KDE/Qt/5.15.15/kde-qtlocation-5.15.15p7.tar.xz) = 6487980 +TIMESTAMP = 1732217220 +SHA256 (KDE/Qt/5.15.16/kde-qtlocation-5.15.16p7.tar.xz) = 7ca3ae55d0818a13c8ca7eb9903b3aaf44113c5abb7d702cb3faffb1f8a3e4a2 +SIZE (KDE/Qt/5.15.16/kde-qtlocation-5.15.16p7.tar.xz) = 6487820 diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo index 8e86710d7913..d93c33039fd4 100644 --- a/devel/qt5-qdbus/distinfo +++ b/devel/qt5-qdbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433248 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217221 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo index b56f6e6794f1..c35ebffeaddc 100644 --- a/devel/qt5-qdbusviewer/distinfo +++ b/devel/qt5-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433249 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217222 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo index 7fd22a552e19..97f35ffb5362 100644 --- a/devel/qt5-qdoc-data/distinfo +++ b/devel/qt5-qdoc-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433270 -SHA256 (KDE/Qt/5.15.15/qtbase-everywhere-opensource-src-5.15.15.tar.xz) = e5f941fecf694ecba97c550b45b0634e552166cc6c815bcfdc481edd62796ba1 -SIZE (KDE/Qt/5.15.15/qtbase-everywhere-opensource-src-5.15.15.tar.xz) = 51366204 +TIMESTAMP = 1732217222 +SHA256 (KDE/Qt/5.15.16/qtbase-everywhere-opensource-src-5.15.16.tar.xz) = b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592 +SIZE (KDE/Qt/5.15.16/qtbase-everywhere-opensource-src-5.15.16.tar.xz) = 51392072 diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo index 18b2b703a748..d98a7f247466 100644 --- a/devel/qt5-qdoc/distinfo +++ b/devel/qt5-qdoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433271 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217223 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo index c8bca361d893..37789a5b1403 100644 --- a/devel/qt5-qmake/distinfo +++ b/devel/qt5-qmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433272 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250599 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-qmake/files/patch-configure b/devel/qt5-qmake/files/patch-configure index d58b45ba95c0..bb3a12762ba3 100644 --- a/devel/qt5-qmake/files/patch-configure +++ b/devel/qt5-qmake/files/patch-configure @@ -1,13 +1,13 @@ ---- configure.orig 2017-11-14 13:26:30 UTC +--- configure.orig 2024-11-21 20:06:55 UTC +++ configure -@@ -799,6 +799,10 @@ if [ '!' -f "$outpath/bin/qmake" ] ; then +@@ -802,6 +802,10 @@ if [ '!' -f "$outpath/bin/qmake" ] ; then fi fi + if [ -z "${BUILD_QMAKE}" ]; then + exit 0 + fi + if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make (cd "$outpath/qmake"; "$MAKE") || exit 2 diff --git a/devel/qt5-qmake/files/patch-mkspecs_common_bsd_bsd.conf b/devel/qt5-qmake/files/patch-mkspecs_common_bsd_bsd.conf index db5e1d817f39..659dc7cc6cc2 100644 --- a/devel/qt5-qmake/files/patch-mkspecs_common_bsd_bsd.conf +++ b/devel/qt5-qmake/files/patch-mkspecs_common_bsd_bsd.conf @@ -1,13 +1,13 @@ Add some defines for Wayland support. ---- mkspecs/common/bsd/bsd.conf.orig 2017-07-01 22:01:46 UTC +--- mkspecs/common/bsd/bsd.conf.orig 2024-11-21 20:06:55 UTC +++ mkspecs/common/bsd/bsd.conf -@@ -28,3 +28,8 @@ QMAKE_RANLIB = +@@ -49,3 +49,8 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded + +QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client +QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server +QMAKE_WAYLAND_SCANNER = wayland-scanner +QMAKE_LIBS_EGL = -lEGL diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo index a369b5b2e591..0e6de80717f1 100644 --- a/devel/qt5-remoteobjects/distinfo +++ b/devel/qt5-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433273 -SHA256 (KDE/Qt/5.15.15/kde-qtremoteobjects-5.15.15p0.tar.xz) = e06a5242d3febf8b3431c62bdf7ba4301958f3f94e9432b6d77ae3e8c1c754c9 -SIZE (KDE/Qt/5.15.15/kde-qtremoteobjects-5.15.15p0.tar.xz) = 352480 +TIMESTAMP = 1732217225 +SHA256 (KDE/Qt/5.15.16/kde-qtremoteobjects-5.15.16p0.tar.xz) = 26c6ce0fa2567c7eff159d419d04592b6d376f210055fa55dac5cbaf04b8d29d +SIZE (KDE/Qt/5.15.16/kde-qtremoteobjects-5.15.16p0.tar.xz) = 352376 diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 8454e5172ae0..cd8e2cddefbc 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -1,28 +1,29 @@ PORTNAME= script PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4-compatible scripting module USES= compiler:c++11-lang perl5 qmake qt-dist:5,script USE_PERL5= extract USE_QT= core buildtools:build # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. # Source version from qt-dist.mk QT5_VERSION= ${_KDE_script_VERSION} post-patch: @${REINPLACE_CMD} -e '/scripttools/ d' \ ${WRKSRC}/src/src.pro # Fix version mismatches for CMake post-configure: @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5Script_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \ ${WRKSRC}/lib/cmake/Qt5Script/Qt5ScriptConfig.cmake .include diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 4512408c1d84..b1de205c921f 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -1,28 +1,28 @@ PORTNAME= scripttools PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components USES= compiler:c++11-lang perl5 qmake qt-dist:5,script USE_PERL5= build USE_QT= core gui script widgets buildtools:build BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} # Source version from qt-dist.mk QT5_VERSION= ${_KDE_script_VERSION} # Link in QtScript port _QT5_ADDITIONAL_LINK= script # Fix version mismatches for CMake post-configure: @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5ScriptTools_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \ ${WRKSRC}/lib/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake .include diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo index 44e647552829..6337a94049e9 100644 --- a/devel/qt5-scxml/distinfo +++ b/devel/qt5-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433274 -SHA256 (KDE/Qt/5.15.15/kde-qtscxml-5.15.15p0.tar.xz) = 60ac8fea185041618eeb88133d6fedb3ae313c566726282c618e4b19249404b5 -SIZE (KDE/Qt/5.15.15/kde-qtscxml-5.15.15p0.tar.xz) = 409760 +TIMESTAMP = 1732217225 +SHA256 (KDE/Qt/5.15.16/kde-qtscxml-5.15.16p0.tar.xz) = 9ebfa5a2a967bc441bcf57d034d2b01974aca9535dc667c3caf16e49ec02dff8 +SIZE (KDE/Qt/5.15.16/kde-qtscxml-5.15.16p0.tar.xz) = 409768 diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo index fcf89d8af5f4..777330b115d5 100644 --- a/devel/qt5-testlib/distinfo +++ b/devel/qt5-testlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433275 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250601 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo index e2fdb04a1032..6ec05ad64f34 100644 --- a/devel/qt5-uitools/distinfo +++ b/devel/qt5-uitools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433276 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217227 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf index 06c6b32f36ba..9da6a8befc83 100644 --- a/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf +++ b/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf @@ -1,52 +1,51 @@ -The first hunk puts the catch-all { *; } first in version scripts +The first 2 hunks put the catch-all { *; } first in version scripts so it has lowest priority when a symbol matches multiple patterns. -The second hunk fixes the install location of the pkconfig files: +The third hunk fixes the install location of the pkconfig files: FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR. As this is now '${PREFIX}/lib/qt5' we need to go up two levels. -The third hunk stops qmake from generating la files. +The fourth hunk stops qmake from generating la files. ---- mkspecs/features/qt_module.prf.orig 2018-12-03 11:15:26 UTC +--- mkspecs/features/qt_module.prf.orig 2024-11-18 12:01:05 UTC +++ mkspecs/features/qt_module.prf -@@ -217,17 +217,18 @@ android: CONFIG += qt_android_deps no_linker_version_s +@@ -222,7 +222,10 @@ android: CONFIG += qt_android_deps no_linker_version_s internal_module { verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" } else { - verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ -- " qt_private_api_tag*;" + current = Qt_$$QT_MAJOR_VERSION + verscript_content = "$$current { *; };" - -+ verscript_content += "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ -+ " qt_private_api_tag*;" + ++ verscript_content += "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ + " qt_private_api_tag*;" + private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES - - for(header, private_api_headers): \ +@@ -231,9 +234,6 @@ android: CONFIG += qt_android_deps no_linker_version_s verscript_content += " @FILE:$$header@" verscript_content += "};" - + - current = Qt_$$QT_MAJOR_VERSION - verscript_content += "$$current { *; };" - isEmpty(QT_NAMESPACE): tag_symbol = qt_version_tag - else: tag_symbol = qt_version_tag_$$QT_NAMESPACE - -@@ -266,7 +267,7 @@ load(qt_targets) +- + !isEmpty(MODULE_VERSCRIPT_CONTENT_EXT): verscript_content += $$MODULE_VERSCRIPT_CONTENT_EXT + + # Add a post-processing step to replace the @FILE:filename@ +@@ -264,7 +264,7 @@ load(qt_targets) # this builds on top of qt_common - !internal_module:if(unix|mingw) { + !internal_module:if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) { CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_PKGCONFIG_DESTDIR = ../../libdata/pkgconfig host_build: \ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] else: \ -@@ -291,7 +292,6 @@ load(qt_targets) +@@ -297,7 +297,6 @@ load(qt_targets) QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace } !lib_bundle:unix { - CONFIG += create_libtool host_build: \ QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] else: \ diff --git a/devel/shiboken2/distinfo b/devel/shiboken2/distinfo index 4522979c78e2..13ff63eaad05 100644 --- a/devel/shiboken2/distinfo +++ b/devel/shiboken2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725517024 -SHA256 (pyside-setup-opensource-src-5.15.15.tar.xz) = 21d6818b064834b08501180e48890e5fd87df2fb3769f80c58143457f548c408 -SIZE (pyside-setup-opensource-src-5.15.15.tar.xz) = 3586600 +TIMESTAMP = 1732265002 +SHA256 (pyside-setup-opensource-src-5.15.16.tar.xz) = 6d3ed6fd17275ea74829ab56df9c2e7641bfca6b5b201cf244998fa81cf07360 +SIZE (pyside-setup-opensource-src-5.15.16.tar.xz) = 3586100 diff --git a/graphics/qt5-3d/distinfo b/graphics/qt5-3d/distinfo index b92dc5d09086..b07c2dbf3bfb 100644 --- a/graphics/qt5-3d/distinfo +++ b/graphics/qt5-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433278 -SHA256 (KDE/Qt/5.15.15/kde-qt3d-5.15.15p0.tar.xz) = f301aabda8992893add4c2b027ffd7b8dfdc316594943f0e0fa14ccd2ca3a7e7 -SIZE (KDE/Qt/5.15.15/kde-qt3d-5.15.15p0.tar.xz) = 118382164 +TIMESTAMP = 1732217228 +SHA256 (KDE/Qt/5.15.16/kde-qt3d-5.15.16p0.tar.xz) = 7b378b34519db5c149d882dc0a3731cc46ca345b7bf528b7c9bd11ef61762b79 +SIZE (KDE/Qt/5.15.16/kde-qt3d-5.15.16p0.tar.xz) = 118398832 diff --git a/graphics/qt5-graphicaleffects/distinfo b/graphics/qt5-graphicaleffects/distinfo index 4e4e76dba640..3585776ceece 100644 --- a/graphics/qt5-graphicaleffects/distinfo +++ b/graphics/qt5-graphicaleffects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433279 -SHA256 (KDE/Qt/5.15.15/kde-qtgraphicaleffects-5.15.15p0.tar.xz) = 5cf48f8966edd0e571b23034772b11ad2c0aaaa76da380ddd619ac7d8a28dade -SIZE (KDE/Qt/5.15.15/kde-qtgraphicaleffects-5.15.15p0.tar.xz) = 14019352 +TIMESTAMP = 1732217229 +SHA256 (KDE/Qt/5.15.16/kde-qtgraphicaleffects-5.15.16p0.tar.xz) = a243ca7c8b440e017226429bce344e14b5022d542942ac4d9d31f4bdeb98155d +SIZE (KDE/Qt/5.15.16/kde-qtgraphicaleffects-5.15.16p0.tar.xz) = 14019104 diff --git a/graphics/qt5-imageformats/distinfo b/graphics/qt5-imageformats/distinfo index 76396954b8d0..c804bdb08e83 100644 --- a/graphics/qt5-imageformats/distinfo +++ b/graphics/qt5-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433280 -SHA256 (KDE/Qt/5.15.15/kde-qtimageformats-5.15.15p4.tar.xz) = 217310efce2480be8fcd4fb4095af0d7c44e978c144d73af21bb87eb93a3b59c -SIZE (KDE/Qt/5.15.15/kde-qtimageformats-5.15.15p4.tar.xz) = 1872840 +TIMESTAMP = 1732217230 +SHA256 (KDE/Qt/5.15.16/kde-qtimageformats-5.15.16p2.tar.xz) = 57cbb4e7cb29d96a13eadbfcf9b5f0e6b748abde13f91a04771608a28b9b9e3e +SIZE (KDE/Qt/5.15.16/kde-qtimageformats-5.15.16p2.tar.xz) = 1872680 diff --git a/graphics/qt5-opengl/distinfo b/graphics/qt5-opengl/distinfo index 486b20371531..7da2cb58f492 100644 --- a/graphics/qt5-opengl/distinfo +++ b/graphics/qt5-opengl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433281 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250606 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/graphics/qt5-pixeltool/distinfo b/graphics/qt5-pixeltool/distinfo index 660ccfc56ad0..35e4551abeea 100644 --- a/graphics/qt5-pixeltool/distinfo +++ b/graphics/qt5-pixeltool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433282 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217231 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/graphics/qt5-svg/distinfo b/graphics/qt5-svg/distinfo index 037d4050a568..76cdf2a5e35c 100644 --- a/graphics/qt5-svg/distinfo +++ b/graphics/qt5-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433283 -SHA256 (KDE/Qt/5.15.15/kde-qtsvg-5.15.15p5.tar.xz) = 4c1bea707bf60b90c0d1e9eaf11f1210553618622c295b7abe7b1033ae8f438b -SIZE (KDE/Qt/5.15.15/kde-qtsvg-5.15.15p5.tar.xz) = 1865284 +TIMESTAMP = 1732217232 +SHA256 (KDE/Qt/5.15.16/kde-qtsvg-5.15.16p5.tar.xz) = 0142040729d3ea279c33c297d6467d483c309e8552779eb6d4639be418dac183 +SIZE (KDE/Qt/5.15.16/kde-qtsvg-5.15.16p5.tar.xz) = 1865524 diff --git a/graphics/qt5-wayland/distinfo b/graphics/qt5-wayland/distinfo index e5ddefcd4164..480e45296a95 100644 --- a/graphics/qt5-wayland/distinfo +++ b/graphics/qt5-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433284 -SHA256 (KDE/Qt/5.15.15/kde-qtwayland-5.15.15p59.tar.xz) = 6c86f4aa5f098859b4d5290602136ef8fdf36f34c2709b892da91f50090930c0 -SIZE (KDE/Qt/5.15.15/kde-qtwayland-5.15.15p59.tar.xz) = 539316 +TIMESTAMP = 1732250609 +SHA256 (KDE/Qt/5.15.16/kde-qtwayland-5.15.16p59.tar.xz) = 97d981777e62ee4f81fbe62f22ba905db6b6be3a84864412bf7685b98ad25fe0 +SIZE (KDE/Qt/5.15.16/kde-qtwayland-5.15.16p59.tar.xz) = 539316 diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo index 574264f1d346..08f7b7c3feda 100644 --- a/misc/qt5-examples/distinfo +++ b/misc/qt5-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433657 -SHA256 (KDE/Qt/5.15.15/qt-everywhere-opensource-src-5.15.15.tar.xz) = b423c30fe3ace7402e5301afbb464febfb3da33d6282a37a665be1e51502335e -SIZE (KDE/Qt/5.15.15/qt-everywhere-opensource-src-5.15.15.tar.xz) = 661546736 +TIMESTAMP = 1732217256 +SHA256 (KDE/Qt/5.15.16/qt-everywhere-opensource-src-5.15.16.tar.xz) = efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c +SIZE (KDE/Qt/5.15.16/qt-everywhere-opensource-src-5.15.16.tar.xz) = 661694764 diff --git a/misc/qt5-l10n/distinfo b/misc/qt5-l10n/distinfo index a37691868707..43478a60846d 100644 --- a/misc/qt5-l10n/distinfo +++ b/misc/qt5-l10n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433657 -SHA256 (KDE/Qt/5.15.15/kde-qttranslations-5.15.15p0.tar.xz) = 146dd292d9fe9d5865650556247fcdf84c5f5ae292d719ef4d4757e08fb7b386 -SIZE (KDE/Qt/5.15.15/kde-qttranslations-5.15.15p0.tar.xz) = 1610668 +TIMESTAMP = 1732217256 +SHA256 (KDE/Qt/5.15.16/kde-qttranslations-5.15.16p0.tar.xz) = 43e80a805f83a70ad9dba15f52ad342d8c33b9a15de532b52a0e3ccfd96f2ccf +SIZE (KDE/Qt/5.15.16/kde-qttranslations-5.15.16p0.tar.xz) = 1610748 diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 9438dcc80ff4..d6139ab10a18 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -1,63 +1,62 @@ PORTNAME= multimedia PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module # LICENSE set via USES_QT5 (bsd.qt.mk) USES= compiler:c++11-lang gl gnome perl5 pkgconfig qmake:norecursive \ qt-dist:5,multimedia xorg USE_GL= gl USE_GNOME= glib20 USE_PERL5= build USE_QT= core declarative gui network opengl widgets \ buildtools:build USE_XORG= x11 xext xv QT_CONFIG= xlib # TODO: Bug 225100: the machinery in bsd.qt.mk's qt-post-install target does # not seem to account for the case of a module no longer defining QT_DEFINES: # the lines in qconfig-modules.h including said module's qconfig-.h # will remain. We're setting it below to avoid build errors, but this needs to # be fixed properly later. QT_DEFINES= _QTMULTIMEDIA_DUMMY OPTIONS_DEFINE= GSTREAMER OPENAL OPTIONS_DEFAULT= ALSA GSTREAMER OPENAL OPTIONS_GROUP= AUDIOPLUGIN OPTIONS_GROUP_AUDIOPLUGIN= ALSA PULSEAUDIO OPTIONS_SUB= yes AUDIOPLUGIN_DESC= Audio plugins to build OPENAL_DESC= 3D positional spatialized sound support OPENAL_USES= openal OPENAL_VARS= QT_CONFIG+=openal OPENAL_VARS_OFF= QT_CONFIG+=-openal \ QMAKE_CONFIGURE_ARGS+=-no-openal ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_VARS= QT_CONFIG+=alsa ALSA_VARS_OFF= QT_CONFIG+=-alsa \ QMAKE_CONFIGURE_ARGS+=-no-alsa GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=bad GSTREAMER_VARS= QT_CONFIG+=gstreamer-1.0 \ QMAKE_CONFIGURE_ARGS+=-gstreamer 1.0 GSTREAMER_VARS_OFF= QT_CONFIG+=-gstreamer-1.0 \ QMAKE_CONFIGURE_ARGS+=-no-gstreamer PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QT_CONFIG+=pulseaudio PULSEAUDIO_VARS_OFF= QT_CONFIG+=-pulseaudio \ QMAKE_CONFIGURE_ARGS+=-no-pulseaudio .include diff --git a/multimedia/qt5-multimedia/distinfo b/multimedia/qt5-multimedia/distinfo index 8713f277b946..c66b3f52d78f 100644 --- a/multimedia/qt5-multimedia/distinfo +++ b/multimedia/qt5-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433658 -SHA256 (KDE/Qt/5.15.15/kde-qtmultimedia-5.15.15p2.tar.xz) = 724f62907a9c98a2796455bc3b18597593f8d745eda5bdad8a4e0285be6c4944 -SIZE (KDE/Qt/5.15.15/kde-qtmultimedia-5.15.15p2.tar.xz) = 3827900 +TIMESTAMP = 1732217257 +SHA256 (KDE/Qt/5.15.16/kde-qtmultimedia-5.15.16p2.tar.xz) = 853fb6c68257c2862f0f15b15a07efcec53802a034c4b6bbdc656e55a982aae5 +SIZE (KDE/Qt/5.15.16/kde-qtmultimedia-5.15.16p2.tar.xz) = 3827824 diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo index 65bc222aefd4..fadff284d571 100644 --- a/net/qt5-network/distinfo +++ b/net/qt5-network/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433660 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250634 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/net/qt5-networkauth/distinfo b/net/qt5-networkauth/distinfo index f2fe3a43e477..03185ec4be66 100644 --- a/net/qt5-networkauth/distinfo +++ b/net/qt5-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433661 -SHA256 (KDE/Qt/5.15.15/kde-qtnetworkauth-5.15.15p1.tar.xz) = 354ede8835512d2e3358f054e121cae667736ee0675379c7ea56f2482c0f92a0 -SIZE (KDE/Qt/5.15.15/kde-qtnetworkauth-5.15.15p1.tar.xz) = 119980 +TIMESTAMP = 1732217259 +SHA256 (KDE/Qt/5.15.16/kde-qtnetworkauth-5.15.16p1.tar.xz) = 86eb132cd81a3e6795861e3f257df34f77ac6f69e5306d8a50a25e168b41f4b6 +SIZE (KDE/Qt/5.15.16/kde-qtnetworkauth-5.15.16p1.tar.xz) = 120008 diff --git a/print/qt5-printsupport/distinfo b/print/qt5-printsupport/distinfo index 2b6a27430c1c..a08a8b591b60 100644 --- a/print/qt5-printsupport/distinfo +++ b/print/qt5-printsupport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433662 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250636 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/sysutils/qt5-qtdiag/distinfo b/sysutils/qt5-qtdiag/distinfo index d6955ea79777..807431e3991a 100644 --- a/sysutils/qt5-qtdiag/distinfo +++ b/sysutils/qt5-qtdiag/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433663 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217260 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/sysutils/qt5-qtpaths/distinfo b/sysutils/qt5-qtpaths/distinfo index c38f43b3b969..1228a4d92edd 100644 --- a/sysutils/qt5-qtpaths/distinfo +++ b/sysutils/qt5-qtpaths/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433664 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217261 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/sysutils/qt5-qtplugininfo/distinfo b/sysutils/qt5-qtplugininfo/distinfo index 3af0a77e8fc2..75b710a96ff3 100644 --- a/sysutils/qt5-qtplugininfo/distinfo +++ b/sysutils/qt5-qtplugininfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433665 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217262 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/textproc/qt5-xml/distinfo b/textproc/qt5-xml/distinfo index 8c0b5c9a2c94..45ae014531cd 100644 --- a/textproc/qt5-xml/distinfo +++ b/textproc/qt5-xml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433666 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250640 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/textproc/qt5-xmlpatterns/distinfo b/textproc/qt5-xmlpatterns/distinfo index 316aad4d87a1..08da9a35a0d7 100644 --- a/textproc/qt5-xmlpatterns/distinfo +++ b/textproc/qt5-xmlpatterns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433667 -SHA256 (KDE/Qt/5.15.15/kde-qtxmlpatterns-5.15.15p0.tar.xz) = 785db3ec1b568262007af289e93afd1f1f5ef848af5fb93f6573c41264a82d7d -SIZE (KDE/Qt/5.15.15/kde-qtxmlpatterns-5.15.15p0.tar.xz) = 5112316 +TIMESTAMP = 1732217263 +SHA256 (KDE/Qt/5.15.16/kde-qtxmlpatterns-5.15.16p0.tar.xz) = 8597b2b97ae06fe46d0ea46d6acba36d6a5c05ff781bec934bb79cd292a87b63 +SIZE (KDE/Qt/5.15.16/kde-qtxmlpatterns-5.15.16p0.tar.xz) = 5114300 diff --git a/www/qt5-webchannel/distinfo b/www/qt5-webchannel/distinfo index 61742f534798..78366045276e 100644 --- a/www/qt5-webchannel/distinfo +++ b/www/qt5-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433668 -SHA256 (KDE/Qt/5.15.15/kde-qtwebchannel-5.15.15p3.tar.xz) = 9a5bab0a0ba1c3bdb61100ae0639da3a38ba6970bf142368e91e69720dc71622 -SIZE (KDE/Qt/5.15.15/kde-qtwebchannel-5.15.15p3.tar.xz) = 188612 +TIMESTAMP = 1732217264 +SHA256 (KDE/Qt/5.15.16/kde-qtwebchannel-5.15.16p3.tar.xz) = a0459a0eb535809637835bfecbc67d630aa1f7ef70b3a01659eed3c8efb8a27d +SIZE (KDE/Qt/5.15.16/kde-qtwebchannel-5.15.16p3.tar.xz) = 188588 diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index c1864b0d30c7..fd800a850d77 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -1,173 +1,172 @@ # QtWebEngine itself is a very thin layer of Qt code on top of a large part of # Chromium (everything up to the content/ layer). As such, most of the work in # this port revolves around taming Chromium and getting it to build on FreeBSD. # While it does build at the moment, there are several items that should be # investigated or improved: # - We are using several stub files, especially in Chromium's base/ and net/ # layers. We should look at implementing the missing bits instead. # - We are currently not using any sandboxing mechanism. # - We need to see if more "use_system_" flags can be passed. # - The process of porting QtWebEngine needs to be documented so we can move to # newer releases more easily. # # Also note that, due to the insane amount of patches this port needs, it tends # to lag behind the rest of the official Qt5 ones, which is why we set # QT5_VERSION and DISTINFO_FILE here. # In order to successfully build this port in poudriere you need to add # MAX_FILES_qt5_webengine=4096 to /usr/local/etc/poudriere.conf PORTNAME= webengine PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library to render web content BUILD_DEPENDS= bison:devel/bison \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdouble-conversion.so:devel/double-conversion \ libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjsoncpp.so:devel/jsoncpp \ liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo QT5_VERSION= ${_KDE_webengine_VERSION} OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend # Need the alsa plugins to get sound at runtime, otherwise messages # that the pcm_oss plugin can't be opened. ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_VARS= QMAKE_CONFIGURE_ARGS+=-alsa ALSA_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-alsa PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QMAKE_CONFIGURE_ARGS+=-pulseaudio PULSEAUDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-pulseaudio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= QMAKE_CONFIGURE_ARGS+=-sndio SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. USES= gl gnome gperf jpeg minizip ninja:build nodejs:build,lts \ perl5 pkgconfig python:build qmake:norecursive,outsource \ qt-dist:5,webengine shebangfix xorg USE_GL= gl USE_GNOME= glib20 libxml2 libxslt USE_PERL5= build USE_QT= core declarative gui location network printsupport \ webchannel widgets \ buildtools:build designer:build qmake:build USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xorgproto xrandr xrender xscrnsaver xtst QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg # We could just set it to an empty string as well. "all" does not account for # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first # We need ar(1) from ports because the Chromium code uses the @file syntax. # We then need to ensure ld(1) from ports is used because of the archives ar(1) # generated. USE_BINUTILS= yes CC+= "-B${LOCALBASE}/bin" CXX+= "-B${LOCALBASE}/bin" # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are # read by some Chromium code to determine which compiler to invoke when running # some configuration tests. # Since we use USES=qmake:norecursive, we also need to pass some variables to # MAKE_ENV because part of the configuration process happens during the build. CONFIGURE_ENV+= NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \ NINJA_PATH="${LOCALBASE}/bin/ninja" \ PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH} MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include \ ${CONFIGURE_ENV} QT_BINARIES= yes .include .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} PLIST_SUB+= BE="" LE="@comment " .else PLIST_SUB+= BE="@comment " LE="" .endif post-extract: # Install FreeBSD's freebsd.pri file. ${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri post-extract-SNDIO-on: @cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd @${CP} ${FILESDIR}/sndio_*put.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/3rdparty/chromium/base/linux_util.cc \ ${WRKSRC}/src/3rdparty/chromium/base/test/BUILD.gn \ ${WRKSRC}/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/src/3rdparty/chromium/chrome/common/chrome_paths.cc \ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \ ${WRKSRC}/src/3rdparty/gn/build/gen.py @${REINPLACE_CMD} -E -e 's|^(MODULE_VERSION = ).*|\1${QT5_VERSION}|' \ ${WRKSRC}/.qmake.conf .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} @${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \ ${WRKSRC}/src/core/core_module.pro .endif pre-configure: # Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python # Unbundle a few dependencies. cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries\ fontconfig freetype harfbuzz-ng libdrm libevent libpng libwebp libxml libxslt openh264 opus || ${FALSE} # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} post-build: # Fix version mismatches for CMake .for module in Pdf PdfWidgets WebEngine WebEngineCore WebEngineWidgets @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5${module}_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../../devel/qt5-core -VQT5_VERSION)"'|' \ ${BUILD_WRKSRC}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake .endfor .include diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo index 51934ea0ca84..bd4377499e56 100644 --- a/www/qt5-webengine/distinfo +++ b/www/qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730320893 -SHA256 (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p2.tar.xz) = 273b2d078145d36b1ff2d9d3ab5f9689ca40ac5285bab4ce35d1c7a14bbeeebd -SIZE (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p2.tar.xz) = 320954788 +TIMESTAMP = 1732218152 +SHA256 (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p5.tar.xz) = 1cbba269ee55a58b4000eda01e90a50f0a20e5f7ed99de70d5706889cb61fbda +SIZE (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p5.tar.xz) = 320985832 diff --git a/www/qt5-webglplugin/distinfo b/www/qt5-webglplugin/distinfo index b489c87b7b03..6e88df6eb5bb 100644 --- a/www/qt5-webglplugin/distinfo +++ b/www/qt5-webglplugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433669 -SHA256 (KDE/Qt/5.15.15/kde-qtwebglplugin-5.15.15p0.tar.xz) = 0bb4db03747ade9cd7cb5419d525fddfce851964ad505610a14f4f975c788fb9 -SIZE (KDE/Qt/5.15.15/kde-qtwebglplugin-5.15.15p0.tar.xz) = 53660 +TIMESTAMP = 1732217265 +SHA256 (KDE/Qt/5.15.16/kde-qtwebglplugin-5.15.16p0.tar.xz) = f116cf507cf7b48aa661df18a1227b22d9ab094012b43c35854603100476701d +SIZE (KDE/Qt/5.15.16/kde-qtwebglplugin-5.15.16p0.tar.xz) = 53680 diff --git a/www/qt5-websockets-qml/distinfo b/www/qt5-websockets-qml/distinfo index ad81b53eab5e..a377cce24544 100644 --- a/www/qt5-websockets-qml/distinfo +++ b/www/qt5-websockets-qml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433670 -SHA256 (KDE/Qt/5.15.15/kde-qtwebsockets-5.15.15p2.tar.xz) = a8a087f6c211acc652dd581602bd80d957d0757917d9bf931fe44bee14b74145 -SIZE (KDE/Qt/5.15.15/kde-qtwebsockets-5.15.15p2.tar.xz) = 237084 +TIMESTAMP = 1732217266 +SHA256 (KDE/Qt/5.15.16/kde-qtwebsockets-5.15.16p2.tar.xz) = d52649297cf7faadb99e4845b299d390f30743e276e5bbbee16b005373df88e8 +SIZE (KDE/Qt/5.15.16/kde-qtwebsockets-5.15.16p2.tar.xz) = 237212 diff --git a/www/qt5-websockets/distinfo b/www/qt5-websockets/distinfo index f7a4e93f547d..a377cce24544 100644 --- a/www/qt5-websockets/distinfo +++ b/www/qt5-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433671 -SHA256 (KDE/Qt/5.15.15/kde-qtwebsockets-5.15.15p2.tar.xz) = a8a087f6c211acc652dd581602bd80d957d0757917d9bf931fe44bee14b74145 -SIZE (KDE/Qt/5.15.15/kde-qtwebsockets-5.15.15p2.tar.xz) = 237084 +TIMESTAMP = 1732217266 +SHA256 (KDE/Qt/5.15.16/kde-qtwebsockets-5.15.16p2.tar.xz) = d52649297cf7faadb99e4845b299d390f30743e276e5bbbee16b005373df88e8 +SIZE (KDE/Qt/5.15.16/kde-qtwebsockets-5.15.16p2.tar.xz) = 237212 diff --git a/www/qt5-webview/distinfo b/www/qt5-webview/distinfo index 52274f26b7fd..e30ee6d2cf84 100644 --- a/www/qt5-webview/distinfo +++ b/www/qt5-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433672 -SHA256 (KDE/Qt/5.15.15/kde-qtwebview-5.15.15p0.tar.xz) = 17978521d21e3406734eed32661cb98a50de690c45d797edb7d849fdd82faf8b -SIZE (KDE/Qt/5.15.15/kde-qtwebview-5.15.15p0.tar.xz) = 112812 +TIMESTAMP = 1732217267 +SHA256 (KDE/Qt/5.15.16/kde-qtwebview-5.15.16p0.tar.xz) = 917bb6228b658e7386f13b78d5ddaf053fb527adda3ea0251ad9dcb25d6b82a3 +SIZE (KDE/Qt/5.15.16/kde-qtwebview-5.15.16p0.tar.xz) = 112808 diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo index dd5d5e0d22f9..9dbd14ba20e1 100644 --- a/x11-toolkits/qt5-charts/distinfo +++ b/x11-toolkits/qt5-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433673 -SHA256 (KDE/Qt/5.15.15/kde-qtcharts-5.15.15p0.tar.xz) = 513986ec81d8c7d99fda5279638817d93d268b9360249daeb149e46dc944128f -SIZE (KDE/Qt/5.15.15/kde-qtcharts-5.15.15p0.tar.xz) = 4219712 +TIMESTAMP = 1732217268 +SHA256 (KDE/Qt/5.15.16/kde-qtcharts-5.15.16p0.tar.xz) = c9a3171b13f8300798f6284c0ba9d1ae772a4b4fdbe4a911f808e82380658284 +SIZE (KDE/Qt/5.15.16/kde-qtcharts-5.15.16p0.tar.xz) = 4219596 diff --git a/x11-toolkits/qt5-datavis3d/distinfo b/x11-toolkits/qt5-datavis3d/distinfo index 7b604307fec4..ff9656d2cb89 100644 --- a/x11-toolkits/qt5-datavis3d/distinfo +++ b/x11-toolkits/qt5-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433674 -SHA256 (KDE/Qt/5.15.15/kde-qtdatavis3d-5.15.15p0.tar.xz) = 177f213723c4b427749606d766a9e2cefac8dbab669aa1540034da36e1a38c37 -SIZE (KDE/Qt/5.15.15/kde-qtdatavis3d-5.15.15p0.tar.xz) = 5159696 +TIMESTAMP = 1732217268 +SHA256 (KDE/Qt/5.15.16/kde-qtdatavis3d-5.15.16p0.tar.xz) = cfec8952163af3d086e2415266b91ab64d6bd62c97d0b425b497525bf1dcae08 +SIZE (KDE/Qt/5.15.16/kde-qtdatavis3d-5.15.16p0.tar.xz) = 5159780 diff --git a/x11-toolkits/qt5-declarative-test/distinfo b/x11-toolkits/qt5-declarative-test/distinfo index 415cf75cdf87..5e6f1ccae023 100644 --- a/x11-toolkits/qt5-declarative-test/distinfo +++ b/x11-toolkits/qt5-declarative-test/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433675 -SHA256 (KDE/Qt/5.15.15/kde-qtdeclarative-5.15.15p25.tar.xz) = cc5fa5a3a3d23693b4dc2adc259a1d6582c1877a6f7d2bbd919b399e758c2b36 -SIZE (KDE/Qt/5.15.15/kde-qtdeclarative-5.15.15p25.tar.xz) = 21484376 +TIMESTAMP = 1732217269 +SHA256 (KDE/Qt/5.15.16/kde-qtdeclarative-5.15.16p22.tar.xz) = c236e6d4adb30c7adf17523de95eeede603aa4906fc33391004dfd424b51bd6a +SIZE (KDE/Qt/5.15.16/kde-qtdeclarative-5.15.16p22.tar.xz) = 21484848 diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo index a7b46ccea0eb..f6f8e0e36283 100644 --- a/x11-toolkits/qt5-declarative/distinfo +++ b/x11-toolkits/qt5-declarative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433677 -SHA256 (KDE/Qt/5.15.15/kde-qtdeclarative-5.15.15p25.tar.xz) = cc5fa5a3a3d23693b4dc2adc259a1d6582c1877a6f7d2bbd919b399e758c2b36 -SIZE (KDE/Qt/5.15.15/kde-qtdeclarative-5.15.15p25.tar.xz) = 21484376 +TIMESTAMP = 1732217270 +SHA256 (KDE/Qt/5.15.16/kde-qtdeclarative-5.15.16p22.tar.xz) = c236e6d4adb30c7adf17523de95eeede603aa4906fc33391004dfd424b51bd6a +SIZE (KDE/Qt/5.15.16/kde-qtdeclarative-5.15.16p22.tar.xz) = 21484848 diff --git a/x11-toolkits/qt5-gamepad/distinfo b/x11-toolkits/qt5-gamepad/distinfo index 25223612d5d6..3074e138ac32 100644 --- a/x11-toolkits/qt5-gamepad/distinfo +++ b/x11-toolkits/qt5-gamepad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433678 -SHA256 (KDE/Qt/5.15.15/kde-qtgamepad-5.15.15p0.tar.xz) = cc11be1b8252cf259e18723118d7e7432a7859205f682816811007cb481ffe43 -SIZE (KDE/Qt/5.15.15/kde-qtgamepad-5.15.15p0.tar.xz) = 365432 +TIMESTAMP = 1732217271 +SHA256 (KDE/Qt/5.15.16/kde-qtgamepad-5.15.16p0.tar.xz) = ee5a42d67c951da1caafbd97b4c8935c7bb4a67c2f0e4e5f82918ed96a8ff747 +SIZE (KDE/Qt/5.15.16/kde-qtgamepad-5.15.16p0.tar.xz) = 365452 diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index ce2af9d1c15a..ee7445e79643 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -1,115 +1,114 @@ PORTNAME= gui PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/xf86drm.h:graphics/libdrm \ at-spi2-core>=0:accessibility/at-spi2-core \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_armv6= as:devel/binutils BUILD_DEPENDS_armv7= as:devel/binutils LIB_DEPENDS= libdbus-1.so:devel/dbus \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libinput.so:x11/libinput \ libmtdev.so:devel/libmtdev \ libpng.so:graphics/png \ libxcb-icccm.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.so:x11/libxcb \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ xdg-open:devel/xdg-utils USES= compiler:c++11-lang gl gnome jpeg localbase \ perl5 qmake:no_env qt-dist:5,base USE_GL= egl gl USE_GNOME= glib20 USE_PERL5= extract USE_QT= core dbus network buildtools:build qmake:build QT_BINARIES= yes QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ fontconfig glib opengl png system-freetype system-jpeg \ system-png xcb xcb-glx xcb-render xcb-xlib xinput2 xlib \ xrender QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER USE_XORG= ice sm xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-libudev \ -system-harfbuzz # Explicitly set to c++14 to avoid c++17/c++1z, since libX11's headers # are using the obsolete 'register' keyword. CONFIGURE_ARGS+= -c++std \ c++14 BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes X11_USES= xorg X11_USE= xorg=x11 # Build and install QtPlatformSupport and default QPA plugins (XCB, # minimal and offscreen). QtGui won't work without (one of) them, but # they depend on QtGui itself, so they can't be added as dependencies. # QtPlatformSupport doesn't need to be installed (it's a static # library), but might be needed by people porting Qt on new platforms. _MORE_WRKSRCS= src/platformheaders src/platformsupport src/plugins/platforms \ src/plugins/generic # Image formats are split through different tarballs, these are the # main ones; input contexts require no additional dependency. _MORE_WRKSRCS+= src/plugins/imageformats src/plugins/platforminputcontexts # openglextensions is the static library to use for further things like qtcanvas3d _MORE_WRKSRCS+= src/openglextensions # Inherited from Qt 4. .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \ xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype .endif post-configure: .for d in src/tools/qvkgen src/gui ${_MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in src/tools/qvkgen @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-build: .for d in ${_MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/qvkgen ${_MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .include diff --git a/x11-toolkits/qt5-gui/distinfo b/x11-toolkits/qt5-gui/distinfo index 498a7cfa6f4d..abb0148b5dd2 100644 --- a/x11-toolkits/qt5-gui/distinfo +++ b/x11-toolkits/qt5-gui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433679 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250650 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/x11-toolkits/qt5-quick3d/distinfo b/x11-toolkits/qt5-quick3d/distinfo index 65e2abaa4aea..40b593ca0104 100644 --- a/x11-toolkits/qt5-quick3d/distinfo +++ b/x11-toolkits/qt5-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433680 -SHA256 (KDE/Qt/5.15.15/kde-qtquick3d-5.15.15p1.tar.xz) = 8786061aa23f05750025783a0632f8f70c1c9e6a1e917c3fc116c11556a2419c -SIZE (KDE/Qt/5.15.15/kde-qtquick3d-5.15.15p1.tar.xz) = 55823316 +TIMESTAMP = 1732217273 +SHA256 (KDE/Qt/5.15.16/kde-qtquick3d-5.15.16p1.tar.xz) = ac95eff8e4706ded966e27efec4c7c643c75a59294a5df0cf6a3f89e97fe848e +SIZE (KDE/Qt/5.15.16/kde-qtquick3d-5.15.16p1.tar.xz) = 55859144 diff --git a/x11-toolkits/qt5-quickcontrols/distinfo b/x11-toolkits/qt5-quickcontrols/distinfo index 3959d200120b..dd831617e756 100644 --- a/x11-toolkits/qt5-quickcontrols/distinfo +++ b/x11-toolkits/qt5-quickcontrols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433681 -SHA256 (KDE/Qt/5.15.15/kde-qtquickcontrols-5.15.15p0.tar.xz) = fce53854aaa7da109400499571fcc51a8bcbd88ad1d8441fc9eb59be360166aa -SIZE (KDE/Qt/5.15.15/kde-qtquickcontrols-5.15.15p0.tar.xz) = 5955008 +TIMESTAMP = 1732217274 +SHA256 (KDE/Qt/5.15.16/kde-qtquickcontrols-5.15.16p0.tar.xz) = b628ccd2645db364c9e8b649ce2f99b504917a4375f84cb68690ee4fa7235ba7 +SIZE (KDE/Qt/5.15.16/kde-qtquickcontrols-5.15.16p0.tar.xz) = 5954592 diff --git a/x11-toolkits/qt5-quickcontrols2/distinfo b/x11-toolkits/qt5-quickcontrols2/distinfo index b120a4833d4e..40682bc48ce9 100644 --- a/x11-toolkits/qt5-quickcontrols2/distinfo +++ b/x11-toolkits/qt5-quickcontrols2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433682 -SHA256 (KDE/Qt/5.15.15/kde-qtquickcontrols2-5.15.15p5.tar.xz) = dec5daf281c08f55c1f02f739812820e6af3accaf4f0d4428f1a53abea5bd2c8 -SIZE (KDE/Qt/5.15.15/kde-qtquickcontrols2-5.15.15p5.tar.xz) = 8250540 +TIMESTAMP = 1732217274 +SHA256 (KDE/Qt/5.15.16/kde-qtquickcontrols2-5.15.16p5.tar.xz) = 98b80095979a327752d97c9fff89207a58ef70e7dba019915fc42b268e150a33 +SIZE (KDE/Qt/5.15.16/kde-qtquickcontrols2-5.15.16p5.tar.xz) = 8250864 diff --git a/x11-toolkits/qt5-quicktimeline/distinfo b/x11-toolkits/qt5-quicktimeline/distinfo index ef66f01875ea..4420b7ca3e69 100644 --- a/x11-toolkits/qt5-quicktimeline/distinfo +++ b/x11-toolkits/qt5-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433683 -SHA256 (KDE/Qt/5.15.15/kde-qtquicktimeline-5.15.15p0.tar.xz) = f78aa7f2195cdd6da76e60872af431c23ab4050d4070206fea42043f41a358c7 -SIZE (KDE/Qt/5.15.15/kde-qtquicktimeline-5.15.15p0.tar.xz) = 82156 +TIMESTAMP = 1732217275 +SHA256 (KDE/Qt/5.15.16/kde-qtquicktimeline-5.15.16p0.tar.xz) = 5e2e6ab56ae9f7c3486bb6aa429b2c893396d52873f950cae0057a32e8818808 +SIZE (KDE/Qt/5.15.16/kde-qtquicktimeline-5.15.16p0.tar.xz) = 82156 diff --git a/x11-toolkits/qt5-uiplugin/distinfo b/x11-toolkits/qt5-uiplugin/distinfo index 353d34896a2e..5d4e624b003e 100644 --- a/x11-toolkits/qt5-uiplugin/distinfo +++ b/x11-toolkits/qt5-uiplugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433684 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217276 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/x11-toolkits/qt5-virtualkeyboard/distinfo b/x11-toolkits/qt5-virtualkeyboard/distinfo index 1fab88f3af07..35ac98fdc387 100644 --- a/x11-toolkits/qt5-virtualkeyboard/distinfo +++ b/x11-toolkits/qt5-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433685 -SHA256 (KDE/Qt/5.15.15/kde-qtvirtualkeyboard-5.15.15p0.tar.xz) = 7c9debfdd02be2f1a65fd91ebe98a0b57b104baa7834527751188114fe22281c -SIZE (KDE/Qt/5.15.15/kde-qtvirtualkeyboard-5.15.15p0.tar.xz) = 10970136 +TIMESTAMP = 1732217276 +SHA256 (KDE/Qt/5.15.16/kde-qtvirtualkeyboard-5.15.16p0.tar.xz) = 4489e85b9e3e4780ca37dea4b65011531840c04e8cac802fbb784b8a0d5c5fb2 +SIZE (KDE/Qt/5.15.16/kde-qtvirtualkeyboard-5.15.16p0.tar.xz) = 10972612 diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index a0f6b7012b40..a22e410ea354 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -1,73 +1,72 @@ PORTNAME= widgets PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt C++ widgets module USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base xorg USE_PERL5= extract USE_QT= core gui qmake:build buildtools:build USE_XORG= x11 HAS_CONFIGURE= yes BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/uic QT_BINARIES= yes QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC QT_CONFIG= accessibility accessibility-atspi-bridge xlib OPTIONS_DEFINE= GTK3 OPTIONS_SUB= YES GTK3_DESC= GTK-based Qt theme GTK3_USES= gnome GTK3_USE= GNOME=gtk30 QT=dbus GTK3_CONFIGURE_ON= -gtk GTK3_CONFIGURE_OFF= -no-gtk .include .if ${PORT_OPTIONS:MGTK3} QT_DEFINES+= STYLE_GTK QT_CONFIG+= gtk MORE_WRKSRCS+= src/plugins/platformthemes .else QT_DEFINES+= -STYLE_GTK QT_CONFIG+= -gtk .endif post-configure: .for d in src/tools/uic src/widgets ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: cd ${WRKSRC}/src/tools/uic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/uic ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png ${RLN} ${STAGEDIR}${QT_BINDIR}/uic ${STAGEDIR}${PREFIX}/bin/uic-qt5 .include diff --git a/x11-toolkits/qt5-widgets/distinfo b/x11-toolkits/qt5-widgets/distinfo index 1249a3c32dc1..b185f8557025 100644 --- a/x11-toolkits/qt5-widgets/distinfo +++ b/x11-toolkits/qt5-widgets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433686 -SHA256 (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 59f18dae46df09fd694a4bc5f982bdb310ed68399c629036d6fe2e8d667a6db6 -SIZE (KDE/Qt/5.15.15/kde-qtbase-5.15.15p127.tar.xz) = 51356508 +TIMESTAMP = 1732250657 +SHA256 (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = d20e2a133319f210655552286bfde6222ab34a1d408d4187731b5d25b826fc31 +SIZE (KDE/Qt/5.15.16/kde-qtbase-5.15.16p130.tar.xz) = 51336180 diff --git a/x11/qt5-qev/distinfo b/x11/qt5-qev/distinfo index b6702657f508..af107e6c02c0 100644 --- a/x11/qt5-qev/distinfo +++ b/x11/qt5-qev/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433688 -SHA256 (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = e8fb0ce258d5f5d90107b7086c69c39e159ed305a6e6cb22b1ba41ade91d1782 -SIZE (KDE/Qt/5.15.15/kde-qttools-5.15.15p3.tar.xz) = 8927200 +TIMESTAMP = 1732217278 +SHA256 (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = e3e6694c46fcfff81ea60eaea9a3468b1748b2c6abf3798591e7e1198a42fc26 +SIZE (KDE/Qt/5.15.16/kde-qttools-5.15.16p3.tar.xz) = 8927008 diff --git a/x11/qt5-x11extras/distinfo b/x11/qt5-x11extras/distinfo index bd365e07c43e..3faab899dc0b 100644 --- a/x11/qt5-x11extras/distinfo +++ b/x11/qt5-x11extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725433689 -SHA256 (KDE/Qt/5.15.15/kde-qtx11extras-5.15.15p0.tar.xz) = 2bcf8fa83fa0a5362889d05657dd66ce73b46f1d242f798037e16fb866611124 -SIZE (KDE/Qt/5.15.15/kde-qtx11extras-5.15.15p0.tar.xz) = 123184 +TIMESTAMP = 1732217279 +SHA256 (KDE/Qt/5.15.16/kde-qtx11extras-5.15.16p0.tar.xz) = fcb2d650014d6be2536d25962ed87855029a435b9be7eb3ce439e23e6e4c1a2b +SIZE (KDE/Qt/5.15.16/kde-qtx11extras-5.15.16p0.tar.xz) = 123332