CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/04/14 12:37:15 Modified files: net/weechat: Makefile distinfo Log message: Update WeeChat to 4.2.2 Update diff from Alvar Penning, zstd tweak by me
Re: NEW: devel/kf6
Once again! I don't want to hook up devel/kf6 after the import. Here is the
first part:
devel/kf6/extra-cmake-modules
- We will switch to devel/kf6/extra-cmake-modules for all KF5 and KF6 ports.
Only one version of extra-cmake-modules can be installed. The KF6 version is
backwards compatible and should also be used for KF5 builds.
- Added @pkgpath devel/kf5/extra-cmake-modules and conflict tag
devel/kf6/breeze-icons
- All consumers (only RUN depends) should be bumped and switched to kf6
breeze-icons. These are only icons.
- Added @pkgpath devel/kf5/breeze-icons and conflict tag
So I'll test the pkg upgrade process and provide a diff.
On Sun Apr 14, 2024 at 07:56:39PM +0200, Rafael Sadowski wrote:
> On Sun Apr 14, 2024 at 05:56:13PM +0200, Landry Breuil wrote:
> > Le Sat, Apr 13, 2024 at 04:12:15AM +0200, Rafael Sadowski a écrit :
> > > Attached devel/kf6 6.1.0 tarball that is currently in a bulk build. All
> > > build notes below are still valid.
> >
> > i wont look/read all this monster, i don't use it usually but i think
> > that is a good fit for portcheck:
> >
> > scanning ports under the /usr/ports
> > trailing whitespace in devel/kf6/Makefile
>
> Fixed
>
> > 2 line(s) longer than 80 chars in devel/kf6/Makefile
>
> I'll remove my comments before import.
>
> > 1 line(s) longer than 80 chars in devel/kf6/Makefile.inc
>
> HOMEPAGE is too long. I'm okay with it.
>
> >
> > >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> > >> existent
> > *** Problem checking deps in "devel/kf6/kfilemetadata".
> > >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> > >> existent
> > Missing library for c++>=0.0
> > Missing library for c++abi>=0.0
> > Missing library for pthread>=0.0
> > Missing library for KF6Solid>=0.0
> > Missing library for lmdb>=0.0
> > Missing library for m>=0.0
> > *** Error 1 in /usr/ports/devel/kf6/baloo
> > (/usr/ports/infrastructure/mk/bsd.port.mk:3216 'print-plist-with-depends':
> > @if a=`SUBPACKAGE=- PKG...)
> > >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> > >> existent
> > *** Error 1 in /usr/ports/devel/kf6/kfilemetadata
> > (/usr/ports/infrastructure/mk/bsd.port.mk:3726 '_recurse-show-run-depends':
> > @for d in deve...)
> > *** Problem checking deps in "devel/kf6/kfilemetadata".
> > *** Error 1 in /usr/ports/devel/kf6/baloo
> > (/usr/ports/infrastructure/mk/bsd.port.mk:3741 'show-run-depends': @case
> > X${_DEPENDS_FILE} in X) ...)
> > in devel/kf6/baloo: the following libraries in WANTLIB look like masked by
> > RUN_DEPENDS: KF6Solid Qt6Core Qt6DBus Qt6Network Qt6Qml lmdb
> > 1 line(s) longer than 80 chars in devel/kf6/extra-cmake-modules/Makefile
>
> Please see below x11/kde-applications/kf6-kdegraphics-mobipocket, known
> and pointed out
>
> >
> > i have no idea if that utility checks for conflicts, but that would be my
> > main
> > concern for the complete thing.
>
> Conflicts are all known and many have already fixed like described in
> the init mail:
>
> https://marc.info/?l=openbsd-ports=171066156606603=2
>
> >
> > looking at ports archive i don't see a
> > x11/kde-applications/kf6-kdegraphics-mobipocket submission.
> >
>
> That would mean I would have to send my complete x11/kde-applications
> with an bunch of new ports.
>
> "Looking for an OK to import devel/kf6 (latest version attached). I don't
> want to hook it up for now. If you want to build it you need two ports form
> x11/kde-applications: kf6-kaccounts-integration, kf6-kdegraphics-mobipocket.
>
> You can find here: https://github.com/sizeofvoid/wip-ports/tree/kde6;
>
> -- https://marc.info/?l=openbsd-ports=171195541921554=2
>
> I'm trying I step-by-step plan. So that someone can have a quick look
> over it.
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: NEW: devel/kf6
On Sun Apr 14, 2024 at 05:56:13PM +0200, Landry Breuil wrote:
> Le Sat, Apr 13, 2024 at 04:12:15AM +0200, Rafael Sadowski a écrit :
> > Attached devel/kf6 6.1.0 tarball that is currently in a bulk build. All
> > build notes below are still valid.
>
> i wont look/read all this monster, i don't use it usually but i think
> that is a good fit for portcheck:
>
> scanning ports under the /usr/ports
> trailing whitespace in devel/kf6/Makefile
Fixed
> 2 line(s) longer than 80 chars in devel/kf6/Makefile
I'll remove my comments before import.
> 1 line(s) longer than 80 chars in devel/kf6/Makefile.inc
HOMEPAGE is too long. I'm okay with it.
>
> >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> >> existent
> *** Problem checking deps in "devel/kf6/kfilemetadata".
> >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> >> existent
> Missing library for c++>=0.0
> Missing library for c++abi>=0.0
> Missing library for pthread>=0.0
> Missing library for KF6Solid>=0.0
> Missing library for lmdb>=0.0
> Missing library for m>=0.0
> *** Error 1 in /usr/ports/devel/kf6/baloo
> (/usr/ports/infrastructure/mk/bsd.port.mk:3216 'print-plist-with-depends':
> @if a=`SUBPACKAGE=- PKG...)
> >> Broken dependency: x11/kde-applications/kf6-kdegraphics-mobipocket non
> >> existent
> *** Error 1 in /usr/ports/devel/kf6/kfilemetadata
> (/usr/ports/infrastructure/mk/bsd.port.mk:3726 '_recurse-show-run-depends':
> @for d in deve...)
> *** Problem checking deps in "devel/kf6/kfilemetadata".
> *** Error 1 in /usr/ports/devel/kf6/baloo
> (/usr/ports/infrastructure/mk/bsd.port.mk:3741 'show-run-depends': @case
> X${_DEPENDS_FILE} in X) ...)
> in devel/kf6/baloo: the following libraries in WANTLIB look like masked by
> RUN_DEPENDS: KF6Solid Qt6Core Qt6DBus Qt6Network Qt6Qml lmdb
> 1 line(s) longer than 80 chars in devel/kf6/extra-cmake-modules/Makefile
Please see below x11/kde-applications/kf6-kdegraphics-mobipocket, known
and pointed out
>
> i have no idea if that utility checks for conflicts, but that would be my main
> concern for the complete thing.
Conflicts are all known and many have already fixed like described in
the init mail:
https://marc.info/?l=openbsd-ports=171066156606603=2
>
> looking at ports archive i don't see a
> x11/kde-applications/kf6-kdegraphics-mobipocket submission.
>
That would mean I would have to send my complete x11/kde-applications
with an bunch of new ports.
"Looking for an OK to import devel/kf6 (latest version attached). I don't
want to hook it up for now. If you want to build it you need two ports form
x11/kde-applications: kf6-kaccounts-integration, kf6-kdegraphics-mobipocket.
You can find here: https://github.com/sizeofvoid/wip-ports/tree/kde6;
-- https://marc.info/?l=openbsd-ports=171195541921554=2
I'm trying I step-by-step plan. So that someone can have a quick look
over it.
Re: net/kdsoap: qt6 flavor
On Sun Apr 14, 2024 at 06:01:51PM +0200, Landry Breuil wrote: > Le Mon, Apr 08, 2024 at 07:37:52AM +0200, Rafael Sadowski a écrit : > > Update kdsoap to 2.2.0 and enable the qt6 flavor. > > > > OK, Feedback? > > does x11/kde-applications/kio-extras build with it ? The current one? yes and maybe ;) My upcoming x11/kde-applications update builds with it the current in-tree, maybe. I would test it before commit and if not I wait for the big-bang. Please keep in mind. I will double check before I commit something on the current tree. "Double Check" means build, conflicts and package upgrade process. > > what other ports require this update ? (just trying to wrap my head > around everything..) I see only kio-extras. > > portcheck says net/kdsoap/pkg/PFRAG.no-qt6 has an empty line at the end. Fixed thanks. > > 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 \
> &g
Re: security/keepassxc: avoid git, drop CRLF fix, update Q_OS_* hack
On Sun Apr 14, 2024 at 12:16:23PM +, Klemens Nanni wrote:
> ShareExport.cpp no longer needs fixing and git gets picked up during
> configure (despite no observed build-change). Fix COMMENT while here.
Could you add CONFIGURE_ARGS += -DDISABLE_FIND_PACKAGE_Git=ON in a extra
line without mixing it with keepassxc options, please.
>
> Testing for UNIX instead of LINUX in browser/BrowserSettingsWidget.cpp has
> the opposite effect as it is an #ifndef, so remove that.
>
> As for gui/Icons.cpp it is non-trivial for me to verify what this does, so
> I noted that down.
ACK
>
> Eventually, it'd be nice to either drop those hacks or turn them into proper
> reasoned patches.
Fine with me.
>
> Feedback? OK?
OK rsadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/keepassxc/Makefile,v
> diff -u -p -r1.60 Makefile
> --- Makefile 23 Mar 2024 06:51:45 - 1.60
> +++ Makefile 3 Apr 2024 19:16:20 -
> @@ -1,7 +1,8 @@
> -COMMENT =management tool for password and sensitive data
> +COMMENT =management tool for passwords and sensitive data
>
> V = 2.7.7
> DISTNAME = keepassxc-${V}
> +REVISION = 0
>
> CATEGORIES = security
>
> @@ -36,6 +37,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
> BUILD_DEPENDS = textproc/asciidoctor
>
> CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="man" \
> + -DDISABLE_FIND_PACKAGE_Git=ON \
> -DWITH_GUI_TESTS=ON \
> -DWITH_XC_AUTOTYPE=ON \
> -DWITH_XC_SSHAGENT=ON \
> @@ -70,19 +72,15 @@ CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON \
> ALL_TARGET +=keepassxc-proxy
> .endif
>
> -FIX_CRLF_FILES = src/keeshare/ShareExport.cpp
> -
> MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
>
> # - MainWindow.cpp has one minor key binding behind Q_OS_* no other BSD seems
> # to patch... drop or upstream? rest got fixed 2018.
> -# - browser/BrowserSettingsWidget.cpp has a visibility fix no other BSD seems
> -# to patch... drop or upstream?
> +# - Icons.cpp has a Qt theme/icon issue fix... untested if this effects us.
> post-patch:
> cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
> gui/MainWindow.cpp \
> - gui/Icons.cpp \
> - browser/BrowserSettingsWidget.cpp
> + gui/Icons.cpp
>
> # build whatever is left (ca. 200 GUI test files)
> pre-test:
>
NEW: net/kdsoap-ws-discovery-client
Depends on net/kdsoap,qt6. OK to import? Upcoming KDE6 depends on it. Information for inst:kdsoap-ws-discovery-client-0.4.0 Comment: KDSoap WS-Discovery client Description: This project is trying to create a WS-Discovery client library based on the KDSoap library. Maintainer: The OpenBSD ports mailing-list WWW: https://www.kdab.com/development-resources/qt-tools/kd-soap/ kdsoap-ws-discovery-client.tar.gz Description: application/gzip
net/kdsoap: qt6 flavor
Update kdsoap to 2.2.0 and enable the qt6 flavor.
OK, Feedback?
diff --git a/net/kdsoap/Makefile b/net/kdsoap/Makefile
index 71d94148bba..3bdb71f1702 100644
--- a/net/kdsoap/Makefile
+++ b/net/kdsoap/Makefile
@@ -1,9 +1,13 @@
COMMENT = Qt-based client-side and server-side SOAP component
-DISTNAME = kdsoap-1.10.0
+V =2.2.0
+DISTNAME = kdsoap-${V}
-SHARED_LIBS += kdsoap 0.1
-SHARED_LIBS += kdsoap-server 0.0
+SHARED_LIBS += kdsoap 1.0
+SHARED_LIBS += kdsoap-server 1.0
+
+SHARED_LIBS += kdsoap-qt60.0 # 0.0
+SHARED_LIBS += kdsoap-server-qt6 0.0 # 0.0
CATEGORIES = net devel
@@ -12,15 +16,26 @@ HOMEPAGE =
https://www.kdab.com/development-resources/qt-tools/kd-soap/
# AGPL3 modified
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+FLAVORS= qt6
+FLAVOR ?=
SITES =
https://github.com/KDAB/KDSoap/releases/download/${DISTNAME}/
-MODULES = devel/cmake \
- x11/qt5
+MODULES = devel/cmake
BUILD_DEPENDS =devel/boost
CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE}
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= kdsoap-qt6-${V}
+MODULES += x11/qt6
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=ON
+.else
+MODULES += x11/qt5
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=OFF
+.endif
+
.include
diff --git a/net/kdsoap/distinfo b/net/kdsoap/distinfo
index ee836e502c0..1e7a5766a83 100644
--- a/net/kdsoap/distinfo
+++ b/net/kdsoap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdsoap-1.10.0.tar.gz) = DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=
-SIZE (kdsoap-1.10.0.tar.gz) = 1399777
+SHA256 (kdsoap-2.2.0.tar.gz) = 2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y=
+SIZE (kdsoap-2.2.0.tar.gz) = 11918875
diff --git a/net/kdsoap/pkg/PFRAG.no-qt6 b/net/kdsoap/pkg/PFRAG.no-qt6
new file mode 100644
index 000..b9b2f6a921d
--- /dev/null
+++ b/net/kdsoap/pkg/PFRAG.no-qt6
@@ -0,0 +1,86 @@
+@bin bin/kdwsdl2cpp
+include/KDSoapClient/
+include/KDSoapClient/KDDateTime
+include/KDSoapClient/KDDateTime.h
+include/KDSoapClient/KDQName
+include/KDSoapClient/KDQName.h
+include/KDSoapClient/KDSoap
+include/KDSoapClient/KDSoap.h
+include/KDSoapClient/KDSoapAuthentication
+include/KDSoapClient/KDSoapAuthentication.h
+include/KDSoapClient/KDSoapClient
+include/KDSoapClient/KDSoapClientInterface
+include/KDSoapClient/KDSoapClientInterface.h
+include/KDSoapClient/KDSoapEndpointReference
+include/KDSoapClient/KDSoapEndpointReference.h
+include/KDSoapClient/KDSoapFaultException
+include/KDSoapClient/KDSoapFaultException.h
+include/KDSoapClient/KDSoapGlobal
+include/KDSoapClient/KDSoapGlobal.h
+include/KDSoapClient/KDSoapHeaders
+include/KDSoapClient/KDSoapJob
+include/KDSoapClient/KDSoapJob.h
+include/KDSoapClient/KDSoapMessage
+include/KDSoapClient/KDSoapMessage.h
+include/KDSoapClient/KDSoapMessageAddressingProperties
+include/KDSoapClient/KDSoapMessageAddressingProperties.h
+include/KDSoapClient/KDSoapNamespaceManager
+include/KDSoapClient/KDSoapNamespaceManager.h
+include/KDSoapClient/KDSoapPendingCall
+include/KDSoapClient/KDSoapPendingCall.h
+include/KDSoapClient/KDSoapPendingCallWatcher
+include/KDSoapClient/KDSoapPendingCallWatcher.h
+include/KDSoapClient/KDSoapSslHandler
+include/KDSoapClient/KDSoapSslHandler.h
+include/KDSoapClient/KDSoapUdpClient
+include/KDSoapClient/KDSoapUdpClient.h
+include/KDSoapClient/KDSoapValue
+include/KDSoapClient/KDSoapValue.h
+include/KDSoapClient/KDSoapValueList
+include/KDSoapClient/kdsoap_version.h
+include/KDSoapServer/
+include/KDSoapServer/KDSoapDelayedResponseHandle
+include/KDSoapServer/KDSoapDelayedResponseHandle.h
+include/KDSoapServer/KDSoapServer
+include/KDSoapServer/KDSoapServer.h
+include/KDSoapServer/KDSoapServerAuthInterface
+include/KDSoapServer/KDSoapServerAuthInterface.h
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
+include/KDSoapServer/KDSoapServerGlobal
+include/KDSoapServer/KDSoapServerGlobal.h
+include/KDSoapServer/KDSoapServerObjectInterface
+include/KDSoapServer/KDSoapServerObjectInterface.h
+include/KDSoapServer/KDSoapServerRawXMLInterface
+include/KDSoapServer/KDSoapServerRawXMLInterface.h
+include/KDSoapServer/KDSoapThreadPool
+include/KDSoapServer/KDSoapThreadPool.h
+lib/cmake/KDSoap/
+lib/cmake/KDSoap/KDSoapConfig.cmake
+lib/cmake/KDSoap/KDSoapConfigVersion.cmake
+lib/cmake/KDSoap/KDSoapMacros.cmake
+lib/cmake/KDSoap/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/KDSoap/KDSoapTargets.cmake
+@lib lib/libkdsoap-server.so.${LIBkdsoap-server_VERSION}
+@lib lib/libkdsoap.so.${LIBkdsoap_VERSION}
+mkspecs/
+mkspecs/modules/
+mkspecs/modules/qt_KDSoapClient.pri
+mkspecs/modules/qt_KDSoapServer.pri
+share/doc/KDSoap/
+share/doc/KDSoap/LICENSES/
+share/doc/KDSoap/LICENSES/BSD-3-Clause.txt
Re: NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
On Sat Apr 06, 2024 at 02:36:43PM +, Klemens Nanni wrote: > 14.03.2024 23:42, Rafael Sadowski via ports пишет: > > 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 > > Why those LIB_DEPENDS those? > No REVISION bumps? > Nothing changes: I moved LIB_DEPENDS as it is from Makefile.inc to the Makefile's. This change is necessary to import multimedia/phonon-backend/vlc-qt6 otherwise multimedia/phonon-backend/vlc-qt6 depends on "multimedia/phonon>=4.12.0" which is qt5. > > > > 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 > > > > >
NEW: net/signond-qt6
Simple qt6 signond port. It was easier and cleaner to create a new port then to add qt6 flavor in the currert net/signond. Upstream, it doesn't matter what package maintaienr has to fight. OK to import? No conflicts at all. Rafael signond-qt6.tar.gz Description: application/gzip
net/libaccounts-qt: qt6 flavor
The same pattern like in the perverse qt6 flavor diffs. OK?
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..5b37053778d 100644
--- a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
+++ b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
@@ -6,7 +6,5 @@ Index: Accounts/AccountsQt5Config.cmake.in
# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
+set(ACCOUNTSQT_LIBRARIES
$${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBaccounts-qt5_VERSION})
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+ set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git
a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
new file mode 100644
index 000..c129c13e6a1
--- /dev/null
+++ b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
@@ -0,0 +1,12 @@
+Index: Accounts/AccountsQt6Config.cmake.in
+--- Accounts/AccountsQt6Config.cmake.in.orig
Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,5 @@
+ # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++set(ACCOUNTSQT_LIBRARIES
$${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBaccounts-qt6_VERSION})
++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git a/net/libaccounts-qt/patches/patch-accounts-qt_pro
b/net/libaccounts-qt/patches/patch-accounts-qt_pro
new file mode 100644
index 000..bd05329914f
--- /dev/null
+++ b/net/libaccounts-qt/patches/pa
Re: UPDATE: Dolphin 20230722
On Thu Apr 04, 2024 at 05:54:52AM -0400, Brad Smith wrote:
> Here is an update to Dolphin 20230722 snapshot.
>
> I thought I had sent this out.
>
> This fixes the Minizip and mGBA build issues Klemens had pointed out.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/dolphin/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 24 Apr 2023 11:40:38 - 1.19
> +++ Makefile 4 Apr 2024 09:47:00 -
> @@ -1,69 +1,68 @@
> USE_WXNEEDED = Yes
> -ONLY_FOR_ARCHS = amd64
> +ONLY_FOR_ARCHS = aarch64 amd64
>
> COMMENT-main = Nintendo GameCube and Wii emulator with GUI
> COMMENT-nogui = Nintendo GameCube and Wii emulator
>
> -V = 5.0.0.20190621
> -DISTNAME = dolphin-emu-${V}
> -PKGNAME =dolphin-${V}
> -REVISION-main = 4
> -REVISION-nogui = 4
> +V = 5.0.0.20230722
> +DISTNAME = dolphin-${V}
> +CATEGORIES = emulators
> +MASTER_SITES = https://comstyle.com/source/
You move to your self-hosed tarball. What is the reason for this?
Re: [b...@comstyle.com: Re: Removing transcode]
On Thu Apr 04, 2024 at 09:00:03AM +0100, Stuart Henderson wrote: > Any objections/OKs? I prefer a newer FFmpeg, so OK rsadowski > > - Forwarded message from Brad Smith - > > From: Brad Smith > Date: Wed, 3 Apr 2024 20:46:22 -0400 > To: st...@openbsd.org > User-Agent: Mozilla Thunderbird > Subject: Re: Removing transcode > > Can this please now be removed? > > On 2023-06-25 8:59 p.m., Brad Smith wrote: > > On 2023-06-01 7:25 p.m., Brad Smith wrote: > > > I'd like to remove the multimedia/transcode port. > > > > > > It has been long unmaintained upstream and does not build > > > with newer FFmpeg. > > > Although patches have been cobbled together over the years > > > to keep it building > > > with newer versions of FFmpeg, to date it has always been > > > somewhat fragile. > > > > > > Also removing graphics/dvdrip and > > > multimedia/subtitleripper which are dependent > > > on transcode and are equally as old and unmaintained. > > > > > > Can this please now be removed? > > > > - End forwarded message - >
Re: nextcloudclient no longer communicating with kf5-kwallet
On Wed Apr 03, 2024 at 11:17:46PM -0700, Courtney wrote: > The most recent package builds for -current introduced a new issue > between nextcloudclient and kf5-kwallet. > > OpenBSD 7.5-current (GENERIC.MP) #14: Wed Apr 3 17:26:03 MDT 2024 > > as well as the Apr 2 build. > > Normally on logging into an xsession, nextcloudclient makes a request > to kwallet to get the credentials, which then prompts me to enter my > password to unlock kwallet. I don't get any errors from nextcloudclient. > > Courtney > |+# https://community.kde.org/Frameworks/6.0_Release_notes |+CONFIGURE_ARGS += -DBUILD_KWALLETD=OFF \ |+ -DBUILD_KWALLET_QUERY=OFF This has something to do with the "KDE Coinstallability" plan. Unfortunately, I had to deactivate it. And we have to wait until devel/kf6 is imported AND nextcloudclient switch from KF5 to KF6. Please blame the KDE folks here. Not my migration plan. Rafael
Re: kdevelop on snapshot/amd64
On Tue Apr 02, 2024 at 01:51:30PM +0200, Dorian Büttner wrote: > Hi all, > > maybe I'm doing something wrong or have hosed my (then fresh) > installation somehow - is it working for everyone else? For me it dumps > core when creating a new or opening an existing project. > > I reported over here as the error seemed similar to me, > https://marc.info/?l=openbsd-misc=170765183101151=2 , but obviously > it went away unnoticed. > > My guess would be something in the dependency tree is mixing system & > ports llvm. From what I found via search engine this construct here > mentioned in the backtrace _GLOBAL__sub_I_DIBuilder.cpp is something > being created intermittently somewhere else - I couldn't find it on my > disk, maybe it can be located in an uncleaned build tree. > > > Thanks, > > Dorian > It's my port. I'll take a look at it. Next time, CC the maintainer (pkg_info kdevleop) please. Not every maintainer reads misc@/ports@ regularly. Rafael
net/kdsoap : qt6 flavor
Simple update and qt6 flavor to install either qt5 and qt6 or both.
The default does not change.
OK?
Rafael
diff --git a/net/kdsoap/Makefile b/net/kdsoap/Makefile
index 71d94148bba..3bdb71f1702 100644
--- a/net/kdsoap/Makefile
+++ b/net/kdsoap/Makefile
@@ -1,9 +1,13 @@
COMMENT = Qt-based client-side and server-side SOAP component
-DISTNAME = kdsoap-1.10.0
+V =2.2.0
+DISTNAME = kdsoap-${V}
-SHARED_LIBS += kdsoap 0.1
-SHARED_LIBS += kdsoap-server 0.0
+SHARED_LIBS += kdsoap 1.0
+SHARED_LIBS += kdsoap-server 1.0
+
+SHARED_LIBS += kdsoap-qt60.0 # 0.0
+SHARED_LIBS += kdsoap-server-qt6 0.0 # 0.0
CATEGORIES = net devel
@@ -12,15 +16,26 @@ HOMEPAGE =
https://www.kdab.com/development-resources/qt-tools/kd-soap/
# AGPL3 modified
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+FLAVORS= qt6
+FLAVOR ?=
SITES =
https://github.com/KDAB/KDSoap/releases/download/${DISTNAME}/
-MODULES = devel/cmake \
- x11/qt5
+MODULES = devel/cmake
BUILD_DEPENDS =devel/boost
CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE}
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= kdsoap-qt6-${V}
+MODULES += x11/qt6
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=ON
+.else
+MODULES += x11/qt5
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=OFF
+.endif
+
.include
diff --git a/net/kdsoap/distinfo b/net/kdsoap/distinfo
index ee836e502c0..1e7a5766a83 100644
--- a/net/kdsoap/distinfo
+++ b/net/kdsoap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdsoap-1.10.0.tar.gz) = DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=
-SIZE (kdsoap-1.10.0.tar.gz) = 1399777
+SHA256 (kdsoap-2.2.0.tar.gz) = 2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y=
+SIZE (kdsoap-2.2.0.tar.gz) = 11918875
diff --git a/net/kdsoap/pkg/PFRAG.no-qt6 b/net/kdsoap/pkg/PFRAG.no-qt6
new file mode 100644
index 000..b9b2f6a921d
--- /dev/null
+++ b/net/kdsoap/pkg/PFRAG.no-qt6
@@ -0,0 +1,86 @@
+@bin bin/kdwsdl2cpp
+include/KDSoapClient/
+include/KDSoapClient/KDDateTime
+include/KDSoapClient/KDDateTime.h
+include/KDSoapClient/KDQName
+include/KDSoapClient/KDQName.h
+include/KDSoapClient/KDSoap
+include/KDSoapClient/KDSoap.h
+include/KDSoapClient/KDSoapAuthentication
+include/KDSoapClient/KDSoapAuthentication.h
+include/KDSoapClient/KDSoapClient
+include/KDSoapClient/KDSoapClientInterface
+include/KDSoapClient/KDSoapClientInterface.h
+include/KDSoapClient/KDSoapEndpointReference
+include/KDSoapClient/KDSoapEndpointReference.h
+include/KDSoapClient/KDSoapFaultException
+include/KDSoapClient/KDSoapFaultException.h
+include/KDSoapClient/KDSoapGlobal
+include/KDSoapClient/KDSoapGlobal.h
+include/KDSoapClient/KDSoapHeaders
+include/KDSoapClient/KDSoapJob
+include/KDSoapClient/KDSoapJob.h
+include/KDSoapClient/KDSoapMessage
+include/KDSoapClient/KDSoapMessage.h
+include/KDSoapClient/KDSoapMessageAddressingProperties
+include/KDSoapClient/KDSoapMessageAddressingProperties.h
+include/KDSoapClient/KDSoapNamespaceManager
+include/KDSoapClient/KDSoapNamespaceManager.h
+include/KDSoapClient/KDSoapPendingCall
+include/KDSoapClient/KDSoapPendingCall.h
+include/KDSoapClient/KDSoapPendingCallWatcher
+include/KDSoapClient/KDSoapPendingCallWatcher.h
+include/KDSoapClient/KDSoapSslHandler
+include/KDSoapClient/KDSoapSslHandler.h
+include/KDSoapClient/KDSoapUdpClient
+include/KDSoapClient/KDSoapUdpClient.h
+include/KDSoapClient/KDSoapValue
+include/KDSoapClient/KDSoapValue.h
+include/KDSoapClient/KDSoapValueList
+include/KDSoapClient/kdsoap_version.h
+include/KDSoapServer/
+include/KDSoapServer/KDSoapDelayedResponseHandle
+include/KDSoapServer/KDSoapDelayedResponseHandle.h
+include/KDSoapServer/KDSoapServer
+include/KDSoapServer/KDSoapServer.h
+include/KDSoapServer/KDSoapServerAuthInterface
+include/KDSoapServer/KDSoapServerAuthInterface.h
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
+include/KDSoapServer/KDSoapServerGlobal
+include/KDSoapServer/KDSoapServerGlobal.h
+include/KDSoapServer/KDSoapServerObjectInterface
+include/KDSoapServer/KDSoapServerObjectInterface.h
+include/KDSoapServer/KDSoapServerRawXMLInterface
+include/KDSoapServer/KDSoapServerRawXMLInterface.h
+include/KDSoapServer/KDSoapThreadPool
+include/KDSoapServer/KDSoapThreadPool.h
+lib/cmake/KDSoap/
+lib/cmake/KDSoap/KDSoapConfig.cmake
+lib/cmake/KDSoap/KDSoapConfigVersion.cmake
+lib/cmake/KDSoap/KDSoapMacros.cmake
+lib/cmake/KDSoap/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/KDSoap/KDSoapTargets.cmake
+@lib lib/libkdsoap-server.so.${LIBkdsoap-server_VERSION}
+@lib lib/libkdsoap.so.${LIBkdsoap_VERSION}
+mkspecs/
+mkspecs/modules/
+mkspecs/modules/qt_KDSoapClient.pri
+mkspecs/modules/qt_KDSoapServer.pri
+share/doc/KDSoap/
+share/doc/KDSoap/LICENSES/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/04/01 22:47:10 Modified files: x11/qt6/qttools: Makefile Log message: Regen WANTLIB with llvm16
devel/qcoro: qt6 flavor
Simple flavor to install either qt5 and qt6 or both.
Works out of box. OK?
Rafael Sadowski
diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile
index d2aa7d94930..bd9c2d193d6 100644
--- a/devel/qcoro/Makefile
+++ b/devel/qcoro/Makefile
@@ -1,8 +1,9 @@
COMMENT = C++ coroutines for Qt
+V =0.10.0
GH_ACCOUNT = danvratil
GH_PROJECT = qcoro
-GH_TAGNAME = v0.10.0
+GH_TAGNAME = v${V}
CATEGORIES = devel
@@ -13,16 +14,25 @@ MAINTAINER =Rafael Sadowski
# MIT
PERMIT_PACKAGE = Yes
+FLAVORS= qt6
+FLAVOR ?=
+
# Coroutines are part of C++ 20 and implemented in GCC 10
COMPILER = base-clang ports-clang
-MODULES = devel/cmake \
- x11/qt5
+MODULES = devel/cmake
-BUILD_DEPENDS =x11/qt5/qtwebsockets
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= qcoro-qt6-${V}
+MODULES += x11/qt6
+BUILD_DEPENDS =x11/qt6/qtwebsockets
+.else
+MODULES += x11/qt5
+BUILD_DEPENDS =x11/qt5/qtwebsockets
-CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON \
- -DUSE_QT_VERSION=5
+CONFIGURE_ARGS =-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON \
+ -DUSE_QT_VERSION=5
+.endif
TEST_IS_INTERACTIVE = X11
diff --git a/devel/qcoro/pkg/PFRAG.no-qt6 b/devel/qcoro/pkg/PFRAG.no-qt6
new file mode 100644
index 000..cc975529b7a
--- /dev/null
+++ b/devel/qcoro/pkg/PFRAG.no-qt6
@@ -0,0 +1,138 @@
+include/qcoro5/
+include/qcoro5/QCoro/
+include/qcoro5/QCoro/QCoro
+include/qcoro5/QCoro/QCoroAbstractSocket
+include/qcoro5/QCoro/QCoroAsyncGenerator
+include/qcoro5/QCoro/QCoroCore
+include/qcoro5/QCoro/QCoroDBus
+include/qcoro5/QCoro/QCoroDBusPendingCall
+include/qcoro5/QCoro/QCoroDBusPendingReply
+include/qcoro5/QCoro/QCoroFuture
+include/qcoro5/QCoro/QCoroFwd
+include/qcoro5/QCoro/QCoroGenerator
+include/qcoro5/QCoro/QCoroIODevice
+include/qcoro5/QCoro/QCoroImageProvider
+include/qcoro5/QCoro/QCoroLocalSocket
+include/qcoro5/QCoro/QCoroNetwork
+include/qcoro5/QCoro/QCoroNetworkReply
+include/qcoro5/QCoro/QCoroProcess
+include/qcoro5/QCoro/QCoroQml
+include/qcoro5/QCoro/QCoroQmlTask
+include/qcoro5/QCoro/QCoroSignal
+include/qcoro5/QCoro/QCoroTask
+include/qcoro5/QCoro/QCoroTcpServer
+include/qcoro5/QCoro/QCoroTest
+include/qcoro5/QCoro/QCoroThread
+include/qcoro5/QCoro/QCoroTimer
+include/qcoro5/QCoro/QCoroWebSocket
+include/qcoro5/QCoro/QCoroWebSocketServer
+include/qcoro5/QCoro/QCoroWebSockets
+include/qcoro5/QCoro/Task
+include/qcoro5/qcoro/
+include/qcoro5/qcoro/concepts_p.h
+include/qcoro5/qcoro/config.h
+include/qcoro5/qcoro/coroutine.h
+include/qcoro5/qcoro/impl/
+include/qcoro5/qcoro/impl/connect.h
+include/qcoro5/qcoro/impl/isqprivatesignal.h
+include/qcoro5/qcoro/impl/task.h
+include/qcoro5/qcoro/impl/taskawaiterbase.h
+include/qcoro5/qcoro/impl/taskfinalsuspend.h
+include/qcoro5/qcoro/impl/taskpromise.h
+include/qcoro5/qcoro/impl/taskpromisebase.h
+include/qcoro5/qcoro/impl/waitfor.h
+include/qcoro5/qcoro/macros_p.h
+include/qcoro5/qcoro/qcoro.h
+include/qcoro5/qcoro/qcoroabstractsocket.h
+include/qcoro5/qcoro/qcoroasyncgenerator.h
+include/qcoro5/qcoro/qcorocore.h
+include/qcoro5/qcoro/qcorocore_export.h
+include/qcoro5/qcoro/qcorodbus.h
+include/qcoro5/qcoro/qcorodbus_export.h
+include/qcoro5/qcoro/qcorodbuspendingcall.h
+include/qcoro5/qcoro/qcorodbuspendingreply.h
+include/qcoro5/qcoro/qcorofuture.h
+include/qcoro5/qcoro/qcorofwd.h
+include/qcoro5/qcoro/qcorogenerator.h
+include/qcoro5/qcoro/qcoroimageprovider.h
+include/qcoro5/qcoro/qcoroiodevice.h
+include/qcoro5/qcoro/qcorolocalsocket.h
+include/qcoro5/qcoro/qcoronetwork.h
+include/qcoro5/qcoro/qcoronetwork_export.h
+include/qcoro5/qcoro/qcoronetworkreply.h
+include/qcoro5/qcoro/qcoroprocess.h
+include/qcoro5/qcoro/qcoroqml.h
+include/qcoro5/qcoro/qcoroqml_export.h
+include/qcoro5/qcoro/qcoroqmltask.h
+include/qcoro5/qcoro/qcoroquick_export.h
+include/qcoro5/qcoro/qcorosignal.h
+include/qcoro5/qcoro/qcorotask.h
+include/qcoro5/qcoro/qcorotcpserver.h
+include/qcoro5/qcoro/qcorotest.h
+include/qcoro5/qcoro/qcorothread.h
+include/qcoro5/qcoro/qcorotimer.h
+include/qcoro5/qcoro/qcorowebsocket.h
+include/qcoro5/qcoro/qcorowebsockets.h
+include/qcoro5/qcoro/qcorowebsockets_export.h
+include/qcoro5/qcoro/qcorowebsocketserver.h
+include/qcoro5/qcoro/task.h
+include/qcoro5/qcoro/waitoperationbase_p.h
+lib/cmake/
+lib/cmake/QCoro5/
+lib/cmake/QCoro5/QCoro5Config.cmake
+lib/cmake/QCoro5/QCoro5ConfigVersion.cmake
+lib/cmake/QCoro5Core/
+lib/cmake/QCoro5Core/QCoro5CoreConfig.cmake
+lib/cmake/QCoro5Core/QCoro5CoreConfigVersion.cmake
+lib/cmake/QCoro5Core/QCoro5CoreTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/QCoro5Core/QCoro5CoreTargets.cmake
+lib/cmake/QCoro5Coro/
+lib/cmake/QCoro5Coro/QCoro5CoroConfig.cmake
+lib/cmake/QCoro5Coro/QCoro5CoroConfigVersion.cmake
+lib/cmake/QCoro5Coro/QCoro5CoroTargets.cmake
+lib/cmake/QCoro5Coro/QCoroMacros.cmake
+lib/cmake/QCoro5DBus/
+lib/cmake/QCoro5DBus/QCoro5DBusConfig.cmake
+lib/cmake
Re: NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
Can anyone look at it? On Fri Mar 22, 2024 at 07:36:45PM +0100, Rafael Sadowski wrote: > ping ;) > > On Thu Mar 14, 2024 at 09:43:20PM +0100, Rafael Sadowski via ports wrote: > > 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 > > > > > > > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/31 04:36:51 Modified files: devel/jenkins/devel: Makefile distinfo devel/jenkins/stable: Makefile distinfo Log message: Update Jenkis Stable (LTS) to 2.440.2 and devel to 2.451
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/31 04:13:41 Modified files: x11/kde-applications/elisa: Makefile Log message: Disable KF5Baloo support Baloo ships with BUILD_INDEXER_SERVICE=OFF for coinstallability support with KDE6. Our old (kf5) port depends on it, so I'm disabling Baloo support for now. Reported by sthen, aja, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/28 00:26:53 Modified files: security/qca-qt6: Makefile Log message: Add missing dependency on qt5compat
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/27 10:31:06 Added files: x11/qt6/qtbase/patches: patch-cmake_QtMkspecHelpers_cmake Log message: Handle openbsd-clang QT_DEFAULT_MKSPEC
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/27 10:28:36 Removed files: x11/qt6/qtbase/patches: patch-cmake_QtBuild_cmake Log message: Remove leftover
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/27 10:24:37 Modified files: x11/qt6: Makefile.version x11/qt6/qt3d : distinfo x11/qt6/qt3d/pkg: PLIST x11/qt6/qt5compat: distinfo x11/qt6/qtbase : distinfo x11/qt6/qtbase/patches: patch-cmake_QtFeature_cmake x11/qt6/qtbase/pkg: PLIST-main x11/qt6/qtcharts: distinfo x11/qt6/qtconnectivity: distinfo x11/qt6/qtdatavis3d: distinfo x11/qt6/qtdeclarative: Makefile distinfo x11/qt6/qtdeclarative/pkg: PLIST x11/qt6/qtgrpc : Makefile distinfo x11/qt6/qthttpserver: distinfo x11/qt6/qtimageformats: distinfo x11/qt6/qtlanguageserver: distinfo x11/qt6/qtlocation: distinfo x11/qt6/qtlottie: distinfo x11/qt6/qtmultimedia: Makefile distinfo x11/qt6/qtmultimedia/pkg: PLIST x11/qt6/qtnetworkauth: distinfo x11/qt6/qtpositioning: distinfo x11/qt6/qtquick3d: distinfo x11/qt6/qtquick3dphysics: distinfo x11/qt6/qtquickeffectmaker: distinfo x11/qt6/qtquicktimeline: distinfo x11/qt6/qtremoteobjects: distinfo x11/qt6/qtscxml: distinfo x11/qt6/qtsensors: distinfo x11/qt6/qtserialbus: distinfo x11/qt6/qtserialport: distinfo x11/qt6/qtshadertools: distinfo x11/qt6/qtspeech: distinfo x11/qt6/qtsvg : distinfo x11/qt6/qttools: distinfo x11/qt6/qttranslations: distinfo x11/qt6/qtvirtualkeyboard: Makefile distinfo x11/qt6/qtvirtualkeyboard/pkg: PLIST x11/qt6/qtwayland: distinfo x11/qt6/qtwayland/pkg: PLIST x11/qt6/qtwebchannel: distinfo x11/qt6/qtwebengine: distinfo x11/qt6/qtwebengine/patches: patch-cmake_Functions_cmake patch-src_core_CMakeLists_txt patch-src_core_api_configure_cmake x11/qt6/qtwebsockets: distinfo x11/qt6/qtwebview: distinfo Log message: Update Qt to 6.6.3 https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md Qt 6.6.3 will be the last release from Qt 6.6 series.
Re: security/gpgme -qt6
On Tue Mar 26, 2024 at 02:17:28PM +, Stuart Henderson wrote:
> On 2024/03/23 22:15, Rafael Sadowski wrote:
> > On Thu Mar 14, 2024 at 09:58:52PM +, Stuart Henderson via ports wrote:
> > > This needs something more, the qt-headers package needs to be knocked out
> > > unless one of the qt versions is built.
> >
> > $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all doas pkg_add
> > -Dunsigned -u
> > gpgme+gpgme-qt-1.23.2->gpgme-1.23.2p0+gpgme-qt-1.23.2p0+gpgme-qt-headers-1.23.2:
> > internal conflict between gpgme-1.23.2p0 and gpgme-qt-1.23.2p0
>
> That's a different issue, I only got as far as testing build rather than
> updates (which fails with FLAVOR="no_qt no_qt6", as will be the case on
> archs where Qt is disabled, or the user builds with that on purpose to
> quickly update without having to install a bunch of Qt packages).
>
> > Unfortunately, you're right. Do you have any idea how we can solve this
> > puzzle?
>
> This only affects things in kde-applications at the moment, right?
> Will those be moving to qt6 as part of a single update, or will they be
> done individually?
>
> If it's a single update then the most obvious answer would be to
> change gpgme-qt to providing qt6 support instead of qt5.
You're brilliant! Of course, all kde-applications that depends on
gpgme-qt will update in a single step. Then it really makes sense to
simply switch from Qt5 to Qt6, which should be very easy.
>
> > (One comment below)
> ...
> > > > +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
> >
> > That doesn't help but ...
> > gpgme-=${VERSION}p${REVISION-main}:${BUILD_PKGPATH},-main
>
> That breaks if REVISION-main is unset. You could rely on PKGSPEC-main
> instead? Although, for most cases -=${VERSION} is probably good enough..
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/26 01:01:39 Modified files: meta/qt6 : Makefile x11/qt6: Makefile.version x11/qt6/qt3d : Makefile distinfo x11/qt6/qt5compat: distinfo x11/qt6/qtbase : Makefile distinfo x11/qt6/qtbase/patches: patch-cmake_QtFeature_cmake patch-src_network_ssl_qsslsocket_openssl_symbols_cpp patch-src_plugins_tls_openssl_qx509_openssl_cpp x11/qt6/qtbase/pkg: PLIST-main x11/qt6/qtcharts: distinfo x11/qt6/qtconnectivity: distinfo x11/qt6/qtdatavis3d: distinfo x11/qt6/qtdeclarative: Makefile distinfo x11/qt6/qtgrpc : Makefile distinfo x11/qt6/qthttpserver: distinfo x11/qt6/qtimageformats: Makefile distinfo x11/qt6/qtlanguageserver: distinfo x11/qt6/qtlocation: distinfo x11/qt6/qtlocation/pkg: PLIST x11/qt6/qtlottie: distinfo x11/qt6/qtmultimedia: Makefile distinfo x11/qt6/qtmultimedia/pkg: PLIST x11/qt6/qtnetworkauth: distinfo x11/qt6/qtpositioning: Makefile distinfo x11/qt6/qtquick3d: Makefile distinfo x11/qt6/qtquick3dphysics: Makefile distinfo x11/qt6/qtquick3dphysics/pkg: PLIST x11/qt6/qtquickeffectmaker: Makefile distinfo x11/qt6/qtquicktimeline: distinfo x11/qt6/qtremoteobjects: distinfo x11/qt6/qtscxml: Makefile distinfo x11/qt6/qtsensors: distinfo x11/qt6/qtserialbus: distinfo x11/qt6/qtserialport: distinfo x11/qt6/qtshadertools: Makefile distinfo x11/qt6/qtspeech: Makefile distinfo x11/qt6/qtsvg : distinfo x11/qt6/qttools: Makefile distinfo x11/qt6/qttranslations: Makefile distinfo x11/qt6/qtvirtualkeyboard: distinfo x11/qt6/qtwayland: Makefile distinfo x11/qt6/qtwebchannel: Makefile distinfo x11/qt6/qtwebengine: Makefile distinfo x11/qt6/qtwebengine/patches: patch-cmake_Functions_cmake patch-configure_cmake patch-src_3rdparty_chromium_build_config_linux_pkg-config_py patch-src_3rdparty_chromium_content_browser_web_contents_web_contents_view_aura_cc patch-src_3rdparty_chromium_third_party_sqlite_src_amalgamation_sqlite3_c patch-src_3rdparty_chromium_v8_src_execution_isolate_cc patch-src_core_CMakeLists_txt patch-src_pdf_CMakeLists_txt x11/qt6/qtwebengine/pkg: PLIST x11/qt6/qtwebsockets: distinfo x11/qt6/qtwebview: Makefile distinfo Removed files: x11/qt6/qtwebengine/patches: patch-src_3rdparty_chromium_third_party_blink_renderer_core_xml_xslt_processor_h patch-src_3rdparty_chromium_third_party_blink_renderer_core_xml_xslt_processor_libxslt_cc patch-src_3rdparty_chromium_third_party_blink_renderer_platform_text_text_break_iterator_cc Log message: Update Qt6 to 6.6.2 https://www.qt.io/blog/qt-6.6.2-released
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/26 00:43:49 Modified files: devel/jenkins/devel: Makefile devel/jenkins/stable: Makefile Log message: Update Jenkins -stable and -devel to the latest version
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/24 02:21:14 Modified files: x11/qt6/qtdeclarative: Makefile x11/qt6/qtlanguageserver: Makefile x11/qt6/qtshadertools: Makefile Log message: Add missing MODQT6_DEPS Qt6 is a bit more complicated with the dependencies like Qt5
Re: security/gpgme -qt6
On Thu Mar 14, 2024 at 09:58:52PM +, Stuart Henderson via ports wrote:
> This needs something more, the qt-headers package needs to be knocked out
> unless one of the qt versions is built.
$ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all doas pkg_add -Dunsigned -u
gpgme+gpgme-qt-1.23.2->gpgme-1.23.2p0+gpgme-qt-1.23.2p0+gpgme-qt-headers-1.23.2:
internal conflict between gpgme-1.23.2p0 and gpgme-qt-1.23.2p0
Unfortunately, you're right. Do you have any idea how we can solve this puzzle?
(One comment below)
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 14 March 2024 20:09:15 "Rafael Sadowski via ports"
> wrote:
>
> > 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 \
> &
Re: fix "PLIST.orig already exists"
On Sat Mar 23, 2024 at 04:11:04PM +0100, Peter Hessler wrote:
> this error is worthless and a waste of time, stop generating it:
> /usr/ports/www/yt-dlp/pkg/PLIST changed but
> /usr/ports/www/yt-dlp/pkg/PLIST.orig exists
>
> OK?
+1
>
> Index: infrastructure/bin/update-plist
> ===
> RCS file: /cvs/openbsd/ports/infrastructure/bin/update-plist,v
> diff -u -p -u -p -r1.214 update-plist
> --- infrastructure/bin/update-plist 14 May 2023 09:18:05 - 1.214
> +++ infrastructure/bin/update-plist 23 Mar 2024 15:07:59 -
> @@ -1392,7 +1392,6 @@ $self->write_new_files;
>
> # and now, we figure out where to move the new files
> my @towrite = ();
> -my $cantmove = 0;
>
> my $exitcode = 0;
>
> @@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
> } else {
> print "$k changed";
> push(@towrite, $k);
> - if (-f "$k$orig") {
> - print " but $k$orig exists\n";
> - $cantmove = 1;
> - } else {
> - print "\n";
> - }
> + print "\n";
> }
> } else {
> print "$k is new\n";
> push(@towrite, $k);
> }
> }
> -}
> -
> -if ($cantmove) {
> - exit(2);
> }
>
> if ($self->{state}->not) {
>
>
> --
> Facts are stubborn, but statistics are more pliable.
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 07:10:57 Modified files: audio/musique : Makefile audio/qsynth : Makefile multimedia/shotcut: Makefile net/qbittorrent: Makefile.inc net/transmission: Makefile net/wireshark : Makefile productivity/novprog: Makefile security/qdigidoc4: Makefile security/qtkeychain: Makefile security/web-eid-app: Makefile x11/qt6: qt6.port.mk x11/qt6/qttools: Makefile x11/qt6ct : Makefile x11/tipp10 : Makefile Log message: Add qt6tools as a build dependency for all qt6 ports Almost all Qt6 ports cannot be built without it, so make it as default like in Qt5. All ports that have explicitly set it have been adjusted. lgtm, OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 06:06:37 Modified files: sysutils/kubectl: Makefile distinfo Log message: Update kubectl-1.29.3
Re: UPDATE: net/nextcloudclient-3.12.2
On Thu Mar 21, 2024 at 10:21:50AM -0400, Adriano Barbosa wrote:
> Hi.
> Update for net/nextcloudclient v3.12.2
> Changelog:
> https://github.com/nextcloud/desktop/releases/v3.12.2
>
> Obrigado!
> --
> Adriano
>
Committed, Obrigado
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
> retrieving revision 1.59
> diff -u -p -r1.59 Makefile
> --- Makefile 8 Mar 2024 07:48:02 - 1.59
> +++ Makefile 21 Mar 2024 14:18:15 -
> @@ -2,7 +2,7 @@ USE_WXNEEDED =Yes
>
> COMMENT =desktop sync client for Nextcloud
>
> -V = 3.12.1
> +V = 3.12.2
> DISTNAME = nextcloudclient-${V}
>
> GH_ACCOUNT = nextcloud
> @@ -13,8 +13,8 @@ CATEGORIES =net
>
> HOMEPAGE = https://nextcloud.com
>
> -SHARED_LIBS += nextcloudsync 17.0 # 3.12.1
> -SHARED_LIBS += nextcloud_csync 8.1 # 3.12.1
> +SHARED_LIBS += nextcloudsync 18.0 # 3.12.2
> +SHARED_LIBS += nextcloud_csync 8.2 # 3.12.2
> SHARED_LIBS += nextcloudsync_vfs_suffix 2.0 # 3.10.2
>
> MAINTAINER = Adriano Barbosa
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
> retrieving revision 1.48
> diff -u -p -r1.48 distinfo
> --- distinfo 8 Mar 2024 07:48:02 - 1.48
> +++ distinfo 21 Mar 2024 14:18:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloudclient-3.12.1.tar.gz) =
> oeEXuh6slnxXx7ZsdvHnIAOJZ06eyf/fFhvFJBhISPY=
> -SIZE (nextcloudclient-3.12.1.tar.gz) = 13640266
> +SHA256 (nextcloudclient-3.12.2.tar.gz) =
> 9XbLcJ2qfctZY7zuJPLTFUKp9Jo0LtukBiWk3oBslb8=
> +SIZE (nextcloudclient-3.12.2.tar.gz) = 13645095
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/net/nextcloudclient/patches/patch-CMakeLists_txt,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 24 Feb 2024 10:28:33 - 1.13
> +++ patches/patch-CMakeLists_txt 21 Mar 2024 14:18:15 -
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -59,7 +59,7 @@ if (NOT DEFINED PACKAGE)
> +@@ -68,7 +68,7 @@ if (NOT DEFINED PACKAGE)
> set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
> endif()
>
> @@ -10,7 +10,7 @@ Index: CMakeLists.txt
>
> include(ECMCoverageOption)
>
> -@@ -302,4 +302,4 @@ elseif(BUILD_CLIENT)
> +@@ -311,4 +311,4 @@ elseif(BUILD_CLIENT)
> configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
> endif()
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 03:23:05 Modified files: net/nextcloudclient: Makefile distinfo net/nextcloudclient/patches: patch-CMakeLists_txt Log message: Update nextcloudclient to 3.12.2 Changelog: https://github.com/nextcloud/desktop/releases/v3.12.2 Update diff as usual from Adriano (maintainer) Obrigado
Re: [new] gurk-rs - a cli signal client
On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote: > Hello, > > here is a command line signal client. It's lacking a lot of features, > but basic text send/receive functionality is there. > > The contact sync doesn't work for me. But I can see and message in > conversations initiated after gurk-rs is linked. > > I hope the situation will improve. But this client is much better than > having no client at all. > > Some hints: > - this is rust, so build with "MAKE_JOBS=8 make", or something. > - F1 shows the key bindings and they're not configurable > - gurk -v(vv) starts verbose mode writes to gurk.log > > I have OK kn@ already. > > One more? > > Best regards, > Stefan What is the status here? I see 0.4.2 upstream.
Re: x11/qt6/qt6.port.mk: BUILD_DEPENDS on x11/qt6/qttools
On Sat Feb 17, 2024 at 09:08:19AM +, Stuart Henderson wrote:
> You'll need to actually add it to BUILD_DEPENDS e.g.
>
> .if ${MODQT6_DEPS:L} == "yes"
> BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
> LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
> .endif
That's what I did, isn't it?
>
> But then you'll also need to knock out the dep in qttools itself and
> anything that qttools depends on.
Good point. Please find below a complete diff. Only BUILD_DEPENDS
changes so no bump is necessary.
diff --git a/audio/musique/Makefile b/audio/musique/Makefile
index 7e63efc4c67..b4a0f67a711 100644
--- a/audio/musique/Makefile
+++ b/audio/musique/Makefile
@@ -17,8 +17,6 @@ EXTRACT_SUFX =.tar.bz2
MODULES = devel/qmake \
x11/qt6
-BUILD_DEPENDS =x11/qt6/qttools
-
LIB_DEPENDS = audio/taglib \
multimedia/mpv \
x11/qt6/qtdeclarative
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 00766a9adf5..bfa38cacf86 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -20,7 +20,6 @@ WANTLIB += Qt6Widgets c fluidsynth m
MODULES = x11/qt6 \
devel/cmake
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += audio/fluidsynth>=2.3.2 \
x11/qt6/qtsvg
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 0ce5b519583..de63df90f95 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -24,7 +24,6 @@ MODULES = devel/cmake \
BUILD_DEPENDS =audio/jack \
devel/sdl2 \
- x11/qt6/qttools \
x11/qt6/qtwebsockets
RUN_DEPENDS = audio/jack \
diff --git a/net/qbittorrent/Makefile.inc b/net/qbittorrent/Makefile.inc
index 67b3097f932..b26ebf2532e 100644
--- a/net/qbittorrent/Makefile.inc
+++ b/net/qbittorrent/Makefile.inc
@@ -20,8 +20,7 @@ SITES ?= ${SITE_SOURCEFORGE:=qbittorrent/}
MODULES += devel/cmake \
x11/qt6
-BUILD_DEPENDS += devel/boost \
- x11/qt6/qttools
+BUILD_DEPENDS += devel/boost
LIB_DEPENDS += net/libtorrent-rasterbar>=2
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index b2b5f3ff3dd..d1996e02adc 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -84,7 +84,6 @@ CONFIGURE_ARGS += -DENABLE_GTK=OFF
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt6
# XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
-BUILD_DEPENDS += x11/qt6/qttools
CONFIGURE_ARGS += -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
.else
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index ffb31fbb344..366ec190800 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -71,8 +71,7 @@ BUILD_DEPENDS += devel/bison \
textproc/libxml \
textproc/libxslt \
devel/xdg-utils \
- textproc/asciidoctor \
- x11/qt6/qttools
+ textproc/asciidoctor
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils \
misc/shared-mime-info \
diff --git a/productivity/novprog/Makefile b/productivity/novprog/Makefile
index b6a94476ac3..c1f818ed671 100644
--- a/productivity/novprog/Makefile
+++ b/productivity/novprog/Makefile
@@ -22,8 +22,6 @@ SITES = https://gottcode.org/novprog/
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS =x11/qt6/qttools
-
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
diff --git a/security/qdigidoc4/Makefile b/security/qdigidoc4/Makefile
index 8283d35061b..fb21e531b12 100644
--- a/security/qdigidoc4/Makefile
+++ b/security/qdigidoc4/Makefile
@@ -38,8 +38,7 @@ WANTLIB +=c crypto digidocpp flatbuffers lber
ldap m pcsclite ssl z
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS =devel/gettext,-tools \
- x11/qt6/qttools
+BUILD_DEPENDS =devel/gettext,-tools
LIB_DEPENDS = devel/flatbuffers \
databases/openldap,-main \
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index d20b6feffdf..790f30b6752 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -34,7 +34,6 @@ FULLPKGNAME = qtkeychain-qt6-${GH_TAGNAME}
MODULES += lang/clang x11/qt6
MODCLANG_LANGS += c++
WANTLIB += Qt6Core Qt6DBus
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += ${MODCLANG_LIB_DEPENDS}
LIBNAME = Qt6Keychain
QT = qt6
diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
index 52d87835a61..ccac3132ae0 100644
---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 01:38:53 Modified files: devel/cmake: Makefile distinfo devel/cmake/patches: patch-Source_cmGlobalGenerator_cxx patch-Source_cmQtAutoGenInitializer_cxx Log message: Update cmake-3.28.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 01:06:58 Modified files: devel/kf5/baloo: Makefile devel/kf5/baloo/pkg: PLIST devel/kf5/kglobalaccel: Makefile devel/kf5/kglobalaccel/pkg: PLIST devel/kf5/kguiaddons: Makefile devel/kf5/kguiaddons/pkg: PLIST devel/kf5/kiconthemes: Makefile devel/kf5/kio : Makefile devel/kf5/kio/pkg: PLIST devel/kf5/kirigami2: Makefile devel/kf5/kwallet: Makefile devel/kf5/kwallet/pkg: PLIST devel/kf5/plasma-framework: Makefile devel/kf5/plasma-framework/pkg: PLIST Log message: Coinstallability changes - kguiaddons: -DBUILD_GEO_SCHEME_HANDLER=OFF - baloo: -DBUILD_INDEXER_SERVICE=OFF - kglobalaccel: -DKF6_COMPAT_BUILD=ON - kwallet: -DBUILD_KWALLETD=OFF and -DBUILD_KWALLET_QUERY=OFF - kio: -DKF6_COMPAT_BUILD=ON - plasma-framework: -DBUILD_DESKTOPTHEMES=OFF (now releases with Plasma6) As described here (Coinstallability) https://community.kde.org/Frameworks/6.0_Release_notes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 00:57:28 Modified files: security : Makefile Log message: +qca-qt6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 00:57:02 Log message: Import qca-qt6-2.3.8 Comment: Qt Cryptographic Architecture Description: QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions. QCA separates the API from the implementation, using plugins known as Providers. Maintainer: Rafael Sadowski WWW: https://userbase.kde.org/QCA OK landry@ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20240323 N ports/security/qca-qt6/Makefile N ports/security/qca-qt6/distinfo N ports/security/qca-qt6/patches/patch-plugins_qca-ossl_qca-ossl_cpp N ports/security/qca-qt6/patches/patch-unittest_CMakeLists_txt N ports/security/qca-qt6/pkg/DESCR N ports/security/qca-qt6/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 00:54:27 Modified files: x11/qt5: qt5.port.mk x11/qt6: qt6.port.mk Log message: Make _MODQT6_SETUP and _MODQT5_SETUP optional Enabled by default so that the behavior does not change.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 00:51:45 Modified files: security/keepassxc: Makefile distinfo Log message: Update keepassxc to 2.7.7 - Enabled PassKeys in the browser flavor. - CL: https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.7 OK kn @
Re: NEW: security/qca-qt6
On Thu Mar 14, 2024 at 09:10:41PM +0100, Rafael Sadowski via ports wrote: > 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. > ping
Re: NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
ping ;) On Thu Mar 14, 2024 at 09:43:20PM +0100, Rafael Sadowski via ports wrote: > 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.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: fix graphics/inkscape with new poppler
On Sun Mar 17, 2024 at 10:33:02PM +0100, Matthias Kilian wrote:
> Hi,
>
> this fixes inkscape with poppler-24.03.0. Tested on amd64 by importing
> some PDFs with inkscape.
>
> ok?
There is no sadowski@, OK to fix inkscape with poppler-24.03.
OK rsadowski
>
> Ciao,
> Kil
>
> Index: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
> ===
> RCS file: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
> diff -N patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 17 Mar
> 2024 19:39:49 -
> @@ -0,0 +1,38 @@
> +Fix build with poppler-24.03.
> +
> +From https://gitlab.com/inkscape/inkscape/-/merge_requests/6209/diffs
> +(without any preprocessor conditionals)
> +
> +Index: src/extension/internal/pdfinput/svg-builder.cpp
> +--- src/extension/internal/pdfinput/svg-builder.cpp.orig
> src/extension/internal/pdfinput/svg-builder.cpp
> +@@ -1158,9 +1158,9 @@ static bool svgGetShadingColor(GfxShading *shading, do
> + #define INT_EPSILON 8
> + bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient,
> GfxShading *shading,
> +_POPPLER_CONST Function *func) {
> +-int type = func->getType();
> ++auto type = func->getType();
> + auto space = shading->getColorSpace();
> +-if ( type == 0 || type == 2 ) { // Sampled or exponential function
> ++if ( type == Function::Type::Sampled || type ==
> Function::Type::Exponential ) { // Sampled or exponential function
> + GfxColor stop1, stop2;
> + if (!svgGetShadingColor(shading, 0.0, ) ||
> !svgGetShadingColor(shading, 1.0, )) {
> + return false;
> +@@ -1168,7 +1168,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
> + _addStopToGradient(gradient, 0.0, , space, 1.0);
> + _addStopToGradient(gradient, 1.0, , space, 1.0);
> + }
> +-} else if ( type == 3 ) { // Stitching
> ++} else if ( type == Function::Type::Stitching ) { // Stitching
> + auto stitchingFunc = static_cast<_POPPLER_CONST
> StitchingFunction*>(func);
> + const double *bounds = stitchingFunc->getBounds();
> + const double *encode = stitchingFunc->getEncode();
> +@@ -1183,7 +1183,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
> + for ( int i = 0 ; i < num_funcs ; i++ ) {
> + svgGetShadingColor(shading, bounds[i + 1], );
> + // Add stops
> +-if (stitchingFunc->getFunc(i)->getType() == 2) {// process
> exponential fxn
> ++if (stitchingFunc->getFunc(i)->getType() ==
> Function::Type::Exponential) {// process exponential fxn
> + double expE = (static_cast<_POPPLER_CONST
> ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
> + if (expE > 1.0) {
> + expE = (bounds[i + 1] - bounds[i])/expE;//
> approximate exponential as a single straight line at x=1
UPDATE: security/keepassxc
Tested with yubkikey. What I have to realize is that opening the
database takes much longer.
I also enabled PassKeys in the browser flavor. I have no use-case for it
now.
Feedback, tests and OKs welcome,
Rafael
diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index b17c1c62af7..2db64afee2b 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -1,6 +1,6 @@
COMMENT = management tool for password and sensitive data
-V =2.7.6
+V =2.7.7
DISTNAME = keepassxc-${V}
CATEGORIES = security
@@ -64,7 +64,8 @@ CONFIGURE_ARGS += -DWITH_XC_YUBIKEY=ON
# Sync with archs that ship Firefox and/or Chromium
ONLY_FOR_ARCHS = amd64 i386 aarch64
CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON \
- -DWITH_XC_NETWORKING=ON
+ -DWITH_XC_NETWORKING=ON \
+ -DWITH_XC_BROWSER_PASSKEYS=ON
# helper executable
ALL_TARGET += keepassxc-proxy
.endif
diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
index fcaa4819cf4..5dcb6c71904 100644
--- a/security/keepassxc/distinfo
+++ b/security/keepassxc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keepassxc-2.7.6-src.tar.xz) =
pYB0UJ+o6Q8VLGJH9z514SYwMIH1Xu206gy7b6mA1nA=
-SIZE (keepassxc-2.7.6-src.tar.xz) = 8474624
+SHA256 (keepassxc-2.7.7-src.tar.xz) =
WPxFrpjks/+wUhAwFPW5ekH+/RcQLH9WBzk03TqC7mc=
+SIZE (keepassxc-2.7.7-src.tar.xz) = 9734460
Re: [update] x2goclient 4.1.2.3
On Sun Mar 17, 2024 at 03:32:15PM +0100, Landry Breuil wrote:
> Hi,
>
> previous release was a bit dated so update to latest, changelog at
> https://www.mail-archive.com/x2go-announcements@lists.x2go.org/msg00218.html
>
> seems to work fine in basic testing
Missing RUN_DEPENDS+=misc/shared-mime-info otherwise OK rsadowski
>
> Landry
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/x2goclient/Makefile,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile
> --- Makefile 27 Sep 2023 20:37:29 - 1.18
> +++ Makefile 17 Mar 2024 14:30:20 -
> @@ -1,7 +1,6 @@
> COMMENT =Qt client for the X2Go system
>
> -DISTNAME = x2goclient-4.1.2.2
> -REVISION = 1
> +DISTNAME = x2goclient-4.1.2.3
>
> CATEGORIES = x11
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/x2goclient/distinfo,v
> retrieving revision 1.6
> diff -u -r1.6 distinfo
> --- distinfo 19 Mar 2020 19:51:09 - 1.6
> +++ distinfo 17 Mar 2024 14:30:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (x2goclient-4.1.2.2.tar.gz) =
> yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=
> -SIZE (x2goclient-4.1.2.2.tar.gz) = 2576404
> +SHA256 (x2goclient-4.1.2.3.tar.gz) =
> q4uzx40xYlx0nkLxX4EP49JCknoVKYMIwT3qO5Fayjw=
> +SIZE (x2goclient-4.1.2.3.tar.gz) = 2582072
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/x11/x2goclient/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 patch-Makefile
> --- patches/patch-Makefile11 Mar 2022 20:17:40 - 1.2
> +++ patches/patch-Makefile17 Mar 2024 14:30:20 -
> @@ -1,20 +1,42 @@
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -19,9 +19,9 @@ PREFIX=/usr/local
> - ETCDIR=/etc/x2go
> - BINDIR=$(PREFIX)/bin
> - SHAREDIR=$(PREFIX)/share
> --MANDIR=$(SHAREDIR)/man
> --QMAKE_BINARY=qmake-qt4
> --LRELEASE_BINARY=lrelease-qt4
> -+MANDIR=$(PREFIX)/man
> -+QMAKE_BINARY=qmake-qt5
> -+LRELEASE_BINARY=lrelease-qt5
> - QMAKE_OPTS=
> +@@ -21,20 +21,11 @@ RM_DIR ?= rmdir -p --ignore-fail-on-non-empty
> + DESTDIR ?=
> + PREFIX ?= /usr/local
> + ETCDIR ?= /etc/x2go
> +-BINDIR ?= $(PREFIX)/bin
> +-SHAREDIR ?= $(PREFIX)/share
> +-MANDIR ?= $(SHAREDIR)/man
> +-ifeq ($(QT_VERSION),4)
> +- QMAKE_BINARY ?= qmake-qt4
> +- LRELEASE_BINARY ?= lrelease-qt4
> +-else
> +- ifeq ($(QT_VERSION),5)
> +-QMAKE_BINARY ?= qmake
> +-LRELEASE_BINARY ?= lrelease
> +- else
> +-$(error Unsupported Qt version "$(QT_VERSION)" passed.)
> +- endif
> +-endif
> ++BINDIR ?= /usr/local/bin
> ++SHAREDIR ?= /usr/local/share
> ++MANDIR ?= /usr/local/man
> ++QMAKE_BINARY ?= qmake-qt5
> ++LRELEASE_BINARY ?= lrelease-qt5
> + QMAKE_OPTS ?=
>
> - LDFLAGS=
> -@@ -115,7 +115,6 @@ install_man:
> + LDFLAGS ?=
> +@@ -71,7 +62,7 @@ MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_F
> + .MAKEOVERRIDES = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> +
> + # OpenBSD way.
> +-.MAKEFLAGS = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> ++#.MAKEFLAGS = SHELL QT_VERSION INSTALL_DIR INSTALL_FILE INSTALL_SYMLINK
> INSTALL_PROGRAM RM_FILE RM_DIR DESTDIR PREFIX ETCDIR BINDIR SHAREDIR MANDIR
> QMAKE_BINARY LRELEASE_BINARY QMAKE_OPTS LDFLAGS LIBS
> +
> +
> + all: build
> +@@ -130,7 +121,6 @@ install_man:
> $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
> $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
> $(INSTALL_FILE) man/man1/x2goclient.1
> $(DESTDIR)$(MANDIR)/man1/x2goclient.1
> Index: patches/patch-x2goclient_pro
> ===
> RCS file: /cvs/ports/x11/x2goclient/patches/patch-x2goclient_pro,v
> retrieving revision 1.7
> diff -u -r1.7 patch-x2goclient_pro
> --- patches/patch-x2goclient_pro 11 Mar 2022 20:17:40 - 1.7
> +++ patches/patch-x2goclient_pro 17 Mar 2024 14:30:20 -
> @@ -3,7 +3,7 @@
> Index: x2goclient.pro
> --- x2goclient.pro.orig
> +++ x2goclient.pro
> -@@ -165,7 +165,7 @@ else:win32 {
> +@@ -171,7 +171,7 @@ else:win32 {
> }
> else {
> # For backwards-compatibility.
> @@ -11,8 +11,8 @@
> + LIBS += -lssh
> }
>
> - win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
> -@@ -203,7 +203,7 @@ else:message("No translation files in project")
> + win32:!mxe {
> +@@ -211,7 +211,7 @@ else:message("No translation files in project")
>
> TEMPLATE = app
> DEPENDPATH += .
> @@ -21,14 +21,23 @@
> RESOURCES += res/resources.qrc
>
> exists(res/txt/git-info) {
> -@@ -220,6 +220,10 @@ linux|linux-* {
> - message("building $$TARGET via $$QMAKESPEC with ldap and cups")
> +@@ -229,6 +229,10 @@ linux|linux-* {
>
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 @@
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/08 05:53:43 Modified files: x11/qt5/qtwebengine: Makefile Log message: Set USE_NOBTCFI to yes again and unbreak konqueror on IBT supported CPUs Even if boringssl and FFmpeg are patched and working. The old V8 still needs the #4637222 backport that fits on a much newer version but not on that old one That will still take some time. #4637222: https://chromium-review.googlesource.com/c/v8/v8/+/4637222
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/05 21:48:39 Modified files: x11/qt5/qtwebengine: Makefile x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl Log message: Fix some _CET_ENDBR defines in boringssl With help and OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/05 01:48:59 Modified files: x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_third_party_dav1d_BUILD_gn Log message: Unbreak i368 "Only X64 MSAN is supported" so enable this only on x64 cpus Spotted by sthen@
Re: multimedia/phonon: qt5 flavor and qt6 as default
On Sun Mar 03, 2024 at 06:00:44PM +0100, Landry Breuil wrote: > Le Sat, Mar 02, 2024 at 09:07:49PM +0100, Rafael Sadowski a écrit : > > On Sat Mar 02, 2024 at 09:44:11AM +0100, Landry Breuil wrote: > > > Le Sat, Mar 02, 2024 at 09:21:59AM +0100, Rafael Sadowski a écrit : > > > > On Fri Mar 01, 2024 at 05:59:00PM +0100, Rafael Sadowski wrote: > > > > > Based on landry@'s feedback, I think it makes sense to follow the > > > > > qt6/qt5 pattern of x11/polkit-qt here. > > > > > > > > > > I need to do a proper test with all consumers but phonon-4.12.0 > > > > > updates > > > > > to phonon-qt5-4.12.0p0 correct. > > > > > > > > > > I would be very grateful for a review! > > > > > > > > > > Rafael > > > > > > > > > > > > > $ pkg_delete -X > > > > $ pkg_add -D snap khtml > > > > $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D > > > > unsigned > > > > quirks-7.10->7.12: ok > > > > gettext-runtime-0.22.4->0.22.5: ok > > > > giflib-5.2.1p0->5.2.2: ok > > > > phonon-4.12.0->phonon-qt5-4.12.0p0 forward dependencies: > > > > | Dependency of khtml-5.115.0 on phonon-* doesn't match > > > > Merging khtml-5.115.0->5.115.0p0 (ok) > > > > khtml-5.115.0+phonon-4.12.0->khtml-5.115.0p0+phonon-qt5-4.12.0p0: ok > > > > > > > > > > > > Does that looks good to you? Unfortunately we need > > > > devel/kf5/extra-cmake-modules to build both the qt5 and the qt6 part. > > > > > > i havent fully followed, but your idea is to switch the port to default > > > to qt6, and add a qt5 flavor, which previous consumers depend upon ? > > > > Right, and as you can see above, it looks like it's working. > > > > > > > > i'd have been concerned about flavors for libs causing issues/conflicts > > > with bulk builds, but if that works for polkit-qt... > > > > > > > Me too and I'm too stupid for it, but the polkit-qt looks good and > > phonon can profit from the same pattern. > > > > I would like to have this in 7.5. > > i haven't tested your diff but are you sure the timing is right ? I think this is the point where I should say: No? :D We can wait until post-ports-lock. After every snapshot I have to update all the used depends again and again. > are you confident that won't create new dependency problems once ports > start depending on it ? Hm, for -current and 7.5 everything should be as it is now. New consumers are coming with the big bang KDE6 update. Why Big Bang, because a lot of addicts have to move to Qt6. See here, see gpgme, see qca-qt6 and many more :/ A ecosystem switch to Qt6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/03 04:20:53 Modified files: x11/qt6: Makefile.inc x11/qt6/qtbase : Makefile Log message: Fix link path
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/03 04:15:26 Modified files: x11/qt6: Makefile.inc x11/qt6/qtbase : Makefile x11/qt6/qtbase/pkg: PLIST-main Log message: Install moc-qt6,rcc-qt6,uic-qt6 to bin Spotted by jca@
Re: x11/gnustep/libobjc2 failed to build
On Sun Mar 03, 2024 at 08:14:41AM +0100, Antoine Jacoutot wrote: > > >>> Building on exopi-5 under x11/gnustep/libobjc2 > BDEPENDS = [devel/cmake;devel/robin-map;devel/ninja] > DIST = [x11/gnustep/libobjc2:gnustep/libobjc2-2.2.tar.gz] > FULLPKGNAME = gnustep-libobjc2-2.2p0 > (Junk lock obtained for exopi-5 at 1709393315.42) > >>> Running depends in x11/gnustep/libobjc2 at 1709393315.45 >last junk was in net/miniupnp/libnatpmp > /usr/sbin/pkg_add -aI -Drepair cmake-3.28.3v0 ninja-1.11.1 robin-map-1.2.1 > was: /usr/sbin/pkg_add -aI -Drepair cmake-3.28.3v0 ninja-1.11.1 > robin-map-1.2.1 > /usr/sbin/pkg_add -aI -Drepair cmake-3.28.3v0 ninja-1.11.1 robin-map-1.2.1 > >>> Running show-prepare-results in x11/gnustep/libobjc2 at 1709393318.75 > ===> x11/gnustep/libobjc2 > ===> Building from scratch gnustep-libobjc2-2.2p0 > ===> gnustep-libobjc2-2.2p0 depends on: robin-map-* -> robin-map-1.2.1 > ===> gnustep-libobjc2-2.2p0 depends on: cmake-* -> cmake-3.28.3v0 > ===> gnustep-libobjc2-2.2p0 depends on: ninja-* -> ninja-1.11.1 > ===> Verifying specs: c++ c++abi pthread m > ===> found c++.10.0 c++abi.7.0 pthread.27.1 m.10.1 > cmake-3.28.3v0 > ninja-1.11.1 > robin-map-1.2.1 > (Junk lock released for exopi-5 at 1709393320.71) > distfiles size=203442 > >>> Running build in x11/gnustep/libobjc2 at 1709393320.74 > ===> x11/gnustep/libobjc2 > ===> Checking files for gnustep-libobjc2-2.2p0 > `/exopi-cvs/ports/distfiles/gnustep/libobjc2-2.2.tar.gz' is up to date. > >> (SHA256) gnustep/libobjc2-2.2.tar.gz: OK > ===> Extracting for gnustep-libobjc2-2.2p0 > ===> Patching for gnustep-libobjc2-2.2p0 > ===> Compiler link: clang -> /usr/bin/clang > ===> Compiler link: clang++ -> /usr/bin/clang++ > ===> Compiler link: cc -> /usr/bin/cc > ===> Compiler link: c++ -> /usr/bin/c++ > ===> Generating configure for gnustep-libobjc2-2.2p0 > ===> Configuring for gnustep-libobjc2-2.2p0 > -- The C compiler identification is Clang 16.0.6 > -- The ASM compiler identification is Clang with GNU-like command-line > -- Found assembler: /exopi-obj/pobj/gnustep-libobjc2-2.2/bin/cc > -- The CXX compiler identification is Clang 16.0.6 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /exopi-obj/pobj/gnustep-libobjc2-2.2/bin/cc > - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: > /exopi-obj/pobj/gnustep-libobjc2-2.2/bin/c++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- The OBJC compiler identification is Clang 16.0.6 > -- The OBJCXX compiler identification is Clang 16.0.6 > -- Detecting OBJC compiler ABI info > -- Detecting OBJC compiler ABI info - done > -- Check for working OBJC compiler: > /exopi-obj/pobj/gnustep-libobjc2-2.2/bin/cc - skipped > -- Detecting OBJCXX compiler ABI info > -- Detecting OBJCXX compiler ABI info - done > -- Check for working OBJCXX compiler: > /exopi-obj/pobj/gnustep-libobjc2-2.2/bin/c++ - skipped > -- Architecture: x86_64 > -- Could NOT find Git (missing: GIT_EXECUTABLE) > -- Could NOT find Git (missing: GIT_EXECUTABLE) (found version "") > CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2910 > (message): > error: could not find git for clone of robinmap-populate > Call Stack (most recent call first): > /usr/local/share/cmake/Modules/ExternalProject.cmake:4418 > (_ep_add_download_command) > CMakeLists.txt:29 (ExternalProject_Add) if (NOT tsl-robin-map_FOUND) FetchContent_Declare( robinmap GIT_REPOSITORY https://github.com/Tessil/robin-map/ GIT_TAGv1.2.1) FetchContent_MakeAvailable(robinmap) endif() Looks like libobjc2 needs tsl-robin-map (devel/robin-map) as dependency. > > > -- Configuring incomplete, errors occurred! > > CMake Error at /usr/local/share/cmake/Modules/FetchContent.cmake:1667 > (message): > CMake step for robinmap failed: 1 > Call Stack (most recent call first): > /usr/local/share/cmake/Modules/FetchContent.cmake:1819:EVAL:2 > (__FetchContent_directPopulate) > /usr/local/share/cmake/Modules/FetchContent.cmake:1819 (cmake_language) > /usr/local/share/cmake/Modules/FetchContent.cmake:2033 > (FetchContent_Populate) > CMakeLists.txt:135 (FetchContent_MakeAvailable) > > > -- Configuring incomplete, errors occurred! > *** Error 1 in x11/gnustep/libobjc2 > (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3022 'do-configure': @cd > /exopi-obj/pobj/gnustep-libobjc...) > *** Error 2 in x11/gnustep/libobjc2 > (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3042 > '/exopi-obj/pobj/gnustep-libobjc2-2.2/build-amd64/.configure_done') > *** Error 2 in x11/gnustep/libobjc2 > (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2704 'build': > @lock=gnustep-libobjc2-2.2p0; export _LOC...) > ===> Exiting
Re: new x11/kde-applications/plasmatube
On Sat Mar 02, 2024 at 05:24:10PM +, Klemens Nanni wrote: > Works great for me, tested agains a couple public instances. > More features than www/minitube and overall a different interface. > > Feedback? OK? Thanks for making KDE Gear more complete. Two tweaks: - Remove devel/kf5/extra-cmake-modules from BUILD_DEPENDS it's the default in devel/kf5. - Please add x11/qt5/qtdeclarative to lib depends I know it comes with x11/qt5/qtquickcontrols2 but I prefer an explicit complete LIB_DEPENDS list. > See https://docs.invidious.io/ for more information. Please remove this line from DESCR. With this changes, ok rsadowski.
Re: multimedia/phonon: qt5 flavor and qt6 as default
On Sat Mar 02, 2024 at 09:44:11AM +0100, Landry Breuil wrote: > Le Sat, Mar 02, 2024 at 09:21:59AM +0100, Rafael Sadowski a écrit : > > On Fri Mar 01, 2024 at 05:59:00PM +0100, Rafael Sadowski wrote: > > > Based on landry@'s feedback, I think it makes sense to follow the > > > qt6/qt5 pattern of x11/polkit-qt here. > > > > > > I need to do a proper test with all consumers but phonon-4.12.0 updates > > > to phonon-qt5-4.12.0p0 correct. > > > > > > I would be very grateful for a review! > > > > > > Rafael > > > > > > > $ pkg_delete -X > > $ pkg_add -D snap khtml > > $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D unsigned > > quirks-7.10->7.12: ok > > gettext-runtime-0.22.4->0.22.5: ok > > giflib-5.2.1p0->5.2.2: ok > > phonon-4.12.0->phonon-qt5-4.12.0p0 forward dependencies: > > | Dependency of khtml-5.115.0 on phonon-* doesn't match > > Merging khtml-5.115.0->5.115.0p0 (ok) > > khtml-5.115.0+phonon-4.12.0->khtml-5.115.0p0+phonon-qt5-4.12.0p0: ok > > > > > > Does that looks good to you? Unfortunately we need > > devel/kf5/extra-cmake-modules to build both the qt5 and the qt6 part. > > i havent fully followed, but your idea is to switch the port to default > to qt6, and add a qt5 flavor, which previous consumers depend upon ? Right, and as you can see above, it looks like it's working. > > i'd have been concerned about flavors for libs causing issues/conflicts > with bulk builds, but if that works for polkit-qt... > Me too and I'm too stupid for it, but the polkit-qt looks good and phonon can profit from the same pattern. I would like to have this in 7.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/02 02:27:43 Modified files: meta/qt6 : Makefile Log message: Complete the Qt6 module list
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/02 02:13:52 Modified files: x11/qt6: Makefile Log message: +qtlocation
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/02 02:13:08 Log message: Import qtlocation 6.6.2, ok landry@ The Qt Location module helps you create mapping solutions using data available from popular location service providers, such as Open Street Map. The Qt Location API enables you to: - Access and present map data. - Support touch gesture on a specific area of the map. - Query for a specific geographical location and route. - Add additional layers on top, such as polylines and circles. - Search for places and related images. Status: Vendor Tag: rsadowski Release Tags: rsadowski_20240302 N ports/x11/qt6/qtlocation/Makefile N ports/x11/qt6/qtlocation/distinfo N ports/x11/qt6/qtlocation/pkg/DESCR N ports/x11/qt6/qtlocation/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/02 02:07:38 Modified files: x11/qt5/qtwebengine: Makefile x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl patch-src_buildtools_config_linking_pri Added files: x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256_beeu-x86_64-asm_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_perlasm_x86_64-xlate_pl patch-src_3rdparty_chromium_third_party_dav1d_BUILD_gn Removed files: x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_content_browser_tracing_BUILD_gn Log message: Add support for Indirect branch tracking (IBT) in Qt5WebEngine ...by merging the needed patches for boringssl. It based on robert's diff: https://github.com/openbsd/ports/commit/8485e4d8db4d9325cce4db61881648dfcfce5ef1
Re: multimedia/phonon: qt5 flavor and qt6 as default
On Fri Mar 01, 2024 at 05:59:00PM +0100, Rafael Sadowski wrote:
> Based on landry@'s feedback, I think it makes sense to follow the
> qt6/qt5 pattern of x11/polkit-qt here.
>
> I need to do a proper test with all consumers but phonon-4.12.0 updates
> to phonon-qt5-4.12.0p0 correct.
>
> I would be very grateful for a review!
>
> Rafael
>
$ pkg_delete -X
$ pkg_add -D snap khtml
$ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D unsigned
quirks-7.10->7.12: ok
gettext-runtime-0.22.4->0.22.5: ok
giflib-5.2.1p0->5.2.2: ok
phonon-4.12.0->phonon-qt5-4.12.0p0 forward dependencies:
| Dependency of khtml-5.115.0 on phonon-* doesn't match
Merging khtml-5.115.0->5.115.0p0 (ok)
khtml-5.115.0+phonon-4.12.0->khtml-5.115.0p0+phonon-qt5-4.12.0p0: ok
Does that looks good to you? Unfortunately we need
devel/kf5/extra-cmake-modules to build both the qt5 and the qt6 part.
You can find a new diff below:
diff --git a/devel/kf5/khtml/Makefile b/devel/kf5/khtml/Makefile
index ffcb0c8f6f4..149d183f2a6 100644
--- a/devel/kf5/khtml/Makefile
+++ b/devel/kf5/khtml/Makefile
@@ -1,5 +1,6 @@
COMMENT = original KDE HTML rendering engine
DISTNAME = khtml-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5KHtml6.0
@@ -35,7 +36,7 @@ LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
graphics/jpeg \
graphics/png \
x11/qt5/qtx11extras \
- multimedia/phonon
+ multimedia/phonon,qt5
IS_PORTING_AID = Yes
diff --git a/devel/kf5/knotifyconfig/Makefile b/devel/kf5/knotifyconfig/Makefile
index c99eec9d8d4..509a4dfee10 100644
--- a/devel/kf5/knotifyconfig/Makefile
+++ b/devel/kf5/knotifyconfig/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE configuration dialog for desktop notifications
DISTNAME = knotifyconfig-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5NotifyConfig 6.0
@@ -13,10 +14,10 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kconfigwidgets>=${MODKF5_VERSION} \
devel/kf5/knotifications>=${MODKF5_VERSION} \
devel/kf5/kxmlgui>=${MODKF5_VERSION} \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtspeech
-RUN_DEPENDS = multimedia/phonon \
+RUN_DEPENDS = multimedia/phonon,qt5 \
x11/qt5/qtspeech
LIB_DEPENDS = devel/kf5/kcompletion>=${MODKF5_VERSION} \
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index defccf287e7..7864f291d08 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.11
+PKGNAME = quirks-7.12
PKG_ARCH = *
MAINTAINER = Marc Espie
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 5ce5405cada..9eef5fe2caa 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -812,6 +812,7 @@ my $stem_extensions = {
'unison' => 'unison-gui',
'sendxmpp' => 'go-sendxmpp',
'libreddit' => 'redlib',
+ 'phonon' => 'phonon-qt5',
};
my $obsolete_reason = {};
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 740ef2927be..60b53291a2c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
-REVISION = 11
+REVISION = 12
SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
@@ -113,7 +113,7 @@ LIB_DEPENDS = converters/libiconv \
graphics/kdiagram \
graphics/lcms2 \
math/imath \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
print/poppler,-qt5 \
security/qca-qt5 \
x11/kde-applications/okular \
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 8c5325e795e..69d0ceb9f31 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -3,7 +3,7 @@ COMMENT = user-friendly TeX/LaTeX editor for KDE
CATEGORIES = editors
DISTNAME = kile-2.9.93
-REVISION = 6
+REVISION = 7
HOMEPAGE = https://kile.sourceforge.io
@@ -31,7 +31,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kinit \
x11/kde-applications/kate \
x11/kde-applications/okular \
- multimedia/phonon
+ multimedia/phonon,qt5
RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kdoctools \
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..e709259ca35 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,14 +1,19 @@
-COMMENT = multimedia layer for Qt5/KDE5
+COMMENT =
multimedia/phonon: qt5 flavor and qt6 as default
Based on landry@'s feedback, I think it makes sense to follow the
qt6/qt5 pattern of x11/polkit-qt here.
I need to do a proper test with all consumers but phonon-4.12.0 updates
to phonon-qt5-4.12.0p0 correct.
I would be very grateful for a review!
Rafael
diff --git a/devel/kf5/khtml/Makefile b/devel/kf5/khtml/Makefile
index ffcb0c8f6f4..149d183f2a6 100644
--- a/devel/kf5/khtml/Makefile
+++ b/devel/kf5/khtml/Makefile
@@ -1,5 +1,6 @@
COMMENT = original KDE HTML rendering engine
DISTNAME = khtml-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5KHtml6.0
@@ -35,7 +36,7 @@ LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
graphics/jpeg \
graphics/png \
x11/qt5/qtx11extras \
- multimedia/phonon
+ multimedia/phonon,qt5
IS_PORTING_AID = Yes
diff --git a/devel/kf5/knotifyconfig/Makefile b/devel/kf5/knotifyconfig/Makefile
index c99eec9d8d4..509a4dfee10 100644
--- a/devel/kf5/knotifyconfig/Makefile
+++ b/devel/kf5/knotifyconfig/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE configuration dialog for desktop notifications
DISTNAME = knotifyconfig-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5NotifyConfig 6.0
@@ -13,10 +14,10 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kconfigwidgets>=${MODKF5_VERSION} \
devel/kf5/knotifications>=${MODKF5_VERSION} \
devel/kf5/kxmlgui>=${MODKF5_VERSION} \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtspeech
-RUN_DEPENDS = multimedia/phonon \
+RUN_DEPENDS = multimedia/phonon,qt5 \
x11/qt5/qtspeech
LIB_DEPENDS = devel/kf5/kcompletion>=${MODKF5_VERSION} \
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index defccf287e7..7864f291d08 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.11
+PKGNAME = quirks-7.12
PKG_ARCH = *
MAINTAINER = Marc Espie
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 5ce5405cada..9eef5fe2caa 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -812,6 +812,7 @@ my $stem_extensions = {
'unison' => 'unison-gui',
'sendxmpp' => 'go-sendxmpp',
'libreddit' => 'redlib',
+ 'phonon' => 'phonon-qt5',
};
my $obsolete_reason = {};
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 740ef2927be..60b53291a2c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
-REVISION = 11
+REVISION = 12
SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
@@ -113,7 +113,7 @@ LIB_DEPENDS = converters/libiconv \
graphics/kdiagram \
graphics/lcms2 \
math/imath \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
print/poppler,-qt5 \
security/qca-qt5 \
x11/kde-applications/okular \
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 8c5325e795e..69d0ceb9f31 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -3,7 +3,7 @@ COMMENT = user-friendly TeX/LaTeX editor for KDE
CATEGORIES = editors
DISTNAME = kile-2.9.93
-REVISION = 6
+REVISION = 7
HOMEPAGE = https://kile.sourceforge.io
@@ -31,7 +31,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kinit \
x11/kde-applications/kate \
x11/kde-applications/okular \
- multimedia/phonon
+ multimedia/phonon,qt5
RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kdoctools \
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..01912f2e7bc 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,14 +1,19 @@
-COMMENT = multimedia layer for Qt5/KDE5
+COMMENT = multimedia layer for Qt
CATEGORIES = multimedia devel
-VERSION = 4.12.0
-DISTNAME = phonon-${VERSION}
+V =4.12.0
+REVISION = 0
+DISTNAME = phonon-${V}
+PKGNAME = phonon-qt5-${V}
# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 4.0
-SHARED_LIBS += phonon4qt5experimental 4.0
+SHARED_LIBS += phonon4qt54.0
+SHARED_LIBS += phonon4qt5experimental4.0
+
+SHARED_LIBS += phonon4qt60.0 # 0.0
+SHARED_LIBS += phonon4qt6experimental0.0 # 0.0
HOMEPAGE = https://community.kde.org/Phonon
@@ -17,25 +22,37 @@ MAINTAIN
Re: NEW: security/qca-qt6
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. - lazy rsadowski Rafael
Enable Qt6 in multimedia/phonon
_MESSAGES/phonon_vlc_qt.qm
+share/locale/nds/
+share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nn/
+share/locale/nn/LC_MESSAGES/
share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ro/
+share/locale/ro/LC_MESSAGES/
share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sk/
+share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@latin/
+share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tg/
+share/locale/tg/LC_MESSAGES/
share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ug/
+share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/vi/
+share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..023f9b1c8c3 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -4,11 +4,18 @@ CATEGORIES = multimedia devel
VERSION = 4.12.0
DISTNAME = phonon-${VERSION}
+REVISION = 0
# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 4.0
-SHARED_LIBS += phonon4qt5experimental 4.0
+SHARED_LIBS += phonon4qt54.0
+SHARED_LIBS += phonon4qt5experimental4.0
+
+SHARED_LIBS += phonon4qt60.0 # 0.0
+SHARED_LIBS += phonon4qt6experimental0.0 # 0.0
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets Qt6Core
+WANTLIB += Qt6Core5Compat Qt6Gui Qt6Widgets c m pulse pulse-mainloop-glib
HOMEPAGE = https://community.kde.org/Phonon
@@ -17,25 +24,21 @@ MAINTAINER = Rafael Sadowski
# LGPL v2.1
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m pulse
-WANTLIB += pulse-mainloop-glib
CXXFLAGS_base-clang = -Wno-error=enum-constexpr-conversion
SITES =${SITE_KDE:=stable/phonon/${VERSION}/}
+EXTRACT_SUFX = .tar.xz
-MODULES = devel/kf5
-
-LIB_DEPENDS = audio/pulseaudio
-
-BUILD_DEPENDS =x11/qt5/qtdeclarative
+MODULES = x11/qt5 x11/qt6 devel/cmake
-RUN_DEPENDS = x11/qt5/qtdeclarative
+LIB_DEPENDS = audio/pulseaudio \
+ x11/qt6/qt5compat
# Clashes with the one provided by Qt itself.
CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+BUILD_DEPENDS =x11/qt5/qtdeclarative \
+ x11/qt6/qtdeclarative
-# Qt5 only port
-CONFIGURE_ARGS += -DPHONON_BUILD_QT6=OFF
.include
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index cc2ea3f18e9..b4da250c943 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -167,6 +167,124 @@ include/phonon4qt5/phonon/videowidgetinterface.h
include/phonon4qt5/phonon/volumefadereffect.h
include/phonon4qt5/phonon/volumefaderinterface.h
include/phonon4qt5/phonon/volumeslider.h
+include/phonon4qt6/
+include/phonon4qt6/phonon/
+include/phonon4qt6/phonon/AbstractAudioOutput
+include/phonon4qt6/phonon/AbstractMediaStream
+include/phonon4qt6/phonon/AbstractVideoOutput
+include/phonon4qt6/phonon/AddonInterface
+include/phonon4qt6/phonon/AudioCaptureDevice
+include/phonon4qt6/phonon/AudioCaptureDeviceModel
+include/phonon4qt6/phonon/AudioChannelDescription
+include/phonon4qt6/phonon/AudioChannelDescrip
NEW: security/qca-qt6
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. Comment: Qt Cryptographic Architecture Description: QCA aims to provide a straightforward and cross-platform crypto API, using Qt datatypes and conventions. QCA separates the API from the implementation, using plugins known as Providers. Maintainer: Rafael Sadowski WWW: https://userbase.kde.org/QCA qca-qt6.tar.gz Description: application/tar-gz
NEW: x11/qt6/qtlocation
OK to import qt6-qtlocation-6.6.1? Comment: Geo positioning APIs Required by: debug-qt6-qtlocation-6.6.1 Description: QtPositioning provides positioning information via QML and C++ interfaces. QtLocation Provides C++ interfaces to retrieve location and navigational information. The C++ API provides access to geocoding and navigation information, and also place search. Use the Maps and Navigation QML API to render this information on an interactive map that supports touch gestures, overlays, and so on. Maintainer: Rafael Sadowski WWW: https://www.qt.io/ qtlocation.tar.gz Description: application/tar-gz
x11/qt5/qtwebengine: add support for IBT by merging the needed patches for boringssl
Here is a diff to add support for Indirect branch tracking (IBT) by
merging the needed patches for boringssl. It based on robert's diff:
https://github.com/openbsd/ports/commit/8485e4d8db4d9325cce4db61881648dfcfce5ef1
I tested with konqueror and 12th Gen Intel i7-1260P. Test cases: youtube and
HTTPS.
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: 12th Gen Intel(R) Core(TM) i7-1260P, 1995.54 MHz, 06-9a-03, patch 0432
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,PT,SHA,UMIP,PKU,WAITPKG,PKS,MD_CLEAR,IBT,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,IBRS_ALL,SKIP_L1DFL,MDS_NO,IF_PSCHANGE,TAA_NO,MISC_PKG_CT,ENERGY_FILT,DOITM,SBDR_SSDP_N,FBSDP_NO,PSDP_NO,RRSBA,OVERCLOCK,GDS_NO,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu0: 48KB 64b/line 12-way D-cache, 32KB 64b/line 8-way I-cache, 1MB 64b/line
10-way L2 cache, 18MB 64b/line 12-way L3 cache
cpu0: smt 0, core 0, package 0
cpu0: apic clock running at 38MHz
cpu0: mwait min=64, max=64, C-substates=0.2.0.2.0.1.0.1, IBE
acpicpu0 at acpi0: C3(200@1048 mwait.1@0x60), C2(350@127 mwait.1@0x21),
C1(1000@1 mwait.1), PSS
cpu0: Enhanced SpeedStep 1995 MHz: speeds: 2501, 2500, 2300, 2100, 2000, 1900,
1600, 1500, 1400, 1300, 1100, 1000, 800, 700, 500, 400 MHz
Here are a few more changes:
The patch-src_buildtools_config_linking_pri patch was a stupid leftover
for the upgrade process.
+QMAKE_LFLAGS += -Wl,-z,nobtcfi
+QMAKE_LFLAGS += -Wl,-z,wxneeded
This had no effect. (pre check if macos|ios)
I also removed "content/browser/tracing/BUILD.gn" by pre-configure
instead of a patch to avoid an annoying "update-patches" massages.
Feedback, OK?
diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile
index 266270f3d81..694d5c569a9 100644
--- a/x11/qt5/qtwebengine/Makefile
+++ b/x11/qt5/qtwebengine/Makefile
@@ -4,12 +4,11 @@
# Patched with security patches up to: 119.0.6045.123
USE_WXNEEDED = Yes
-USE_NOBTCFI = Yes
QT5NAME = QtWebEngine
KDE_COMMIT = 224806a7022eed6d5c75b486bec8715a618cb314
KDE_VERSION = 5
-REVISION = 0
+REVISION = 1
# Override
VERSION = ${QT5_WEBENGINE_VERSION}
@@ -130,6 +129,8 @@ pre-configure:
@cp ${FILESDIR}/openbsd.pri ${WRKDIST}/src/core/config/openbsd.pri
@mkdir -p ${CHROMESRC}/third_party/node/openbsd/node-openbsd/bin
@ln -sf ${TRUEPREFIX}/bin/node
${CHROMESRC}/third_party/node/openbsd/node-openbsd/bin/node
+ # build with python3 (remove catapult)
+ @rm ${CHROMESRC}/content/browser/tracing/BUILD.gn
# Regenerate build and perlasm files (force json to not overwrite our
local gn patches)
@cd ${CHROMESRC}/third_party/boringssl && ${MODPY_BIN}
src/util/generate_build_files.py json
@cd ${WRKSRC} && env -i ${MAKE_ENV}
${CHROMESRC}/build/linux/unbundle/replace_gn_files.py \
diff --git
a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn
b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn
index eeb43e95503..3c3fe671c76 100644
---
a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn
+++
b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn
@@ -32,7 +32,7 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn
+ }
+
+ if (is_openbsd) {
-+ldflags += [ "-Wl,-z,wxneeded", "-Wl,-z,nobtcfi" ]
++ldflags += [ "-Wl,-z,wxneeded" ]
+ }
+
if (use_qt && is_clang) {
diff --git
a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD_gn
b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD_gn
deleted file mode 100644
index 21249a2897b..000
---
a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_tracing_BUILD_gn
+++ /dev/null
@@ -1,56 +0,0 @@
-build with python3 (remove catapult)
-Index: src/3rdparty/chromium/content/browser/tracing/BUILD.gn
src/3rdparty/chromium/content/browser/tracing/BUILD.gn.orig
-+++ src/3rdparty/chromium/content/browser/tracing/BUILD.gn
-@@ -1,51 +0,0 @@
--# Copyright 2014 The Chromium Authors. All rights reserved.
--# Use of this source code is governed by a BSD-style license that can be
--# found in the LICENSE file.
--
--import("//tools/grit/grit_rule.gni")
--
--# generate_about_tracing puts its files in this directory
--tracing_gen_dir = "$root_gen_dir/content/browser/tracing"
--
--# The script just writes filename with no dirs to the .grd, so we always need
--# this file to be in the same directory as the inputs.
--tracing_grd =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/21 12:15:12 Modified files: multimedia/upplay: Makefile x11/qt5/qtwebkit: Makefile Log message: Set USE_NOBTCFI to Yes There is no point in investing more time here. qtwebkit's lifetime will come to an end. USE_NOBTCFI has no effect on qtwebkit (lib level) but it can be seen as an indication to observe the consumer if it needs USE_NOBTCFI too.
Re: Remove productivity/tryton
On Wed Feb 21, 2024 at 10:46:14AM +0100, Sebastien Marie wrote: > Hi, > > I would like to remove productivity/tryton. > > The current state is the following: > - 5.0 serie (old LTS) is EOL since november (and requires python3.7 to run) > - 5.2 serie is EOL > > It would be possible to invest time to update to 6.0 and/or 7.0 series > (both LTS), but it is an huge number of packages to import, and I think > any real work with such ERP system needs proper version pinning (in > control of the user). > > So I would like to propose removing them with reason "no benefit to being > packaged" or "removed, needs a port maintainer". > > If someone has interest in it, we could keep them (if updated), and I > will drop maintainership of them. > > Any comments ? > -- > Sebastien Marie > Reasonable reasons, if no one raises their hand to take maintainership, I vote for deletion!
Re: www/hugo exits with illegal instruction
I see the same illegal instruction with the latest packages and latest base: fuckup$ hugo Illegal instruction (core dumped) fuckup$ dmesg | head -1 OpenBSD 7.5-beta (GENERIC.MP) #7: Tue Feb 20 11:09:18 MST 2024 ktrace: 92986 hugo CALL mmap(0,0x4,0x3,0x1002,-1,0) 92986 hugo RET mmap 11072319488/0x293f63000 92986 hugo CALL mmap(0,0x4,0x3,0x1002,-1,0) 92986 hugo RET mmap 10030714880/0x255e09000 92986 hugo CALL mmap(0,0x3000,0x3,0x1002,-1,0) 92986 hugo RET mmap 11094835200/0x2954dc000 92986 hugo CALL kbind(0x7e5873ba8528,24,0x47f5f02b048179b4) 92986 hugo RET kbind 0 92986 hugo CALL kbind(0x7e5873ba8528,24,0x47f5f02b048179b4) 92986 hugo RET kbind 0 92986 hugo CALL kbind(0x7e5873ba8508,24,0x47f5f02b048179b4) 92986 hugo RET kbind 0 92986 hugo PSIG SIGILL SIG_DFL code=ILL_ILLOPC addr=0x2ff6d00 trapno=21 92986 hugo NAMI "hugo.core"
Re: [NEW] alsa-lib-1.2.11
On Mon Feb 19, 2024 at 09:41:03PM +0900, SASANO Takayoshi wrote: > here is the ports of alsa-lib-1.2.11. > ok? > -- > SASANO Takayoshi (JG1UAA) > I wonder why? Are we going to support ALSA? Does it works? Where will the journey take us? There is a great danger that other ports will use it and then? No? Rafael
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/19 13:53:36 Modified files: x11/kde-plasma/plasma-workspace: Makefile Log message: Switch phonon-backend from gstreamer to vlc as run dependency. Side note from KDE6 upgrade "(note phonon-gstreamer should be dropped)". VLC works as good as gstreamer (maybe much better) so we can switch it with foresight.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/19 09:51:42 Modified files: x11/polkit-qt : Makefile x11/polkit-qt/patches: patch-PolkitQt-1Config_cmake_in Log message: hotfix: Dynamic variable names in SUBST_VARS Spotted by naddy, verified with qt5 flavor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/19 04:53:38 Modified files: x11/qt5/qtbase : Makefile distinfo Log message: Fix CVE-2024-25580 Improve KTX file reading memory safety patch: a43df98d037ad07cf096ef2f775958ceba743613
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/18 06:31:17 Modified files: x11/polkit-qt : Makefile x11/polkit-qt/patches: patch-PolkitQt-1Config_cmake_in Log message: Fix polkit-qt Qt5 and Qt6 version mismatch in cmake file OK aja (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/18 06:28:08 Modified files: x11/qt5/qtwebengine: Makefile Log message: Fix qt5webengine 5.15.16 qith Qt 5.15.12 fallout Fix version mismatches for CMake config files
Re: astro/calcmysky broken on i386: qt6 update-related?
On Sat Feb 17, 2024 at 08:29:42AM +, Stuart Henderson wrote: > Lots of these - > > ld: error: relocation R_386_PC32 cannot be used against symbol > 'QString::QString(char const*)'; recompile with -fPIC > > calcmysky hasn't changed recently so this is probably from the qt6 > update. I'm pretty sure I've built and checked all the consumers. I'll have a look. > > >>> Building on localhost under astro/calcmysky > BDEPENDS = > [x11/qt6/qtbase;math/eigen3;devel/cmake;devel/ninja;graphics/glm] > DIST = [astro/calcmysky:CalcMySky-0.3.1.tar.gz] > FULLPKGNAME = calcmysky-0.3.1p0 > RDEPENDS = [x11/qt6/qtbase] > Woken up audio/musikcube > (Junk lock failure for localhost at 1708113660.97279) > Received IO > (Junk lock obtained for localhost at 1708113754.73) > Received IO > Woken up astro/calcmysky > Short-cut: depends already handled by audio/musikcube > >>> Running show-prepare-results in astro/calcmysky at 1708113755.57 > ===> astro/calcmysky > ===> Building from scratch calcmysky-0.3.1p0 > ===> calcmysky-0.3.1p0 depends on: glm-* -> glm-0.9.9.8 > ===> calcmysky-0.3.1p0 depends on: eigen3-* -> eigen3-3.3.9 > ===> calcmysky-0.3.1p0 depends on: cmake-* -> cmake-3.28.2v0 > ===> calcmysky-0.3.1p0 depends on: ninja-* -> ninja-1.11.1 > ===> calcmysky-0.3.1p0 depends on: qt6-qtbase->=6.6.1,<6.7.0 -> > qt6-qtbase-6.6.1p0 > ===> Verifying specs: c++ c++abi pthread GL Qt6Core Qt6Gui Qt6OpenGL > Qt6OpenGLWidgets Qt6Widgets c m > ===> found c++.10.0 c++abi.7.0 pthread.27.1 GL.19.0 Qt6Core.4.0 Qt6Gui.5.0 > Qt6OpenGL.2.0 Qt6OpenGLWidgets.1.0 Qt6Widgets.2.0 c.98.0 m.10.1 > cmake-3.28.2v0 > eigen3-3.3.9 > glm-0.9.9.8 > ninja-1.11.1 > qt6-qtbase-6.6.1p0 > (Junk lock released for localhost at 1708113757.02) > Woken up devel/ruby-ffi-compiler,ruby31 > distfiles size=2166487 > >>> Running patch in astro/calcmysky at 1708113757.05 > ===> astro/calcmysky > ===> Checking files for calcmysky-0.3.1p0 > `/mnt/distfiles/CalcMySky-0.3.1.tar.gz' is up to date. > >> (SHA256) CalcMySky-0.3.1.tar.gz: OK > ===> Extracting for calcmysky-0.3.1p0 > ===> Patching for calcmysky-0.3.1p0 > ===> Compiler link: clang -> /usr/bin/clang > ===> Compiler link: clang++ -> /usr/bin/clang++ > ===> Compiler link: cc -> /usr/bin/cc > ===> Compiler link: c++ -> /usr/bin/c++ > >>> Running configure in astro/calcmysky at 1708113757.53 > ===> astro/calcmysky > ===> Generating configure for calcmysky-0.3.1p0 > ===> Configuring for calcmysky-0.3.1p0 > CMake Deprecation Warning at CMakeLists.txt:3 (cmake_policy): > The OLD behavior for policy CMP0110 will be removed from a future version > of CMake. > > The cmake-policies(7) manual explains that the OLD behaviors of all > policies are deprecated and that a policy should be set to OLD only under > specific short-term circumstances. Projects should be ported to the NEW > behavior and not rely on setting a policy to OLD. > > > -- The CXX compiler identification is Clang 16.0.6 > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /pobj/calcmysky-0.3.1/bin/c++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Looking for C++ include glm/glm.hpp > -- Looking for C++ include glm/glm.hpp - found > -- Checking that GLM has the required features > -- Checking that GLM has the required features - done > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success > -- Found Threads: TRUE > -- Performing Test HAVE_STDATOMIC > -- Performing Test HAVE_STDATOMIC - Success > -- Found WrapAtomic: TRUE > -- Could NOT find Vulkan (missing: Vulkan_LIBRARY Vulkan_INCLUDE_DIR) (found > version "") > -- Could NOT find WrapVulkanHeaders (missing: Vulkan_INCLUDE_DIR) > -- Found OpenGL: /usr/X11R6/lib/libGL.so.19.0 > -- Found WrapOpenGL: TRUE > -- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.2") > -- Found XKB: /usr/local/lib/libxkbcommon.so.2.0 (found suitable version > "1.6.0", minimum required is "0.5.0") > -- Could NOT find Vulkan (missing: Vulkan_LIBRARY Vulkan_INCLUDE_DIR) (found > version "") > -- Could NOT find WrapVulkanHeaders (missing: Vulkan_INCLUDE_DIR) > -- CPM: using local package Eigen3@3.3.9 > -- ABI version: 15 > -- Configuring done (6.3s) > -- Generating done (0.1s) > CMake Warning: > Manually-specified variables were not used by the project: > > CMAKE_ASM_COMPILER_AR > CMAKE_ASM_COMPILER_RANLIB > CMAKE_C_COMPILER_AR > CMAKE_C_COMPILER_RANLIB > CMAKE_Fortran_COMPILER_AR > CMAKE_Fortran_COMPILER_RANLIB > CMAKE_OBJCXX_COMPILER_AR > CMAKE_OBJCXX_COMPILER_RANLIB > CMAKE_OBJC_COMPILER_AR > CMAKE_OBJC_COMPILER_RANLIB > > > -- Build files have been written to: /pobj/calcmysky-0.3.1/build-i386 > >>> Running build in astro/calcmysky at 1708113764.39 > ===> astro/calcmysky > ===> Building for calcmysky-0.3.1p0 > Change Dir:
x11/qt6/qt6.port.mk: BUILD_DEPENDS on x11/qt6/qttools
OK to add qttools as a build dependency for all qt6 ports? We're doing
the same in qt5.port.mk.
I'm currently porting more and more Qt6 consumers that shows me that I
almost always need a tool from qttools.
Index: qt6.port.mk
===
RCS file: /cvs/ports/x11/qt6/qt6.port.mk,v
diff -u -p -r1.7 qt6.port.mk
--- qt6.port.mk 2 Sep 2023 08:25:20 - 1.7
+++ qt6.port.mk 17 Feb 2024 07:58:56 -
@@ -34,11 +34,15 @@ _MODQT6_SETUP +=Qt6_DIR=${MODQT6_LIBDIR
MODQT6_LIB_DEPENDS = x11/qt6/qtbase
MODQT_LIB_DEPENDS ?= ${MODQT6_LIB_DEPENDS}
+# qdoc, etc.
+MODQT6_BUILD_DEPENDS = x11/qt6/qttools
+
MODQT_DEPS ?= Yes
MODQT6_DEPS ?= ${MODQT_DEPS}
.if ${MODQT6_DEPS:L} == "yes"
LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
+BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
.endif
CONFIGURE_ENV += ${_MODQT6_SETUP}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 23:52:38 Modified files: sysutils/kubectl: Makefile distinfo Log message: Update kubectl-1.29.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 23:52:24 Modified files: devel/cmake: Makefile distinfo devel/cmake/patches: patch-Source_cmGlobalGenerator_cxx Log message: Update cmake to 3.28.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 23:17:50 Modified files: x11/qt5/qttools: Makefile x11/qt5/qttools/pkg: PLIST-main Removed files: x11/qt5/qttools/pkg: DESCR-webview PLIST-webview Log message: Remove qwebview OK and conflict/pkgpath tweaks from sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 23:03:52 Modified files: devel/kf5 : kf5.port.mk devel/kf5/attica: distinfo devel/kf5/baloo: distinfo devel/kf5/baloo/pkg: PLIST devel/kf5/bluez-qt: distinfo devel/kf5/breeze-icons: distinfo devel/kf5/extra-cmake-modules: distinfo devel/kf5/frameworkintegration: distinfo devel/kf5/kactivities: distinfo devel/kf5/kactivities-stats: distinfo devel/kf5/kapidox: distinfo devel/kf5/karchive: distinfo devel/kf5/kauth: distinfo devel/kf5/kbookmarks: distinfo devel/kf5/kcalendarcore: distinfo devel/kf5/kcmutils: distinfo devel/kf5/kcodecs: distinfo devel/kf5/kcompletion: distinfo devel/kf5/kconfig: distinfo devel/kf5/kconfigwidgets: distinfo devel/kf5/kcontacts: distinfo devel/kf5/kcoreaddons: distinfo devel/kf5/kcoreaddons/patches: patch-src_lib_util_kprocesslist_unix_cpp devel/kf5/kcrash: distinfo devel/kf5/kdav : distinfo devel/kf5/kdbusaddons: distinfo devel/kf5/kdeclarative: distinfo devel/kf5/kded : distinfo devel/kf5/kdelibs4support: distinfo devel/kf5/kdesignerplugin: distinfo devel/kf5/kdesu: distinfo devel/kf5/kdnssd: distinfo devel/kf5/kdoctools: distinfo devel/kf5/kemoticons: distinfo devel/kf5/kfilemetadata: distinfo devel/kf5/kglobalaccel: distinfo devel/kf5/kguiaddons: distinfo devel/kf5/kholidays: distinfo devel/kf5/khtml: distinfo devel/kf5/ki18n: distinfo devel/kf5/kiconthemes: distinfo devel/kf5/kidletime: distinfo devel/kf5/kimageformats: distinfo devel/kf5/kinit: distinfo devel/kf5/kio : distinfo devel/kf5/kirigami2: distinfo devel/kf5/kirigami2/pkg: PLIST devel/kf5/kitemmodels: distinfo devel/kf5/kitemviews: distinfo devel/kf5/kjobwidgets: distinfo devel/kf5/kjs : distinfo devel/kf5/kmediaplayer: distinfo devel/kf5/knewstuff: distinfo devel/kf5/knotifications: distinfo devel/kf5/knotifyconfig: distinfo devel/kf5/kpackage: distinfo devel/kf5/kparts: distinfo devel/kf5/kpeople: distinfo devel/kf5/kplotting: distinfo devel/kf5/kpty : distinfo devel/kf5/kquickcharts: distinfo devel/kf5/kross: distinfo devel/kf5/krunner: distinfo devel/kf5/kservice: distinfo devel/kf5/ktexteditor: distinfo devel/kf5/ktextwidgets: distinfo devel/kf5/kunitconversion: distinfo devel/kf5/kwallet: distinfo devel/kf5/kwayland: distinfo devel/kf5/kwidgetsaddons: distinfo devel/kf5/kwindowsystem: distinfo devel/kf5/kxmlgui: distinfo devel/kf5/kxmlrpcclient: distinfo devel/kf5/oxygen-icons: distinfo devel/kf5/plasma-framework: distinfo devel/kf5/plasma-framework/pkg: PLIST devel/kf5/prison: distinfo devel/kf5/purpose: distinfo devel/kf5/qqc2-desktop-style: distinfo devel/kf5/solid: distinfo devel/kf5/sonnet: distinfo devel/kf5/syndication: distinfo devel/kf5/syntax-highlighting: distinfo devel/kf5/threadweaver: distinfo Log message: Update KDE Frameworks to 5.115.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 23:01:12 Modified files: meta/qt5 : Makefile Log message: Remove REVISION after update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/15 22:59:24 Modified files: x11/qt5: Makefile.inc Makefile.version x11/qt5/docs : distinfo x11/qt5/qt3d : Makefile distinfo x11/qt5/qtbase : Makefile distinfo x11/qt5/qtcharts: distinfo x11/qt5/qtconnectivity: Makefile distinfo x11/qt5/qtdatavis3d: distinfo x11/qt5/qtdeclarative: Makefile distinfo x11/qt5/qtgamepad: distinfo x11/qt5/qtgraphicaleffects: distinfo x11/qt5/qtimageformats: Makefile distinfo x11/qt5/qtlocation: Makefile distinfo x11/qt5/qtlottie: distinfo x11/qt5/qtmultimedia: Makefile distinfo x11/qt5/qtnetworkauth: distinfo x11/qt5/qtpurchasing: distinfo x11/qt5/qtquickcontrols: distinfo x11/qt5/qtquickcontrols2: Makefile distinfo x11/qt5/qtremoteobjects: distinfo x11/qt5/qtscript: Makefile distinfo x11/qt5/qtscxml: distinfo x11/qt5/qtsensors: distinfo x11/qt5/qtserialbus: distinfo x11/qt5/qtserialport: distinfo x11/qt5/qtspeech: Makefile distinfo x11/qt5/qtsvg : Makefile distinfo x11/qt5/qttools: Makefile distinfo x11/qt5/qttranslations: distinfo x11/qt5/qtvirtualkeyboard: distinfo x11/qt5/qtwayland: Makefile distinfo x11/qt5/qtwebchannel: Makefile distinfo x11/qt5/qtwebengine: Makefile distinfo x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_services_network_network_context_cc patch-src_3rdparty_chromium_third_party_abseil-cpp_absl_base_config_h patch-src_3rdparty_chromium_third_party_abseil-cpp_absl_base_internal_sysinfo_cc patch-src_3rdparty_chromium_third_party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config_h patch-src_3rdparty_chromium_third_party_libxml_linux_config_h patch-src_3rdparty_chromium_third_party_libxml_src_dict_c patch-src_3rdparty_chromium_third_party_pdfium_core_fxge_fx_ge_linux_cpp patch-src_3rdparty_chromium_third_party_sqlite_BUILD_gn patch-src_3rdparty_chromium_third_party_sqlite_src_amalgamation_sqlite3_c patch-src_3rdparty_chromium_third_party_zlib_BUILD_gn patch-src_3rdparty_chromium_third_party_zlib_google_zip_internal_cc patch-src_3rdparty_chromium_ui_views_bubble_bubble_dialog_delegate_view_cc patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix_cc patch-src_buildtools_configure_json x11/qt5/qtwebengine/pkg: PLIST x11/qt5/qtwebglplugin: distinfo x11/qt5/qtwebsockets: Makefile distinfo x11/qt5/qtwebview: distinfo x11/qt5/qtx11extras: distinfo x11/qt5/qtxmlpatterns: distinfo Removed files: x11/qt5/qtwebengine/patches: patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl patch-src_3rdparty_chromium_b_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/14 13:43:01 Modified files: devel/jenkins/devel: Makefile distinfo devel/jenkins/stable: Makefile distinfo Log message: Update jenkins-devel to 2.445 and -stable to 2.426.1
Re: editors/texmaker： Update to 5.1.4
On Wed Feb 14, 2024 at 11:59:12AM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch for editors/texmaker to update to 5.1.4.
>The port build well with the patch and run well.
>
>
> Cheers !
> wen
> Index: editors/texmaker/Makefile
> ===
> RCS file: /cvs/ports/editors/texmaker/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- editors/texmaker/Makefile 21 Sep 2023 12:22:34 - 1.46
> +++ editors/texmaker/Makefile 14 Feb 2024 11:24:53 -
> @@ -1,7 +1,6 @@
> COMMENT= LaTeX development environment
> -DISTNAME=texmaker-5.0.2
> +DISTNAME=texmaker-5.1.4
> CATEGORIES= editors
> -REVISION=2
>
> HOMEPAGE=http://www.xm1math.net/texmaker/
This is available via HTTPS.
>
> Index: editors/texmaker/distinfo
> ===
> RCS file: /cvs/ports/editors/texmaker/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- editors/texmaker/distinfo 15 Jul 2018 23:09:43 - 1.20
> +++ editors/texmaker/distinfo 14 Feb 2024 11:24:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (texmaker-5.0.2.tar.bz2) =
> qU6Nd6Fv3dB4nEUrCRO7CYsfiVOXs61TvimthKqsAXk=
> -SIZE (texmaker-5.0.2.tar.bz2) = 15695684
> +SHA256 (texmaker-5.1.4.tar.bz2) =
> MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY=
> +SIZE (texmaker-5.1.4.tar.bz2) = 15277027
> Index: editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h
> ===
> RCS file: editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h
> diff -N editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ editors/texmaker/patches/patch-pdfium_core_fxcrt_fx_system_h 14 Feb
> 2024 11:24:53 -
> @@ -0,0 +1,12 @@
> +Index: pdfium/core/fxcrt/fx_system.h
> +--- pdfium/core/fxcrt/fx_system.h.orig
> pdfium/core/fxcrt/fx_system.h
> +@@ -40,7 +40,7 @@
> + #elif defined(_WIN64)
> + #define _FX_OS_ _FX_WIN64_DESKTOP_
> + #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
> +-#elif defined(__linux__)
> ++#elif defined(__linux__) || defined(__OpenBSD__)
> + #define _FX_OS_ _FX_LINUX_DESKTOP_
> + #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
> + #elif defined(__APPLE__)
> Index: editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
> ===
> RCS file: editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
> diff -N editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
> --- editors/texmaker/patches/patch-pdfium_core_fxcrt_include_fx_system_h
> 11 Mar 2022 18:58:35 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -Index: pdfium/core/fxcrt/include/fx_system.h
> pdfium/core/fxcrt/include/fx_system.h.orig
> -+++ pdfium/core/fxcrt/include/fx_system.h
> -@@ -40,7 +40,7 @@
> - #elif defined(_WIN64)
> - #define _FX_OS_ _FX_WIN64_DESKTOP_
> - #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
> --#elif defined(__linux__)
> -+#elif defined(__linux__) || defined(__OpenBSD__)
> - #define _FX_OS_ _FX_LINUX_DESKTOP_
> - #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
> - #elif defined(__APPLE__)
> Index: editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
> ===
> RCS file:
> editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
> diff -N
> editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
> --- editors/texmaker/patches/patch-pdfium_xfa_fgas_font_fgas_stdfontmgr_cpp
> 11 Mar 2022 18:58:35 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -Index: pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp
> pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp.orig
> -+++ pdfium/xfa/fgas/font/fgas_stdfontmgr.cpp
> -@@ -464,8 +464,8 @@ FX_LPEnumAllFonts FX_GetDefFontEnumerator() {
> - #else
> - const FX_CHAR* g_FontFolders[] = {
> - #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
> --"/usr/share/fonts", "/usr/share/X11/fonts/Type1",
> --"/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
> -+"/usr/X11R6/lib/X11/fonts/Type1",
> -+"/usr/X11R6/lib/X11/fonts/TTF", "/usr/local/share/fonts",
> - #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
> - "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts",
> - #elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
> Index: editors/texmaker/patches/patch-texmaker_pro
> ===
> RCS file: /cvs/ports/editors/texmaker/patches/patch-texmaker_pro,v
> retrieving revision 1.18
> diff -u -p -r1.18 patch-texmaker_pro
> --- editors/texmaker/patches/patch-texmaker_pro 11 Mar 2022 18:58:35
> - 1.18
> +++ editors/texmaker/patches/patch-texmaker_pro 14 Feb 2024 11:24:53
> -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/14 00:53:49 Removed files: devel/zeal/patches: patch-src_libs_ui_searchitemdelegate_cpp Log message: Remove unnecessary patches
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/14 00:52:30 Modified files: devel/zeal : Makefile distinfo devel/zeal/pkg : PLIST Log message: Update zeal to 0.7.0. Upstream switched to Qt6 and Qt6Webengine Init diff by me with improvements by kn@, ok kn@, maintainer timeout
Re: new textproc/goldendict 1.5.0
On Sat Feb 10, 2024 at 08:29:03PM +, Klemens Nanni wrote: > On Wed, Feb 07, 2024 at 09:07:30PM +0100, Rafael Sadowski wrote: > > With Qt 6.6.1 goldendict-ng starts and runs perfectly for me. No further > > tests because I don't know how and what to test. > > goldendict-ng 24.01.22 now shows a window, but searching anything promptly > crashes: > > Thread 5 received signal SIGSEGV, Segmentation fault. > [Switching to thread 332837] > 0x0b42383ffd40 in sha512_block_data_order_avx () from > /usr/local/lib/libQt6WebEngineCore.so.1.0 > (gdb) bt > #0 0x0b42383ffd40 in sha512_block_data_order_avx () from > /usr/local/lib/libQt6WebEngineCore.so.1.0 > #1 0x0b423c5d60ef in SHA512_Update () from > /usr/local/lib/libQt6WebEngineCore.so.1.0 > #2 0x in ?? () > > SHA512 and AVX... is there some over-eager optimisation in WebEngine? > Fixed in qt6-qtwebengine-6.6.1p0. Thanks for spotting this. I need more test cases, because unfortunately we don't have a real browser. Thanks Theo for the xonly pointer.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/14 00:08:36 Modified files: x11/qt6/qtwebengine: Makefile x11/qt6/qtwebengine/patches: patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl patch-src_3rdparty_chromium_third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl Added files: x11/qt6/qtwebengine/patches: patch-src_3rdparty_chromium_v8_src_snapshot_embedded_embedded-file-writer_cc Removed files: x11/qt6/qtwebengine/patches: patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_chacha_asm_chacha-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_cipher_extra_asm_aes128gcmsiv-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_cipher_extra_asm_chacha20_poly1305_x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont5_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_bn_asm_x86_64-mont_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86_64-asm_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_ec_asm_p256_beeu-x86_64-asm_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_perlasm_x86_64-xlate_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_boringssl_src_crypto_test_asm_trampoline-x86_64_pl patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_dav1d_BUILD_gn patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_ffmpeg_libavcodec_x86_fft_asm patch-src_3rdparty_chromium_www_chromium_patches_patch-third_party_ffmpeg_libavutil_x86_x86inc_asm patch-src_3rdparty_chromium_www_chromium_patches_patch-v8_src_baseline_x64_baseline-assembler-x64-inl_h patch-src_3rdparty_chromium_www_chromium_patches_patch-v8_src_builtins_x64_builtins-x64_cc patch-src_3rdparty_chromium_www_chromium_patches_patch-v8_src_codegen_x64_assembler-x64_cc patch-src_3rdparty_chromium_www_chromium_patches_patch-v8_src_codegen_x64_assembler-x64_h
Re: UPDATE: Axel-2.17.13
On Tue Feb 13, 2024 at 08:59:56PM +0100, Gonzalo L. Rodriguez wrote: > Hello, > > Update for Axel to 2.17.13: > > https://github.com/axel-download-accelerator/axel/releases/tag/v2.17.13 > > OK? Comments? > > Cheers.- What surprises me a bit is that in the README.md of the upstream project it says that it depends on "gettext", but our port does not address it. Here is the configure output: checking for msgfmt... /usr/local/bin/msgfmt checking for gmsgfmt... /usr/local/bin/msgfmt checking for xgettext... /usr/local/bin/xgettext checking for msgmerge... /usr/local/bin/msgmerge So i think you need devel/gettext,-tools as build dependency. It also depends on C11 so I suggest the following lines: COMPILER = base-clang ports-gcc COMPILER_LANGS =c Otherwise it looks good. > > > Index: Makefile > === > RCS file: /cvs/ports/net/axel/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 27 Sep 2023 14:18:00 - 1.18 > +++ Makefile 13 Feb 2024 19:58:26 - > @@ -1,6 +1,6 @@ > COMMENT= tiny download accelerator > > -V= 2.17.11 > +V= 2.17.13 > DISTNAME=axel-$V > > CATEGORIES= net > Index: distinfo > === > RCS file: /cvs/ports/net/axel/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 3 Feb 2022 08:52:06 - 1.7 > +++ distinfo 13 Feb 2024 19:58:26 - > @@ -1,2 +1,2 @@ > -SHA256 (axel-2.17.11.tar.gz) = 8SaC+YHIPzdLgrBmjyX2lKIEK2F7I27m+wV+VHPFTjE= > -SIZE (axel-2.17.11.tar.gz) = 377920 > +SHA256 (axel-2.17.13.tar.gz) = YEzn+9s3UAxGIpXWwD+lnrTf+3gP3y/DxB/6dcj27Dg= > +SIZE (axel-2.17.13.tar.gz) = 312226 > -- > >%gonzalo >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/02/13 09:38:03 Modified files: x11/qt6/qt3d : Makefile x11/qt6/qt3d/pkg: PLIST Added files: x11/qt6/qt3d/pkg: PFRAG.x86 Log message: Enable SIMD and install header-files depending on the MACHINE_ARCH Ok and with help from sthen@
Re: aarch64 bulk build report
On Tue Feb 13, 2024 at 02:34:03PM +, Stuart Henderson wrote:
> On 2024/02/12 14:34, Stuart Henderson wrote:
> > On 2024/02/11 14:25, Rafael Sadowski wrote:
> > > On Sat Feb 10, 2024 at 05:39:19PM -0700, phess...@openbsd.org wrote:
> > > > bulk build on arm64.ports.openbsd.org
> > > > started on Thu Feb 8 00:00:49 MST 2024
> > > > finished at Sat Feb 10 17:37:41 MST 2024
> > > > lasted 2D17h36m
> > > > done with kern.version=OpenBSD 7.4-current (GENERIC.MP) #76: Wed Feb 7
> > > > 17:33:52 MST 2024
> > > >
> > > > built packages:12278
> > > > Feb 8:4373
> > > > Feb 9:1234
> > > > Feb 10:6670
> > > >
> > > >
> > > > critical path missing pkgs:
> > > > http://build-failures.rhaalovely.net/aarch64/2024-02-08/summary.log
> > > >
> > > > build failures: 2
> > > > http://build-failures.rhaalovely.net/aarch64/2024-02-08/graphics/pdfsandwich.log
> > > > http://build-failures.rhaalovely.net/aarch64/2024-02-08/x11/qt6/qt3d.log
> > > >
> > >
> > > The following diff works fine both amd64 and aarch64. Does it makes
> > > sense for i386 too?
> > >
> > > diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile
> > > index 76da86df196..e8249a2d05a 100644
> > > --- a/x11/qt6/qt3d/Makefile
> > > +++ b/x11/qt6/qt3d/Makefile
> > > @@ -1,6 +1,7 @@
> > > QT6NAME =Qt3D
> > > COMMENT =Qt6 components for 3D graphics
> > > PKGSPEC =qt6-qt3d-${QT6_PKGSPEC}
> > > +REVISION = 0
> > >
> > > SHARED_LIBS += Qt63DAnimation1.0 # 6.6
> > > SHARED_LIBS += Qt63DCore 1.1 # 6.6
> > > @@ -27,7 +28,4 @@ LIB_DEPENDS = multimedia/assimp \
> > > x11/qt6/qtdeclarative \
> > > x11/xkbcommon
> > >
> > > -CONFIGURE_ARGS = -DQT_FEATURE_qt3d_simd_sse2=OFF \
> > > - -DQT_FEATURE_qt3d_simd_avx2=OFF
> > > -
> >
> > It looks like the port was trying to disable the SSE2/AVX2 stuff -
> > depending on how the software works that might be necessary (i.e.
> > if it enables AVX2 if the build machine supports it, and uses it
> > unconditionally, then it does need disabling - but if it has a
> > runtime check then it doesn't)
> >
> > > .include
> > > diff --git a/x11/qt6/qt3d/pkg/PFRAG.amd64 b/x11/qt6/qt3d/pkg/PFRAG.amd64
> > > new file mode 100644
> > > index 000..4c3913cce2e
> > > --- /dev/null
> > > +++ b/x11/qt6/qt3d/pkg/PFRAG.amd64
> >
> > These extra PFRAG files are not used unless you set variables via
> > PKG_ARGS to have them pulled in, and reference them via %%varname%% in
> > PLIST.
> >
> > I'm not sure if it tries to builds these files on i386 or not yet (the
> > machine has been running out of memory and crashing in my current bulk,
> > and the previous one had the old version of qt3d).
> >
> > If they are amd64-only then I'd use the PKG_ARGS variable "amd64" and do
> >
> > .if ${MACHINE_ARCH} == "amd64"
> > PKG_ARGS+= -Damd64=1
> > .else
> > PKG_ARGS+= -Damd64=0
> > .endif
> >
> > otherwise
> >
> > .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> > PKG_ARGS+= -Dx86=1
> > .else
> > PKG_ARGS+= -Dx86=0
> > .endif
> >
> > I'll let you know when my build finished whether they are produced on
> > i386, it will be at least a day or two away. Looks like qt6/qt3d is only
> > depended on by meta/qt6 so I guess this is not a big rush?
>
> Those files are built on i386 too. So use the second of those and
> name the file PFRAG.x86 (and add %%x86%% to PLIST).
>
Thanks for your guidance. OK for the following diff?
diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile
index 76da86df196..af0097092c7 100644
--- a/x11/qt6/qt3d/Makefile
+++ b/x11/qt6/qt3d/Makefile
@@ -1,6 +1,7 @@
QT6NAME = Qt3D
COMMENT = Qt6 components for 3D graphics
PKGSPEC = qt6-qt3d-${QT6_PKGSPEC}
+REVISION = 0
SHARED_LIBS += Qt63DAnimation1.0 # 6.6
SHARED_LIBS += Qt63DCore 1.1 # 6.6
@@ -19,6 +20,12 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools
WANTLIB += assimp c m xkbcommon z
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+PKG_ARGS+= -Dx86=1
+.else
+PKG_ARG
