git: a35d5972ae5c - main - */*: Prepare removal of Uses=qca
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Feb 2025 17:08:37 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a35d5972ae5c7affa6b6f9c05699bbe14c36a80d
commit a35d5972ae5c7affa6b6f9c05699bbe14c36a80d
Author: Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2025-02-20 12:44:12 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2025-02-25 17:06:45 +0000
*/*: Prepare removal of Uses=qca
Summary:
kde@ is in favor of removing Uses=qca that was initially introduced to help with
the migration from OpenSSL < 1.1 for FreeBSD 11.
Add the corresponding 'LIB_DEPENDS` on those ports still using this feature.
Approved by: danfe@, fluffy@, rhurlin@, kde@ (makc@)
Differential Revision: https://reviews.freebsd.org/D49093
---
deskutils/kdepim-runtime/Makefile | 3 ++-
devel/okteta/Makefile | 4 +++-
editors/calligra/Makefile | 3 ++-
games/ksirk/Makefile | 4 +++-
graphics/okular/Makefile | 3 ++-
irc/konversation/Makefile | 4 +++-
irc/quassel/Makefile | 4 +++-
net-im/psi/Makefile | 5 +++--
net-p2p/libktorrent/Makefile | 5 +++--
net/kget/Makefile | 3 ++-
net/messagelib/Makefile | 3 ++-
net/qoauth-qt5/Makefile | 4 +++-
sysutils/kf5-kwallet/Makefile | 5 +++--
sysutils/kf6-kwallet/Makefile | 5 +++--
www/choqok/Makefile | 5 +++--
15 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
index 9645d91bc44d..87724873d958 100644
--- a/deskutils/kdepim-runtime/Makefile
+++ b/deskutils/kdepim-runtime/Makefile
@@ -12,11 +12,12 @@ LICENSE= LGPL21
LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
libcurl.so:ftp/curl \
libkolabxml.so:textproc/libkolabxml \
+ libqca-qt6.so:devel/qca@qt6 \
libsasl2.so:security/cyrus-sasl2 \
libxerces-c.so:textproc/xerces-c3 \
libqt6keychain.so:security/qtkeychain@qt6
-USES= cmake:noninja compiler:c++11-lib gettext kde:6 qca qt:6 \
+USES= cmake:noninja compiler:c++11-lib gettext kde:6 qt:6 \
shared-mime-info tar:xz xorg
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons holidays i18n iconthemes \
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index a3b1ff8ae0ae..e6a1a738e0f2 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -13,7 +13,9 @@ LICENSE_COMB= dual
LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSES/GPL-2.0-only.txt
LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSES/GPL-3.0-only.txt
-USES= cmake compiler:c++11-lang gettext kde:5 qca qt:5 \
+LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
+
+USES= cmake compiler:c++11-lang gettext kde:5 qt:5 \
shared-mime-info tar:xz xorg
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools i18n iconthemes itemviews \
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index f877ea12772c..3238a34f28fc 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -25,6 +25,7 @@ LIB_DEPENDS= libImath.so:math/Imath \
libodfgen-0.1.so:textproc/libodfgen01 \
libpoppler-qt6.so:graphics/poppler-qt6 \
libpoppler.so:graphics/poppler \
+ libqca-qt6.so:devel/qca@qt6 \
libqt6keychain.so:security/qtkeychain@qt6 \
librevenge-0.0.so:textproc/librevenge \
libvisio-0.1.so:textproc/libvisio01 \
@@ -35,7 +36,7 @@ RUN_DEPENDS= pstoedit:graphics/pstoedit
USES= cmake compiler:c++17-lang cpe desktop-file-utils eigen:3 \
gettext gl iconv:translit jpeg kde:6 localbase:ldflags perl5 \
- pkgconfig qca qt:6 shared-mime-info ssl tar:xz xorg
+ pkgconfig qt:6 shared-mime-info ssl tar:xz xorg
USE_GL= gl opengl
USE_LDCONFIG= yes
USE_KDE= archive bookmarks colorscheme completion config configwidgets \
diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
index c4cb128a1e67..dfc2bf61576a 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk/Makefile
@@ -6,7 +6,9 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME:tu}_DESC}
WWW= https://www.kde.org/applications/games/ksirk/
-USES= cmake compiler:c++11-lang gettext kde:6 qca qt:6 tar:xz
+LIB_DEPENDS= libqca-qt6.so:devel/qca@qt6
+
+USES= cmake compiler:c++11-lang gettext kde:6 qt:6 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash i18n iconthemes kio libkdegames newstuff phonon service \
wallet widgetsaddons xmlgui \
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 090d4308359d..776500c05729 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -17,12 +17,13 @@ LIB_DEPENDS= libchm.so:misc/chmlib \
libQMobipocket6.so:graphics/kdegraphics-mobipocket@qt6 \
libpoppler.so:graphics/poppler \
libpoppler-qt6.so:graphics/poppler-qt6 \
+ libqca-qt6.so:devel/qca@qt6 \
libspectre.so:print/libspectre \
libtiff.so:graphics/tiff \
libzip.so:archivers/libzip
USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext jpeg \
- kde:6 pkgconfig qca qt:6 tar:xz xorg
+ kde:6 pkgconfig qt:6 tar:xz xorg
USE_KDE= activities archive auth bookmarks codecs completion config \
iconthemes itemmodels itemviews jobwidgets kio libkexiv2 parts \
phonon pty service solid sonnet textwidgets threadweaver \
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index 1a5aa832f348..538abb5811c2 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -8,8 +8,10 @@ WWW= https://konversation.kde.org
LICENSE= GPLv2+
+LIB_DEPENDS= libqca-qt6.so:devel/qca@qt6
+
USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext kde:6 \
- qca qt:6 shebangfix tar:xz xorg \
+ qt:6 shebangfix tar:xz xorg \
python:run
USE_KDE= archive attica auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons doctools globalaccel \
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index 3669c97d420f..7993c6095049 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -13,7 +13,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs
-USES= cmake compiler:c++11-lib cpe ldap pkgconfig qca qt:5 tar:xz
+LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
+
+USES= cmake compiler:c++11-lib cpe ldap pkgconfig qt:5 tar:xz
USE_GITHUB= nodefault
#GH_ACCOUNT= ${PORTNAME}
#GH_PROJECT= ${PORTNAME}
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 710531b77088..48515743de2a 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -10,10 +10,11 @@ WWW= https://psi-im.org/
LICENSE= GPLv2+
-LIB_DEPENDS= libidn.so:dns/libidn
+LIB_DEPENDS= libidn.so:dns/libidn \
+ libqca-qt5.so:devel/qca@qt5
USES= cmake compiler:c++11-lang desktop-file-utils minizip pkgconfig \
- qca qt:5 tar:xz xorg
+ qt:5 tar:xz xorg
USE_QT= concurrent core dbus gui multimedia network svg widgets \
x11extras xml buildtools:build qmake:build imageformats:run
USE_XORG= ice sm x11 xcb xext xscrnsaver
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 110bae1495fe..8e14ff12de60 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -8,9 +8,10 @@ WWW= https://ktorrent.org/
BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
- libgmp.so:math/gmp
+ libgmp.so:math/gmp \
+ libqca-qt6.so:devel/qca@qt6
-USES= cmake compiler:c++11-lang gettext kde:6 qca qt:6 tar:xz xorg
+USES= cmake compiler:c++11-lang gettext kde:6 qt:6 tar:xz xorg
USE_KDE= archive completion config coreaddons crash i18n jobwidgets kio \
service solid widgetsaddons windowsystem \
ecm:build
diff --git a/net/kget/Makefile b/net/kget/Makefile
index a9f862f98b30..4d0103bd916f 100644
--- a/net/kget/Makefile
+++ b/net/kget/Makefile
@@ -13,9 +13,10 @@ LIB_DEPENDS= libKTorrent6.so:net-p2p/libktorrent \
libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
+ libqca-qt6.so:devel/qca@qt6 \
libqgpgmeqt6.so:security/gpgme-qt@qt6
-USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:6 qca \
+USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:6 \
qt:6 shebangfix sqlite tar:xz xorg
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons i18n iconthemes \
diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
index 11cc44c7a4e5..0cb1a4fc7ad3 100644
--- a/net/messagelib/Makefile
+++ b/net/messagelib/Makefile
@@ -15,9 +15,10 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
+ libqca-qt6.so:devel/qca@qt6 \
libqgpgmeqt6.so:security/gpgme-qt@qt6
-USES= cmake compiler:c++11-lib cpe gettext kde:6 qca qt:6 tar:xz \
+USES= cmake compiler:c++11-lib cpe gettext kde:6 qt:6 tar:xz \
xorg
CPE_VENDOR= kde
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
diff --git a/net/qoauth-qt5/Makefile b/net/qoauth-qt5/Makefile
index 2bbca7113f35..7313df59724a 100644
--- a/net/qoauth-qt5/Makefile
+++ b/net/qoauth-qt5/Makefile
@@ -12,7 +12,9 @@ WWW= https://github.com/ayoy/qoauth
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lang qmake:outsource qca qt:5
+LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
+
+USES= compiler:c++11-lang qmake:outsource qt:5
USE_LDCONFIG= yes
USE_QT= core network testlib buildtools:build qmake:build
diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile
index b8fb518d9316..77a0f135e28a 100644
--- a/sysutils/kf5-kwallet/Makefile
+++ b/sysutils/kf5-kwallet/Makefile
@@ -12,10 +12,11 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme \
- libqgpgme.so:security/gpgme-qt@qt5 \
libgpgmepp.so:security/gpgme-cpp
+ libqca-qt5.so:devel/qca@qt5 \
+ libqgpgme.so:security/gpgme-qt@qt5 \
-USES= cmake compiler:c++11-lib gettext kde:5 qca qt:5 tar:xz xorg
+USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
i18n iconthemes notifications service \
widgetsaddons windowsystem \
diff --git a/sysutils/kf6-kwallet/Makefile b/sysutils/kf6-kwallet/Makefile
index d243c7794e03..cdeb861af5e0 100644
--- a/sysutils/kf6-kwallet/Makefile
+++ b/sysutils/kf6-kwallet/Makefile
@@ -5,9 +5,10 @@ CATEGORIES= sysutils kde kde-frameworks
COMMENT= Safe desktop-wide storage for passwords
MAINTAINER= kde@FreeBSD.org
-LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
+ libqca-qt6.so:devel/qca@qt6
-USES= cmake gettext gl kde:6 qca qt:6 tar:xz xorg
+USES= cmake gettext gl kde:6 qt:6 tar:xz xorg
USE_GL= gl opengl
USE_KDE= colorscheme config configwidgets coreaddons crash dbusaddons i18n \
notifications service widgetsaddons windowsystem \
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index 130fdeaa5fae..91a25779a599 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -12,11 +12,12 @@ WWW= https://www.kde.org/applications/internet/choqok/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqjson-qt5.so:devel/qjson \
+LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5 \
+ libqjson-qt5.so:devel/qjson \
libqoauth-qt5.so:net/qoauth-qt5 \
libtelepathy-qt5.so:net-im/telepathy-qt
-USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qca qt:5 \
+USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 \
tar:xz xorg
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons doctools emoticons globalaccel guiaddons i18n \