mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

security/qtkeychain: add flavors for Qt 5 and Qt 6

Browse Source 
Approved by:		arrowd
Differential Revision: https://reviews.freebsd.org/D36375
This commit is contained in:
Tobias C. Berner 2022-08-27 11:28:05 +02:00
parent b33c627183
commit 4007622478
24 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
astro/kstars/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kstars
DISTVERSION= 3.6.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}
@ -11,7 +12,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
libindidriver.so:devel/indi \
libqt5keychain.so:security/qtkeychain \
libqt5keychain.so:security/qtkeychain@qt5 \
libraw.so:graphics/libraw \
libsecret-1.so:security/libsecret \
libstellarsolver.so:astro/stellarsolver \

4
audio/mixxx/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= mixxx
DISTVERSION= 2.3.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
MAINTAINER= acm@FreeBSD.org
@ -71,7 +71,7 @@ OPUS_LIB_DEPENDS= libopus.so:audio/opus \
libopusfile.so:audio/opusfile
OPUS_CMAKE_BOOL= OPUS
QTKEYCHAIN_DESC= Secure credentials storage for Live Broadcasting profiles
QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
QTKEYCHAIN_CMAKE_BOOL= QTKEYCHAIN
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WAVPACK_CMAKE_BOOL= WAVPACK

3
deskutils/akonadi-import-wizard/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= akonadi-import-wizard
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -10,7 +11,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5 \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \

4
deskutils/charmtimetracker/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= charmtimetracker
DISTVERSION= 1.12.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= deskutils
# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@ -13,7 +13,7 @@ COMMENT= Time tracker
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib pkgconfig qt:5 xorg
CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION}

4
deskutils/kdepim-runtime/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= kdepim-runtime
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -13,7 +13,7 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
libkolabxml.so:textproc/libkolabxml \
libsasl2.so:security/cyrus-sasl2 \
libxerces-c-3.2.so:textproc/xerces-c3 \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++11-lib gettext kde:5 qca qt:5 \
shared-mime-info tar:xz

3
deskutils/kmail/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kmail
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -12,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5 \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
RUN_DEPENDS= accountwizard:deskutils/kmail-account-wizard \
akonadiimportwizard:deskutils/akonadi-import-wizard \

4
deskutils/nextcloudclient/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= nextcloudclient
PORTVERSION= 3.5.3
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
@ -11,7 +11,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= inkscape:graphics/inkscape
LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \
gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \

3
deskutils/owncloudclient/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= owncloudclient
DISTVERSION= 2.8.2
DISTVERSIONSUFFIX= .4246
PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
DISTNAME= ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
@ -15,7 +16,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:noninja compiler:c++11-lib desktop-file-utils gmake \
iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \

3
deskutils/pim-sieve-editor/Makefile
View File

@ -1,11 +1,12 @@
PORTNAME= pim-sieve-editor
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Mail sieve editor
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \

4
graphics/qgis-ltr/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.22.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
PKGNAMESUFFIX= -ltr
@ -47,7 +47,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libprotobuf-lite.so:devel/protobuf \
libqjson-qt5.so:devel/qjson \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
libqt5keychain.so:security/qtkeychain \
libqt5keychain.so:security/qtkeychain@qt5 \
libqwt6.so:x11-toolkits/qwt6 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \

4
graphics/qgis/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= qgis
DISTVERSION= 3.26.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
@ -45,7 +45,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libprotobuf-lite.so:devel/protobuf \
libqjson-qt5.so:devel/qjson \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
libqt5keychain.so:security/qtkeychain \
libqt5keychain.so:security/qtkeychain@qt5 \
libqwt6.so:x11-toolkits/qwt6 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \

4
mail/trojita/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= trojita
PORTVERSION= 0.7
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/src/
@ -10,7 +10,7 @@ COMMENT= Fast cross-platform IMAP e-mail client using Qt 5 toolkit
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
USE_LDCONFIG= yes

4
net-im/chatterino2/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= chatterino2
PORTVERSION= 2.3.4
PORTREVISION= 2
PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= net-im
@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= rapidjson>0:devel/rapidjson \
websocketpp>=0:devel/websocketpp
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= compiler:c++17-lang gl pkgconfig qmake qt:5 ssl
USE_QT= concurrent core gui multimedia network svg widgets \

3
net-im/neochat/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= neochat
DISTVERSION= 22.04
PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= KDE/stable/plasma-mobile/${DISTVERSION}
@ -10,7 +11,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt
LIB_DEPENDS= libcmark.so:textproc/cmark \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient \
kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro

4
net-im/nheko/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= nheko
DISTVERSIONPREFIX=v
DISTVERSION= 0.10.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@ -21,7 +21,7 @@ LIB_DEPENDS= \
liblmdb.so:databases/lmdb \
libmatrix_client.so:net-im/mtxclient \
libolm.so:security/olm \
libqt5keychain.so:security/qtkeychain \
libqt5keychain.so:security/qtkeychain@qt5 \
libspdlog.so:devel/spdlog
USES= cmake compiler:c++17-lang desktop-file-utils \

4
net-im/quaternion/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= Quaternion
DISTVERSION= 0.0.95-beta3
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@ -9,7 +9,7 @@ COMMENT= Matrix IM client based on Qt technologies
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libsecret-1.so:security/libsecret
BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient
# Quotient is a static lib, doesn't need to be in RUN_DEPENDS

3
net-im/ruqola/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= ruqola
MASTER_SITES= KDE/stable/${PORTNAME}/
DISTVERSION= 1.7.4
PORTREVISION= 1
CATEGORIES= net-im kde
MAINTAINER= kde@FreeBSD.org
@ -9,7 +10,7 @@ COMMENT= Rocket.Chat client
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libsecret-1.so:security/libsecret
USES= cmake compiler:c++11-lang gnome kde:5 localbase:ldflags qt:5 tar:xz

4
net-im/spectral/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= spectral
PORTVERSION= 817
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@ -9,7 +9,7 @@ COMMENT= Glossy Matrix IM client based on Qt technologies
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libcmark.so:textproc/cmark
USES= cmake compiler:c++17-lang gl pkgconfig qt:5 tar:bz2

3
net/kio-gdrive/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kio-gdrive
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -8,7 +9,7 @@ COMMENT= KDE IOSlave for accessing gdrive
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libkaccounts.so:net-im/kaccounts-integration
RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers

3
net/kldap/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kldap
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -8,7 +9,7 @@ COMMENT= LDAP access API for KDE
LICENSE= LGPL21
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons i18n kio widgetsaddons service \

3
net/kmailtransport/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kmailtransport
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@ -8,7 +9,7 @@ COMMENT= KDE library to managing mail transport
LICENSE= LGPL21
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libqt5keychain.so:security/qtkeychain
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons i18n \

23
security/qtkeychain/Makefile
View File

@ -1,7 +1,9 @@
PORTNAME= qtkeychain
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.2
PORTREVISION= 1
CATEGORIES= security
PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Platform independent Qt API for storing passwords
@ -9,13 +11,24 @@ COMMENT= Platform independent Qt API for storing passwords
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:5
FLAVORS= qt5 qt6
FLAVOR?= qt5
USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:${FLAVOR:S/qt//}
_WITH_QT6_qt5= OFF
_WITH_QT6_qt6= ON
CMAKE_ARGS= -DBUILD_WITH_QT6=${_WITH_QT6_${FLAVOR}} \
-DQT_MKSPECDIR_REL=${QT_MKSPECDIR_REL}
USE_GITHUB= yes
USE_QT= core dbus buildtools_build qmake_build
_USE_QT_qt5= core dbus buildtools_build qmake_build
_USE_QT_qt6= base
USE_QT= ${_USE_QT_${FLAVOR}}
GH_ACCOUNT= frankosterfeld
USE_LDCONFIG= yes
OPTIONS_SUB= yes
PLIST_SUB= VERSION=${PORTVERSION}
PLIST_SUB= VERSION=${PORTVERSION} \
QT_VER=${FLAVOR:S/qt//}
OPTIONS_DEFINE= LIBSECRET NLS
OPTIONS_DEFAULT= LIBSECRET NLS
@ -24,7 +37,9 @@ LIBSECRET_DESC= Enable libsecret backend
LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret
LIBSECRET_CMAKE_BOOL= LIBSECRET_SUPPORT
NLS_USE= qt=linguisttools_build
_QT_LINGUIST_qt5= linguisttools_build
_QT_LINGUIST_qt6= tools_build
NLS_USE= qt=${_QT_LINGUIST_${FLAVOR}}
NLS_CMAKE_BOOL= BUILD_TRANSLATIONS
.include <bsd.port.mk>

11
security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake Normal file
View File

@ -0,0 +1,11 @@
--- cmake/Modules/ECMGeneratePriFile.cmake.orig 2022-08-27 09:22:23 UTC
+++ cmake/Modules/ECMGeneratePriFile.cmake
@@ -92,7 +92,7 @@ else()
query_qmake(qt_host_data_dir QT_HOST_DATA)
set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
else()
- set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
+ set(ECM_MKSPECS_INSTALL_DIR ${QT_MKSPECDIR_REL}/modules CACHE PATH "The directory where mkspecs will be installed to.")
endif()
function(ECM_GENERATE_PRI_FILE)

20
security/qtkeychain/pkg-plist
View File

@ -1,13 +1,13 @@
include/qt5keychain/keychain.h
include/qt5keychain/qkeychain_export.h
lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake
lib/libqt5keychain.so
lib/libqt5keychain.so.%%VERSION%%
lib/libqt5keychain.so.1
%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
include/qt%%QT_VER%%keychain/keychain.h
include/qt%%QT_VER%%keychain/qkeychain_export.h
lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfig.cmake
lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfigVersion.cmake
lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends.cmake
lib/libqt%%QT_VER%%keychain.so
lib/libqt%%QT_VER%%keychain.so.%%VERSION%%
lib/libqt%%QT_VER%%keychain.so.1
%%QT_MKSPECDIR%%/modules/qt_Qt%%QT_VER%%Keychain.pri
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_de.qm
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_fr.qm
%%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_ro.qm