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 17 Dec 2023 17:53:33 -0000
@@ -3,8 +3,10 @@ COMMENT = Qt API to store passwords and
GH_ACCOUNT = frankosterfeld
GH_PROJECT = qtkeychain
GH_TAGNAME = 0.14.1
+REVISION = 0
-SHARED_LIBS += qt5keychain 2.1 # 0.4
+SHARED_LIBS += qt5keychain 2.1
+SHARED_LIBS += qt6keychain 0.0
CATEGORIES = security
@@ -13,20 +15,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
+MODULES = devel/cmake
+
LIB_DEPENDS += x11/gnome/libsecret
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
+QT = qt6
+.else
+MODULES += x11/qt5
+WANTLIB += Qt5Core Qt5DBus
LIBNAME = Qt5Keychain
-LIBNAME_L = qt5keychain
QT = qt5
+.endif
-SUBST_VARS += LIBNAME LIBNAME_L QT
+SUBST_VARS += LIBNAME LIBNAME:L QT
NO_TEST = Yes
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 17 Dec 2023 17:53:33 -0000
@@ -1,19 +1,19 @@
@conflict qtkeychain-qt5-*
@pkgpath security/qtkeychain,qt5
-include/${LIBNAME_L}/
-include/${LIBNAME_L}/keychain.h
-include/${LIBNAME_L}/qkeychain_export.h
+include/${LIBNAME:L}/
+include/${LIBNAME:L}/keychain.h
+include/${LIBNAME:L}/qkeychain_export.h
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 lib/lib${LIBNAME:L}.so.${LIB${LIBNAME:L}_VERSION}
lib/${QT}/mkspecs/modules/qt_${LIBNAME}.pri
-share/${LIBNAME_L}/
-share/${LIBNAME_L}/translations/
-share/${LIBNAME_L}/translations/qtkeychain_de.qm
-share/${LIBNAME_L}/translations/qtkeychain_fr.qm
-share/${LIBNAME_L}/translations/qtkeychain_ro.qm
-share/${LIBNAME_L}/translations/qtkeychain_ru.qm
-share/${LIBNAME_L}/translations/qtkeychain_zh.qm
+share/${LIBNAME:L}/
+share/${LIBNAME:L}/translations/
+share/${LIBNAME:L}/translations/qtkeychain_de.qm
+share/${LIBNAME:L}/translations/qtkeychain_fr.qm
+share/${LIBNAME:L}/translations/qtkeychain_ro.qm
+share/${LIBNAME:L}/translations/qtkeychain_ru.qm
+share/${LIBNAME:L}/translations/qtkeychain_zh.qm
On Thu, December 14, 2023 21:27, Klemens Nanni wrote:
> On Thu, Dec 14, 2023 at 11:10:01AM +0300, Kirill Bychkov wrote:
>> On Fri, December 1, 2023 13:27, Kirill Bychkov wrote:
>> > Hi!
>> > Attached diff adds Qt6 FLAVOR to qtkeychain. It is
>> > needed for upcoming net/owncloudclient update.
>> > OK?
>>
>> Ping
>
Hi!
> The result looks fine, but you have quite a few (trailing) space/tab issues.
> Should keychain,qt6 be hooked up?
When owncloud client update will be ready- surely
>
> Some lines move around without changing.
I've moved them back to reduce diff.
>
> Two unconditional SHARED_LIBS seems off; you can use LIBNAME_L, either in
> FLAVOR blocks for unique versions or outside if qt6 can start at 2.1.
>
> LIBNAME_L could be ${LIBNAME:L} instead of duplicating the string.
Fixed, thanks.
> You could also reuse QT to pull common lines out of the FLAVOR blocks.
>
It will make things complicated.
Attached diff with fixes and REVISION bump.
No comments:
Post a Comment