Friday, December 01, 2023

security/qtkeychain: add Qt6 FLAVOR

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 28 Sep 2023 17:24:15 -0000 1.20
+++ Makefile 1 Dec 2023 10:23:59 -0000
@@ -4,7 +4,8 @@ GH_ACCOUNT = frankosterfeld
GH_PROJECT = qtkeychain
GH_TAGNAME = 0.14.1

-SHARED_LIBS += qt5keychain 2.1 # 0.4
+SHARED_LIBS += qt5keychain 2.1
+SHARED_LIBS += qt6keychain 0.0

CATEGORIES = security

@@ -13,18 +14,37 @@ MAINTAINER = Kirill Bychkov <kirby@open
# BSD-like
PERMIT_PACKAGE = Yes

-WANTLIB += Qt5Core Qt5DBus gio-2.0 glib-2.0 gobject-2.0 intl m secret-1
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m secret-1
WANTLIB += ${COMPILER_LIBCXX}

-MODULES = devel/cmake \
- x11/qt5
-LIB_DEPENDS += x11/gnome/libsecret
+MODULES = devel/cmake

-CONFIGURE_ARGS += -DECM_MKSPECS_INSTALL_DIR="${PREFIX}/lib/${QT}/mkspecs/modules"
+FLAVORS = qt6
+FLAVOR ?=

+.if ${FLAVOR:Mqt6}
+CONFIGURE_ARGS += -DBUILD_WITH_QT6=ON
+FULLPKGNAME = qtkeychain-qt6-${GH_TAGNAME}
+MODULES += x11/qt6 lang/clang
+MODCLANG_COMPILER_LINKS = Yes
+MODCLANG_LANGS += c++
+WANTLIB += Qt6Core Qt6DBus
+BUILD_DEPENDS += x11/qt6/qttools
+LIB_DEPENDS += ${MODCLANG_LIB_DEPENDS}
+LIBNAME = Qt6Keychain
+LIBNAME_L = qt6keychain
+QT = qt6
+.else
+MODULES += x11/qt5
+WANTLIB += Qt5Core Qt5DBus
LIBNAME = Qt5Keychain
LIBNAME_L = qt5keychain
QT = qt5
+.endif
+
+LIB_DEPENDS += x11/gnome/libsecret
+
+CONFIGURE_ARGS += -DECM_MKSPECS_INSTALL_DIR="${PREFIX}/lib/${QT}/mkspecs/modules"

SUBST_VARS += LIBNAME LIBNAME_L QT

Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 11 Mar 2022 19:53:59 -0000 1.7
+++ pkg/PLIST 1 Dec 2023 10:23:59 -0000
@@ -3,12 +3,16 @@
include/${LIBNAME_L}/
include/${LIBNAME_L}/keychain.h
include/${LIBNAME_L}/qkeychain_export.h
+lib/cmake/
lib/cmake/${LIBNAME}/
lib/cmake/${LIBNAME}/${LIBNAME}Config.cmake
lib/cmake/${LIBNAME}/${LIBNAME}ConfigVersion.cmake
lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends${MODCMAKE_BUILD_SUFFIX}
lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends.cmake
@lib lib/lib${LIBNAME_L}.so.${LIB${LIBNAME_L}_VERSION}
+lib/${QT}/
+lib/${QT}/mkspecs/
+lib/${QT}/mkspecs/modules/
lib/${QT}/mkspecs/modules/qt_${LIBNAME}.pri
share/${LIBNAME_L}/
share/${LIBNAME_L}/translations/
Hi!
Attached diff adds Qt6 FLAVOR to qtkeychain. It is
needed for upcoming net/owncloudclient update.
OK?

No comments:

Post a Comment