On Thu, February 6, 2020 11:34, Kirill Bychkov wrote:
> On Tue, February 4, 2020 09:17, Rafael Sadowski wrote:
>> On Sun Feb 02, 2020 at 02:03:03PM +0300, Kirill Bychkov wrote:
>>> On Thu, January 30, 2020 09:03, Rafael Sadowski wrote:
>>> > Hi All
>>> >
>>> > All our consumers only use the qt5 FLAVOR so here is an update diff
>>> > which removes the the qt4 pieces and bump to the latest stable version
>>> > on github. I did the same like the quazip update from Brian Callahan a
>>> > couple days before. Added @pkgpath and bump all consumers.
>>> >
>>> > Comments, OK?
>>>
>>> Hi,
>>> Makes sense to me but I prefer to split update and flavor removal.
>>> Also it needs some tweaks to move 'mkspecs' from /usr/local to
>>> /usr/local/lib/qt5/
>>> Not tested yet.
>>>
>>
>> You're right, ok for the diff below? It just remove the qt4 bits.
>>
>> RS
>
> It is missing @conflict qtkeychain-qt5-*
> With this change OK kirby@
>
>>
Hi,
Here is the patch for updating qtkeycain after Qt4 support removal.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile 7 Feb 2020 07:13:40 -0000 1.14
+++ Makefile 28 Feb 2020 14:58:40 -0000
@@ -4,10 +4,9 @@ COMMENT = Qt API to store passwords and
GH_ACCOUNT = frankosterfeld
GH_PROJECT = qtkeychain
-GH_TAGNAME = v0.7.0
-REVISION = 4
+GH_TAGNAME = v0.10.0
-SHARED_LIBS += qt5keychain 1.0 # 0.4
+SHARED_LIBS += qt5keychain 2.0 # 0.4
CATEGORIES = security
@@ -16,10 +15,17 @@ MAINTAINER = Kirill Bychkov <kirby@open
# BSD-like
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus m
+WANTLIB += Qt5Core Qt5DBus 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
+
+CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="-L${PREFIX}/lib" \
+ -DCMAKE_MODULE_LINKER_FLAGS="-L${PREFIX}/lib" \
+ -DCMAKE_EXE_LINKER_FLAGS="-L${PREFIX}/lib" \
+
-DECM_MKSPECS_INSTALL_DIR="${PREFIX}/lib/${QT}/mkspecs/modules"
LIBNAME = Qt5Keychain
LIBNAME_L = qt5keychain
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/qtkeychain/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 8 Mar 2017 09:39:40 -0000 1.3
+++ distinfo 28 Feb 2020 14:58:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (qtkeychain-0.7.0.tar.gz) = n5r6ro6Qk5HX/JMrrJXji++qxbLrSfZiOo7+xgouajo=
-SIZE (qtkeychain-0.7.0.tar.gz) = 18913
+SHA256 (qtkeychain-0.10.0.tar.gz) =
X5Fs2XhD3lUEZ9sy0uEPIYuQSvWyHP38x8ZCXX38PsI=
+SIZE (qtkeychain-0.10.0.tar.gz) = 38488
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 7 Feb 2020 07:13:40 -0000 1.4
+++ pkg/PLIST 28 Feb 2020 14:58:40 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2020/02/07 07:13:40 rsadowski Exp $
-@pkgpath security/qtkeychain,qt5
@conflict qtkeychain-qt5-*
+@pkgpath security/qtkeychain,qt5
include/${LIBNAME_L}/
include/${LIBNAME_L}/keychain.h
include/${LIBNAME_L}/qkeychain_export.h
@@ -10,7 +10,7 @@ lib/cmake/${LIBNAME}/${LIBNAME}ConfigVer
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/modules/qt_${LIBNAME}.pri
lib/${QT}/translations/
lib/${QT}/translations/qtkeychain_de.qm
lib/${QT}/translations/qtkeychain_ro.qm
