git: 90f6363f0185 - main - Qt 6 distribution ports: Add USE_LDCONFIG where appropriate
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Mar 2025 18:09:59 UTC
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=90f6363f0185fdf217afe8a9a4b4b9b78b4e896f commit 90f6363f0185fdf217afe8a9a4b4b9b78b4e896f Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2025-03-04 18:08:34 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2025-03-04 18:09:07 +0000 Qt 6 distribution ports: Add USE_LDCONFIG where appropriate --- accessibility/qt6-speech/Makefile | 2 ++ comms/qt6-connectivity/Makefile | 2 ++ comms/qt6-sensors/Makefile | 2 ++ comms/qt6-serialbus/Makefile | 2 ++ comms/qt6-serialport/Makefile | 2 ++ devel/qt6-grpc/Makefile | 3 ++- devel/qt6-location/Makefile | 2 ++ devel/qt6-positioning/Makefile | 2 ++ devel/qt6-remoteobjects/Makefile | 2 ++ devel/qt6-scxml/Makefile | 2 ++ graphics/qt6-lottie/Makefile | 2 ++ multimedia/qt6-multimedia/Makefile | 3 ++- net/qt6-coap/Makefile | 2 ++ www/qt6-httpserver/Makefile | 2 ++ www/qt6-webchannel/Makefile | 2 ++ www/qt6-webengine/Makefile | 4 +++- www/qt6-websockets/Makefile | 2 ++ www/qt6-webview/Makefile | 2 ++ x11-toolkits/qt6-charts/Makefile | 2 ++ x11-toolkits/qt6-datavis3d/Makefile | 2 ++ x11-toolkits/qt6-graphs/Makefile | 2 ++ x11-toolkits/qt6-virtualkeyboard/Makefile | 2 ++ 22 files changed, 45 insertions(+), 3 deletions(-) diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile index df0b8bde11e3..7d2d11bee0c9 100644 --- a/accessibility/qt6-speech/Makefile +++ b/accessibility/qt6-speech/Makefile @@ -1,5 +1,6 @@ PORTNAME= speech DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility PKGNAMEPREFIX= qt6- @@ -9,6 +10,7 @@ COMMENT= Accessibilty features for Qt6 USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative multimedia +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} OPTIONS_DEFINE= ALSA OPTIONS_DEFAULT= SPEECHD diff --git a/comms/qt6-connectivity/Makefile b/comms/qt6-connectivity/Makefile index 5ea80f101bee..9e2b0b56b604 100644 --- a/comms/qt6-connectivity/Makefile +++ b/comms/qt6-connectivity/Makefile @@ -1,5 +1,6 @@ PORTNAME= connectivity DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USES= cmake compiler:c++11-lang pkgconfig qt-dist:6,connectivity USE_QT= base +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile index 61b8e7f7ae23..601eaec358d0 100644 --- a/comms/qt6-sensors/Makefile +++ b/comms/qt6-sensors/Makefile @@ -1,5 +1,6 @@ PORTNAME= sensors DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -10,5 +11,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile index cf5551a70f96..9a4d0c8cc94f 100644 --- a/comms/qt6-serialbus/Makefile +++ b/comms/qt6-serialbus/Makefile @@ -1,5 +1,6 @@ PORTNAME= serialbus DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -10,5 +11,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang qt-dist:6 USE_QT= base serialport +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile index 111c23acc4b1..18ddff66ccd3 100644 --- a/comms/qt6-serialport/Makefile +++ b/comms/qt6-serialport/Makefile @@ -1,5 +1,6 @@ PORTNAME= serialport DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ LIB_DEPENDS= libudev.so:devel/libudev-devd USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt6-grpc/Makefile b/devel/qt6-grpc/Makefile index 8afd878ac160..092ca61b2f0d 100644 --- a/devel/qt6-grpc/Makefile +++ b/devel/qt6-grpc/Makefile @@ -1,6 +1,6 @@ PORTNAME= grpc DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -13,5 +13,6 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile index 7754c53784d2..d740988f1373 100644 --- a/devel/qt6-location/Makefile +++ b/devel/qt6-location/Makefile @@ -1,5 +1,6 @@ PORTNAME= location DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -12,5 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative positioning shadertools +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt6-positioning/Makefile b/devel/qt6-positioning/Makefile index 714fb0c005a5..c28742f0871d 100644 --- a/devel/qt6-positioning/Makefile +++ b/devel/qt6-positioning/Makefile @@ -1,5 +1,6 @@ PORTNAME= positioning DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -12,5 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative serialport +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt6-remoteobjects/Makefile b/devel/qt6-remoteobjects/Makefile index fe9684b8f7b9..771d578a8c1b 100644 --- a/devel/qt6-remoteobjects/Makefile +++ b/devel/qt6-remoteobjects/Makefile @@ -1,5 +1,6 @@ PORTNAME= remoteobjects DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt6-scxml/Makefile b/devel/qt6-scxml/Makefile index 74d5c4cd01b9..0d9bbcaa61a3 100644 --- a/devel/qt6-scxml/Makefile +++ b/devel/qt6-scxml/Makefile @@ -1,5 +1,6 @@ PORTNAME= scxml DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -12,5 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/graphics/qt6-lottie/Makefile b/graphics/qt6-lottie/Makefile index d84bc1f4fe06..353267352e2c 100644 --- a/graphics/qt6-lottie/Makefile +++ b/graphics/qt6-lottie/Makefile @@ -1,5 +1,6 @@ PORTNAME= lottie DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- @@ -12,5 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile index f099cf508f01..3f33e1528b69 100644 --- a/multimedia/qt6-multimedia/Makefile +++ b/multimedia/qt6-multimedia/Makefile @@ -1,6 +1,6 @@ PORTNAME= multimedia DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt6- @@ -13,6 +13,7 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative shadertools:build +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE CXXFLAGS_powerpc64= -mvsx diff --git a/net/qt6-coap/Makefile b/net/qt6-coap/Makefile index 7b3e521da6b3..e7cb6a26d1c4 100644 --- a/net/qt6-coap/Makefile +++ b/net/qt6-coap/Makefile @@ -1,6 +1,7 @@ PORTNAME= coap DISTVERSIONPREFIX= v DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ USES= cmake compiler:c++17-lang qt-dist:6 USE_GITHUB= yes GH_TUPLE= qt:qtcoap:${DISTVERSIONFULL} USE_QT= base +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/www/qt6-httpserver/Makefile b/www/qt6-httpserver/Makefile index c6930af383fd..30f14a8a2e30 100644 --- a/www/qt6-httpserver/Makefile +++ b/www/qt6-httpserver/Makefile @@ -1,5 +1,6 @@ PORTNAME= httpserver DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -10,5 +11,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base websockets +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/www/qt6-webchannel/Makefile b/www/qt6-webchannel/Makefile index b016d0a20149..2e94039352ca 100644 --- a/www/qt6-webchannel/Makefile +++ b/www/qt6-webchannel/Makefile @@ -1,5 +1,6 @@ PORTNAME= webchannel DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -10,5 +11,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 0f3c3fadae52..7db670b9bc4f 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -12,7 +12,7 @@ PORTNAME?= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION?= 1 # Master port for print/qt6-pdf. Please keep this line. +PORTREVISION?= 2 # Master port for print/qt6-pdf. Please keep this line. CATEGORIES?= www PKGNAMEPREFIX= qt6- @@ -37,6 +37,8 @@ USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg \ QT_FEATURE_webengine_proprietary_codecs +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + .if defined(BUILD_QTPDF) CMAKE_ON+= QT_FEATURE_qtpdf_build CMAKE_OFF+= QT_FEATURE_qtwebengine_build \ diff --git a/www/qt6-websockets/Makefile b/www/qt6-websockets/Makefile index 356d439b6913..a19b7c6949db 100644 --- a/www/qt6-websockets/Makefile +++ b/www/qt6-websockets/Makefile @@ -1,5 +1,6 @@ PORTNAME= websockets DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -10,5 +11,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/www/qt6-webview/Makefile b/www/qt6-webview/Makefile index e584b5616031..cbe673ab4593 100644 --- a/www/qt6-webview/Makefile +++ b/www/qt6-webview/Makefile @@ -1,5 +1,6 @@ PORTNAME= webview DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative positioning webchannel webengine +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-charts/Makefile b/x11-toolkits/qt6-charts/Makefile index 1583d2034c40..165fab577ea4 100644 --- a/x11-toolkits/qt6-charts/Makefile +++ b/x11-toolkits/qt6-charts/Makefile @@ -1,5 +1,6 @@ PORTNAME= charts DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-datavis3d/Makefile b/x11-toolkits/qt6-datavis3d/Makefile index 0c39b47838d2..f408a4008109 100644 --- a/x11-toolkits/qt6-datavis3d/Makefile +++ b/x11-toolkits/qt6-datavis3d/Makefile @@ -1,5 +1,6 @@ PORTNAME= datavis3d DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -11,5 +12,6 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-graphs/Makefile b/x11-toolkits/qt6-graphs/Makefile index 1e6eb4665abb..5909dc73d96e 100644 --- a/x11-toolkits/qt6-graphs/Makefile +++ b/x11-toolkits/qt6-graphs/Makefile @@ -1,5 +1,6 @@ PORTNAME= graphs DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -12,5 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative quick3d shadertools +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-virtualkeyboard/Makefile b/x11-toolkits/qt6-virtualkeyboard/Makefile index fa17bb8ffca9..2b59a5ac060f 100644 --- a/x11-toolkits/qt6-virtualkeyboard/Makefile +++ b/x11-toolkits/qt6-virtualkeyboard/Makefile @@ -1,5 +1,6 @@ PORTNAME= virtualkeyboard DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -13,5 +14,6 @@ LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_QT= base declarative svg +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk>