Re: NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
Now with attachment... On Thu Mar 14, 2024 at 09:42:07PM +0100, Rafael Sadowski via ports wrote: > I would like to import multimedia/phonon-backend/vlc-qt6 > multimedia/phonon-qt6. Please find tarball attached. This import does > not create any conflicts but it needs a simple adjustment > > Looking for post-lock import OKs. > > Rafael > > ? vlc-qt6 > Index: Makefile.inc > === > RCS file: /cvs/ports/multimedia/phonon-backend/Makefile.inc,v > diff -u -p -r1.10 Makefile.inc > --- Makefile.inc 6 Jan 2024 15:21:43 - 1.10 > +++ Makefile.inc 14 Mar 2024 20:40:07 - > @@ -2,5 +2,3 @@ CATEGORIES += multimedia > > # LGPL 2.1 > PERMIT_PACKAGE = Yes > - > -LIB_DEPENDS += multimedia/phonon>=4.12.0 > Index: gstreamer/Makefile > === > RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v > diff -u -p -r1.33 Makefile > --- gstreamer/Makefile6 Jan 2024 15:21:43 - 1.33 > +++ gstreamer/Makefile14 Mar 2024 20:40:07 - > @@ -21,7 +21,8 @@ RUN_DEPENDS = multimedia/gstreamer1/plug > multimedia/gstreamer1/plugins-libav \ > x11/gtk+4,-guic > > -LIB_DEPENDS =multimedia/gstreamer1/core \ > +LIB_DEPENDS =multimedia/phonon>=4.12.0 \ > + multimedia/gstreamer1/core \ > multimedia/gstreamer1/plugins-base \ > x11/qt5/qtx11extras > > Index: vlc/Makefile > === > RCS file: /cvs/ports/multimedia/phonon-backend/vlc/Makefile,v > diff -u -p -r1.17 Makefile > --- vlc/Makefile 6 Jan 2024 15:21:43 - 1.17 > +++ vlc/Makefile 14 Mar 2024 20:40:07 - > @@ -12,7 +12,8 @@ MODULES = devel/kf5 > > BUILD_DEPENDS = devel/gettext,-tools > > -LIB_DEPENDS =x11/vlc > +LIB_DEPENDS =multimedia/phonon>=4.12.0 \ > + x11/vlc > > NO_TEST =Yes > > phonon-qt6.tar.gz Description: application/tar-gz
NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
I would like to import multimedia/phonon-backend/vlc-qt6 multimedia/phonon-qt6. Please find tarball attached. This import does not create any conflicts but it needs a simple adjustment Looking for post-lock import OKs. Rafael ? vlc-qt6 Index: Makefile.inc === RCS file: /cvs/ports/multimedia/phonon-backend/Makefile.inc,v diff -u -p -r1.10 Makefile.inc --- Makefile.inc6 Jan 2024 15:21:43 - 1.10 +++ Makefile.inc14 Mar 2024 20:40:07 - @@ -2,5 +2,3 @@ CATEGORIES += multimedia # LGPL 2.1 PERMIT_PACKAGE = Yes - -LIB_DEPENDS += multimedia/phonon>=4.12.0 Index: gstreamer/Makefile === RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v diff -u -p -r1.33 Makefile --- gstreamer/Makefile 6 Jan 2024 15:21:43 - 1.33 +++ gstreamer/Makefile 14 Mar 2024 20:40:07 - @@ -21,7 +21,8 @@ RUN_DEPENDS = multimedia/gstreamer1/plug multimedia/gstreamer1/plugins-libav \ x11/gtk+4,-guic -LIB_DEPENDS = multimedia/gstreamer1/core \ +LIB_DEPENDS = multimedia/phonon>=4.12.0 \ + multimedia/gstreamer1/core \ multimedia/gstreamer1/plugins-base \ x11/qt5/qtx11extras Index: vlc/Makefile === RCS file: /cvs/ports/multimedia/phonon-backend/vlc/Makefile,v diff -u -p -r1.17 Makefile --- vlc/Makefile6 Jan 2024 15:21:43 - 1.17 +++ vlc/Makefile14 Mar 2024 20:40:07 - @@ -12,7 +12,8 @@ MODULES = devel/kf5 BUILD_DEPENDS =devel/gettext,-tools -LIB_DEPENDS = x11/vlc +LIB_DEPENDS = multimedia/phonon>=4.12.0 \ + x11/vlc NO_TEST = Yes
Re: NEW: security/qca-qt6
On Fri Mar 01, 2024 at 08:56:27AM +0100, Landry Breuil wrote: > Le Thu, Feb 29, 2024 at 09:35:39PM +0100, Rafael Sadowski a écrit : > > On Thu Feb 29, 2024 at 09:12:49AM +0100, Landry Breuil wrote: > > > Le Thu, Feb 29, 2024 at 09:03:17AM +0100, Rafael Sadowski a écrit : > > > > OK to import qca-qt6-2.3.8? It's the same as security/qca-qt5, but with > > > > Qt6 enabled and Qt5 disabled. No conflicts with qt5 and qt6. > > > > > > in that case, wouldnt it be better/simpler to multipackage qca into -qt5 > > > and -qt6 and only build it once ? no real opinion, rather thinking out > > > loud.. > > > > > > > Thanks for your feedback. I have already evaluate these options and have > > come to the following 2 1/2 points: > > > > - I don't like to have a Qt6 port in a directory that contains qt5. > > - I don't like the multipackage pattern a lot. For me qca-qt6 is much > > simpler with the same goal. > > fair point, your call. not a big deal since it builds quite fast.. > Looking for a post-lock OK to import.
security/gpgme -qt6
Based on the fantastic work of jca@, below is a diff to add -qt6 flavor
support in gpgme. I have added the cmake qt6 tweak that we can see in
-qt5.
The diff needs a simple MODQT_ENV_SETUP tweak in qt6 and qt5. (Diff in a
different mail)
Looking for OKs after the look.
Rafael
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 67bbcb43657..9ebd69008d9 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,16 +1,26 @@
COMMENT-main = GnuPG Made Easy
+COMMENT-qt-headers = Qt headers for GPGme
COMMENT-qt = Qt bindings for GPGme
+COMMENT-qt6 = Qt6 bindings for GPGme
VERSION = 1.23.2
+REVISION-main =0
+REVISION-qt = 0
+
DISTNAME = gpgme-${VERSION}
PKGNAME-main = gpgme-${VERSION}
+PKGNAME-qt-headers = gpgme-qt-headers-${VERSION}
PKGNAME-qt = gpgme-qt-${VERSION}
+PKGNAME-qt6 = gpgme-qt6-${VERSION}
+
+PKG_ARCH-qt-headers = *
CATEGORIES = security devel
SHARED_LIBS += gpgme24.2 # 43.0
SHARED_LIBS += gpgmepp 3.3 # 26.0
SHARED_LIBS += qgpgme 3.2 # 20.0
+SHARED_LIBS += qgpgmeqt60.0 # 20.0
HOMEPAGE = https://www.gnupg.org/software/gpgme/
@@ -20,44 +30,80 @@ EXTRACT_SUFX = .tar.bz2
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE=Yes
-WANTLIB = assuan gpg-error iconv intl
-WANTLIB-main = ${WANTLIB} c m
-WANTLIB-qt = ${COMPILER_LIBCXX} ${WANTLIB} Qt5Core double-conversion
-WANTLIB-qt += execinfo glib-2.0 gpgme gthread-2.0 icudata icui18n icuuc
-WANTLIB-qt += m pcre2-8 pcre2-16 z zstd
+WANTLIB-main = ${COMPILER_LIBCXX} assuan c gpg-error iconv intl m
+WANTLIB-qt-headers =
+WANTLIB-qt += ${COMPILER_LIBCXX} Qt5Core assuan double-conversion
+WANTLIB-qt += execinfo glib-2.0 gpg-error gpgme gpgmepp gthread-2.0
+WANTLIB-qt += iconv icudata icui18n icuuc intl m pcre2-16 pcre2-8
+WANTLIB-qt += z zstd
+WANTLIB-qt6 += ${COMPILER_LIBCXX} Qt6Core assuan b2 double-conversion
+WANTLIB-qt6 += execinfo glib-2.0 gpg-error gpgme gpgmepp gthread-2.0
+WANTLIB-qt6 += iconv icudata icui18n icuuc intl m pcre2-16 pcre2-8
+WANTLIB-qt6 += z zstd
COMPILER = base-clang ports-gcc
-MULTI_PACKAGES = -main -qt
-PSEUDO_FLAVORS = no_qt
-FLAVOR ?=
+MULTI_PACKAGES = -main -qt-headers -qt -qt6
+# XXX we forcefully set either no_qt or no_qt6,
+# is "bootstrap" doing anything useful?
+PSEUDO_FLAVORS = no_qt no_qt6 bootstrap qt6
+FLAVOR ?= no_qt6 bootstrap
+
+.if ${FLAVOR:Mqt6}
+# Cannot build both qt5 and qt6 at the same time
+# FLAVOR="qt6 no_qt6" makes no sense
+FLAVOR := no_qt ${FLAVOR:Nno_qt6}
+.elif !${FLAVOR:Mno_qt*} && !${FLAVOR:Mqt6}
+# XXX will portcheck STFU?!?
+FLAVOR += no_qt6
+.endif
-# don't depend on Qt5 on arches where it's known to fail
+# don't depend on Qt on arches where it's known to fail
+# XXX needs MODQT_NOT_FOR_ARCHS?
NOT_FOR_ARCHS-qt = alpha mips64 sh
+NOT_FOR_ARCHS-qt6 =alpha mips64 sh
CONFIGURE_STYLE = gnu
BUILD_DEPENDS =security/gnupg>=2.2.23p1
RUN_DEPENDS = security/gnupg>=2.2.23p1
-LIB_DEPENDS-main = ${LIB_DEPENDS:N*qt*} \
- devel/gettext,-runtime \
+LIB_DEPENDS-main = devel/gettext,-runtime \
security/libgpg-error>=1.4 \
security/libassuan
+LIB_DEPENDS-qt-headers =
+RUN_DEPENDS-qt-headers =
+# XXX WIP: not accurate enough, should handle REVISION
+LIB_DEPENDS-qt += ${MODQT5_LIB_DEPENDS} \
+ gpgme-=${VERSION}:${BUILD_PKGPATH},-main
+RUN_DEPENDS-qt =
gpgme-qt-headers-=${VERSION}:${BUILD_PKGPATH},-qt-headers
+LIB_DEPENDS-qt6 += ${MODQT6_LIB_DEPENDS} \
+ gpgme-=${VERSION}:${BUILD_PKGPATH},-main
+RUN_DEPENDS-qt6 =
gpgme-qt-headers-=${VERSION}:${BUILD_PKGPATH},-qt-headers
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_prog_DOXYGEN=false
-.include
+MODQT_DEPS = No
+MODQT_ENV_SETUP = No
-.if ${BUILD_PACKAGES:M-qt}
-MODULES += x11/qt5
+.include
+.if ${BUILD_PACKAGES:M-qt} && ${BUILD_PACKAGES:M-qt6}
+ERRORS += "Cannot build Qt and Qt6 support at the same time."
+.elif ${BUILD_PACKAGES:M-qt}
+MODULES += x11/qt5 \
+ x11/qt6
+MODQT5_DEPS = Yes
+MODQT5_ENV_SETUP = Yes
CONFIGURE_ARGS += --enable-languages='cpp qt'
-LIB_DEPENDS-qt += ${LIB_DEPENDS} \
- gpgme-=${VERSION}:${BUILD_PKGPATH},-main
+.elif ${BUILD_PACKAGES:M-qt6}
+MODULES += x11/qt6 \
+ x11/qt5
+MODQT6_DEPS = Yes
+MODQT6_ENV_SETUP = Yes
+CONFIGURE_ARGS += --enable-languages='cpp qt6'
.else
-COMPILER_LANGS = c
-CONFIGURE_ARGS += --enable-languages=''
+CONFIGURE_ARGS += --enable-languages='cpp'
.endif
# needed for the regression tests
@@ -65,6 +111,7 @@ US
Add MODQT_ENV_SETUP to qt5/6
Make _MODQT6_SETUP and _MODQT5_SETUP optional. Enabled by default so
that the behavior does not change.
OK?
diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk
index 2115f090dfb..7e4ff237d35 100644
--- a/x11/qt5/qt5.port.mk
+++ b/x11/qt5/qt5.port.mk
@@ -163,9 +163,13 @@ LIB_DEPENDS += ${MODQT5_LIB_DEPENDS}
BUILD_DEPENDS += ${MODQT5_BUILD_DEPENDS}
.endif
+MODQT_ENV_SETUP ?= Yes
+MODQT5_ENV_SETUP ?=${MODQT_ENV_SETUP}
+.if ${MODQT5_ENV_SETUP:L} == yes
CONFIGURE_ENV +=${_MODQT5_SETUP}
MAKE_ENV +=${_MODQT5_SETUP}
MAKE_FLAGS += ${_MODQT5_SETUP}
+.endif
MODQT5_USE_CXX11 ?=Yes
.if ${MODQT5_USE_CXX11:L} == "yes"
diff --git a/x11/qt6/qt6.port.mk b/x11/qt6/qt6.port.mk
index 1695454b83e..377ad3ff343 100644
--- a/x11/qt6/qt6.port.mk
+++ b/x11/qt6/qt6.port.mk
@@ -41,9 +41,13 @@ MODQT6_DEPS ?= ${MODQT_DEPS}
LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
.endif
+MODQT_ENV_SETUP ?= Yes
+MODQT6_ENV_SETUP ?=${MODQT_ENV_SETUP}
+.if ${MODQT6_ENV_SETUP:L} == yes
CONFIGURE_ENV += ${_MODQT6_SETUP}
MAKE_ENV +=${_MODQT6_SETUP}
MAKE_FLAGS += ${_MODQT6_SETUP}
+.endif
MODQT6_USE_CXX17 ?=Yes
