Re: net/libaccounts-qt: qt6 flavor
On Sun Apr 14, 2024 at 07:55:55PM +0200, Landry Breuil wrote: > Le Sun, Apr 14, 2024 at 07:38:35PM +0200, Rafael Sadowski a écrit : > > On Sun Apr 14, 2024 at 06:52:42PM +0200, Landry Breuil wrote: > > > Le Mon, Apr 08, 2024 at 07:25:49AM +0200, Rafael Sadowski a écrit : > > > > The same pattern like in the perverse qt6 flavor diffs. OK? > > > > > > my understanding is that is needed for the huge devel/kf6 monster: > > > in devel/kf6/purpose: the following libraries in WANTLIB look like masked > > > by RUN_DEPENDS: Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Qml Qt6Widgets > > > Qt6Xml accounts-qt6 kaccounts6 > > > > Hmm, I think this is an issue on your side (My bulk was happy and my > > current local build is happy) > > i have no idea about that, it was on a clean portstree with only your > devel/kf6 tarball. > > > There are some more commits in nicolasfella libaccounts-qt6 repo so I > > bumped the libaccounts-qt (qt5) version. > > what i meant was that this was not "the same code" so something else than > REVISION and SHARED_LIBS should be bumped, hence maybe pl0 :) Now it's clicked! For sure we need pl0. Thanks! > > > > do the 3 consumers need adaptations or just build fine with this update ? > > > i don't remember if a REVISION bump is needed since you add a flavor, > > > maybe the > > > pkgpath changes ? > > > > > > x11/kde-applications/kio-gdrive > > > x11/kde-applications/akonadi > > > x11/kde-applications/kaccounts-integration > > > > Yes they do. I don't know yet whether I'll do this before the > > kde6-big-bang commit. If so, I'll test it with the current tree and the > > ports. > > if they build then ok with me, with pl0 > > Landry
Re: net/libaccounts-qt: qt6 flavor
Le Sun, Apr 14, 2024 at 07:38:35PM +0200, Rafael Sadowski a écrit : > On Sun Apr 14, 2024 at 06:52:42PM +0200, Landry Breuil wrote: > > Le Mon, Apr 08, 2024 at 07:25:49AM +0200, Rafael Sadowski a écrit : > > > The same pattern like in the perverse qt6 flavor diffs. OK? > > > > my understanding is that is needed for the huge devel/kf6 monster: > > in devel/kf6/purpose: the following libraries in WANTLIB look like masked > > by RUN_DEPENDS: Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Qml Qt6Widgets Qt6Xml > > accounts-qt6 kaccounts6 > > Hmm, I think this is an issue on your side (My bulk was happy and my > current local build is happy) i have no idea about that, it was on a clean portstree with only your devel/kf6 tarball. > There are some more commits in nicolasfella libaccounts-qt6 repo so I > bumped the libaccounts-qt (qt5) version. what i meant was that this was not "the same code" so something else than REVISION and SHARED_LIBS should be bumped, hence maybe pl0 :) > > do the 3 consumers need adaptations or just build fine with this update ? > > i don't remember if a REVISION bump is needed since you add a flavor, maybe > > the > > pkgpath changes ? > > > > x11/kde-applications/kio-gdrive > > x11/kde-applications/akonadi > > x11/kde-applications/kaccounts-integration > > Yes they do. I don't know yet whether I'll do this before the > kde6-big-bang commit. If so, I'll test it with the current tree and the > ports. if they build then ok with me, with pl0 Landry
Re: net/libaccounts-qt: qt6 flavor
On Sun Apr 14, 2024 at 06:52:42PM +0200, Landry Breuil wrote:
> Le Mon, Apr 08, 2024 at 07:25:49AM +0200, Rafael Sadowski a écrit :
> > The same pattern like in the perverse qt6 flavor diffs. OK?
>
> my understanding is that is needed for the huge devel/kf6 monster:
Yes it we are ready to hook it up:
wip-ports/x11/kde-plasma/plasma-desktop/Makefile
79: net/libaccounts-qt,qt6 \
wip-ports/x11/kde-applications/kf6-kaccounts-integration/Makefile
33: net/libaccounts-qt,qt6 \
wip-ports/x11/kde-applications/akonadi/Makefile
59: net/libaccounts-qt,qt6 \
wip-ports/x11/kde-applications/kaccounts-providers/Makefile
23: net/libaccounts-qt,qt6 \
wip-ports/x11/kde-applications/kaccounts-integration/Makefile
23: net/libaccounts-qt \
wip-ports/x11/kde-applications/kio-gdrive/Makefile
28: net/libaccounts-qt,qt6 \
wip-ports/devel/kf6/purpose/Makefile
35:LIB_DEPENDS += net/libaccounts-qt,qt6 \
wip-ports/devel/kf5/purpose/Makefile
42:LIB_DEPENDS += net/libaccounts-qt \
>
> Fatal: Unknown flavor(s) qt6 (in net/libaccounts-qt)
>(No flavors for this port). (in net/libaccounts-qt)
> *** Error 1 in /usr/ports/net/libaccounts-qt
> (/usr/ports/infrastructure/mk/bsd.port.mk:3885 '.BEGIN': @exit 1)
> Problem with dependency net/libaccounts-qt,qt6
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3548
> 'lib-depends-args': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(
> mktemp...)
> *** Error 1 in /usr/ports/devel/kf6/purpose
> (/usr/ports/infrastructure/mk/bsd.port.mk:3216 'print-plist-with-depends':
> @if a=`SUBPACKAGE=- P...)
> Fatal: Unknown flavor(s) qt6 (in net/libaccounts-qt)
>(No flavors for this port). (in net/libaccounts-qt)
> *** Error 1 in /usr/ports/net/libaccounts-qt
> (/usr/ports/infrastructure/mk/bsd.port.mk:3885 '.BEGIN': @exit 1)
> *** Problem checking deps in "net/libaccounts-qt".
> *** Error 1 in /usr/ports/devel/kf6/purpose
> (/usr/ports/infrastructure/mk/bsd.port.mk:3741 'show-run-depends': @case
> X${_DEPENDS_FILE} in X...)
> in devel/kf6/purpose: the following libraries in WANTLIB look like masked by
> RUN_DEPENDS: Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Qml Qt6Widgets Qt6Xml
> accounts-qt6 kaccounts6
Hmm, I think this is an issue on your side (My bulk was happy and my
current local build is happy)
>
> technically since you change upstream site, i'd rather have an actual pl0 or
> something rather than just bumping REVISION..
There are some more commits in nicolasfella libaccounts-qt6 repo so I
bumped the libaccounts-qt (qt5) version.
>
> do the 3 consumers need adaptations or just build fine with this update ?
> i don't remember if a REVISION bump is needed since you add a flavor, maybe
> the
> pkgpath changes ?
>
> x11/kde-applications/kio-gdrive
> x11/kde-applications/akonadi
> x11/kde-applications/kaccounts-integration
Yes they do. I don't know yet whether I'll do this before the
kde6-big-bang commit. If so, I'll test it with the current tree and the
ports.
>
> Landry
>
> > diff --git a/net/libaccounts-qt/Makefile b/net/libaccounts-qt/Makefile
> > index 83723cd0e9c..cb67cfb1ca1 100644
> > --- a/net/libaccounts-qt/Makefile
> > +++ b/net/libaccounts-qt/Makefile
> > @@ -3,10 +3,13 @@ COMMENT = Qt-based client library for the accounts
> > database
> > CATEGORIES = net
> >
> > V =VERSION_1.16
> > +DIST_TUPLE = gitlab nicolasfella libaccounts-qt \
> > + 18557f7def9af8f4a9e0e93e9f575ae11e5066aa .
> > DISTNAME = libaccounts-qt-${V:S/VERSION_//}
> > -REVISION = 2
> > +REVISION = 3
> >
> > SHARED_LIBS += accounts-qt5 0.0 # 1.4
> > +SHARED_LIBS += accounts-qt6 0.0 # 1.4
> >
> > HOMEPAGE = https://accounts-sso.gitlab.io/
> >
> > @@ -15,28 +18,40 @@ MAINTAINER =Rafael Sadowski
> > # LGPLv2.1+, GPLv2+
> > PERMIT_PACKAGE = Yes
> >
> > -SITES =https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/${V}/
> >
> > -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
> > -WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> > +FLAVORS= qt6
> > +FLAVOR ?=
> >
> > +.if ${FLAVOR:Mqt6}
> > +FULLPKGNAME= libaccounts-qt6-${V:S/VERSION_//}
> > +MODULES = x11/qt6 \
> > + devel/qmake
> > +WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Test Qt6Xml accounts-glib
> > +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> > +QT_VERSION = qt6
> > +.else
> > MODULES = x11/qt5 \
> > devel/qmake
> > -
> > -BUILD_DEPENDS =devel/doxygen>=1.10.0 \
> > - textproc/gtk-doc
> > +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
> > +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> > +QT_VERSION = qt5
> > +.endif
> >
> > LIB_DEPENDS = net/libaccounts-glib \
> > devel/glib2
> >
> > -WRKDIST =
> > ${WRKDIR}/libaccounts-qt-${V}-525ec684cfa8d234f797d7e49e21c476eea04d8e
> > +WRKDIST =
> > ${WRKDIR}/libacco
Re: net/libaccounts-qt: qt6 flavor
Le Mon, Apr 08, 2024 at 07:25:49AM +0200, Rafael Sadowski a écrit :
> The same pattern like in the perverse qt6 flavor diffs. OK?
my understanding is that is needed for the huge devel/kf6 monster:
Fatal: Unknown flavor(s) qt6 (in net/libaccounts-qt)
(No flavors for this port). (in net/libaccounts-qt)
*** Error 1 in /usr/ports/net/libaccounts-qt
(/usr/ports/infrastructure/mk/bsd.port.mk:3885 '.BEGIN': @exit 1)
Problem with dependency net/libaccounts-qt,qt6
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3548
'lib-depends-args': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$( mktemp...)
*** Error 1 in /usr/ports/devel/kf6/purpose
(/usr/ports/infrastructure/mk/bsd.port.mk:3216 'print-plist-with-depends': @if
a=`SUBPACKAGE=- P...)
Fatal: Unknown flavor(s) qt6 (in net/libaccounts-qt)
(No flavors for this port). (in net/libaccounts-qt)
*** Error 1 in /usr/ports/net/libaccounts-qt
(/usr/ports/infrastructure/mk/bsd.port.mk:3885 '.BEGIN': @exit 1)
*** Problem checking deps in "net/libaccounts-qt".
*** Error 1 in /usr/ports/devel/kf6/purpose
(/usr/ports/infrastructure/mk/bsd.port.mk:3741 'show-run-depends': @case
X${_DEPENDS_FILE} in X...)
in devel/kf6/purpose: the following libraries in WANTLIB look like masked by
RUN_DEPENDS: Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Qml Qt6Widgets Qt6Xml
accounts-qt6 kaccounts6
technically since you change upstream site, i'd rather have an actual pl0 or
something rather than just bumping REVISION..
do the 3 consumers need adaptations or just build fine with this update ?
i don't remember if a REVISION bump is needed since you add a flavor, maybe the
pkgpath changes ?
x11/kde-applications/kio-gdrive
x11/kde-applications/akonadi
x11/kde-applications/kaccounts-integration
Landry
> diff --git a/net/libaccounts-qt/Makefile b/net/libaccounts-qt/Makefile
> index 83723cd0e9c..cb67cfb1ca1 100644
> --- a/net/libaccounts-qt/Makefile
> +++ b/net/libaccounts-qt/Makefile
> @@ -3,10 +3,13 @@ COMMENT = Qt-based client library for the accounts
> database
> CATEGORIES = net
>
> V = VERSION_1.16
> +DIST_TUPLE = gitlab nicolasfella libaccounts-qt \
> + 18557f7def9af8f4a9e0e93e9f575ae11e5066aa .
> DISTNAME = libaccounts-qt-${V:S/VERSION_//}
> -REVISION = 2
> +REVISION = 3
>
> SHARED_LIBS += accounts-qt5 0.0 # 1.4
> +SHARED_LIBS += accounts-qt6 0.0 # 1.4
>
> HOMEPAGE = https://accounts-sso.gitlab.io/
>
> @@ -15,28 +18,40 @@ MAINTAINER = Rafael Sadowski
> # LGPLv2.1+, GPLv2+
> PERMIT_PACKAGE = Yes
>
> -SITES = https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/${V}/
>
> -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
> -WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> +FLAVORS= qt6
> +FLAVOR ?=
>
> +.if ${FLAVOR:Mqt6}
> +FULLPKGNAME= libaccounts-qt6-${V:S/VERSION_//}
> +MODULES =x11/qt6 \
> + devel/qmake
> +WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Test Qt6Xml accounts-glib
> +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> +QT_VERSION = qt6
> +.else
> MODULES =x11/qt5 \
> devel/qmake
> -
> -BUILD_DEPENDS = devel/doxygen>=1.10.0 \
> - textproc/gtk-doc
> +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
> +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
> +QT_VERSION = qt5
> +.endif
>
> LIB_DEPENDS =net/libaccounts-glib \
> devel/glib2
>
> -WRKDIST =
> ${WRKDIR}/libaccounts-qt-${V}-525ec684cfa8d234f797d7e49e21c476eea04d8e
> +WRKDIST =
> ${WRKDIR}/libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa
>
> TEST_TARGET =check
> TEST_IS_INTERACTIVE =Yes
>
> pre-configure:
> - ln -sf ${LOCALBASE}/lib/qt5/bin/q{collection,help}generator
> ${WRKDIR}/bin/
> - ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt5Config.cmake.in
> + ln -sf ${LOCALBASE}/lib/${QT_VERSION}/bin/q{collection,help}generator
> ${WRKDIR}/bin/
> + ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt5Config.cmake.in \
> + ${WRKSRC}/Accounts/AccountsQt6Config.cmake.in
> +
> +post-install:
> + mv ${PREFIX}/bin/accountstest ${PREFIX}/bin/accountstest-${QT_VERSION}
>
> .include
>
> diff --git a/net/libaccounts-qt/distinfo b/net/libaccounts-qt/distinfo
> index ee0597cf09e..01aab518a38 100644
> --- a/net/libaccounts-qt/distinfo
> +++ b/net/libaccounts-qt/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (libaccounts-qt-1.16.tar.gz) =
> KG6wL5NoU+MuYQADoqMyoSUkBQ0iZwfnYwtqKb0732Y=
> -SIZE (libaccounts-qt-1.16.tar.gz) = 64445
> +SHA256
> (nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa.tar.gz)
> = yJ35yVN6+lsvAVVqmaKMt4vKYyVYgUfA6QLVKgbGTEk=
> +SIZE
> (nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa.tar.gz)
> = 65468
> diff --git
> a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
> b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
> index 649a8539009..5b370
