2026-10-21T22:09:35+0200 Rafael Sadowski <[email protected]>:
> On Sun Oct 18, 2026 at 08:44:09PM +0200, Rafael Sadowski wrote:
> > New update diff Qt to 6.12. QtWebEngine is no longer part of the Qt
> > release process and will soon have its own ... yeah, that'll be fun!
> >
> > Anyway, here are the key points:
> >
> > - I droped the Fedora pyside patches, It may be that we no longer need
> > it. Fedora is still on version 6.11. A job of jtt@ :D
> > - The patches are all simple, see below.
> > - I've managed to get QTMultimedia's VA-API support working.
> >
> > If there are no objections, I'll commit it next weekend (I'd be happy to
> > commit it sooner).
> >
>
> New diff with one more patch qxdgdesktopportalfiletransfer.cpp, spotted
> by jtt@, thanks
Thanks rsadowski@ for the update. I've build tested x11/qt6/pyside6/* and
all its qt6-* dependencies mostly without issues. Here some tweaks (see
diff below which should apply on top of yours):
- pyside6/tools: Add Qt6QuickVectorImage to WANTLIB.
- pyside6/shiboken_generator: Set -DSPHINX_BUILD=OFF to avoid building
docs and dependency on textproc/py-sphinx.
- pyside6/shiboken: Remove textproc/py-sphinx from BUILD_DEPENDS as it
doesn't seem to be needed.
- pyside6/pyside: Add graphics/vulkan-headers and graphics/shaderc (glslc
component) to BUILD_DEPENDS, as they are picked up during configure time.
- qtmultimedia: Add multimedia/pipewire/pipewire to BUILD_DEPENDS, as it
is needed during configure time.
Regarding consumers, I only build tested cad/freecad, which needs the
attached diff to build with pyside 6.12. As for all kde consumers,
probably better to test in a bulk.
With both diffs applied, ok jtt@.
diff -rup /tmp/old/x11/qt6/pyside6/pyside/Makefile
/tmp/new/x11/qt6/pyside6/pyside/Makefile
--- /tmp/old/x11/qt6/pyside6/pyside/Makefile Fri Oct 23 11:28:28 2026
+++ /tmp/new/x11/qt6/pyside6/pyside/Makefile Fri Oct 23 11:28:16 2026
@@ -28,6 +28,8 @@ MODULES += lang/clang \
MODCLANG_VERSION = 22
BUILD_DEPENDS = devel/llvm/${MODCLANG_VERSION} \
+ graphics/shaderc \
+ graphics/vulkan-headers \
x11/qt6/qttools
LIB_DEPENDS = x11/qt6/pyside6/shiboken \
diff -rup /tmp/old/x11/qt6/pyside6/shiboken/Makefile
/tmp/new/x11/qt6/pyside6/shiboken/Makefile
--- /tmp/old/x11/qt6/pyside6/shiboken/Makefile Fri Oct 23 11:28:28 2026
+++ /tmp/new/x11/qt6/pyside6/shiboken/Makefile Fri Oct 23 11:28:16 2026
@@ -13,7 +13,6 @@ MODCLANG_VERSION = 22
BUILD_DEPENDS = x11/qt6/qttools \
math/py-numpy \
- textproc/py-sphinx \
x11/qt6/pyside6/shiboken_generator
RUN_DEPENDS = math/py-numpy \
diff -rup /tmp/old/x11/qt6/pyside6/shiboken_generator/Makefile
/tmp/new/x11/qt6/pyside6/shiboken_generator/Makefile
--- /tmp/old/x11/qt6/pyside6/shiboken_generator/Makefile Fri Oct 23
11:28:28 2026
+++ /tmp/new/x11/qt6/pyside6/shiboken_generator/Makefile Fri Oct 23
11:28:16 2026
@@ -16,7 +16,8 @@ LIB_DEPENDS = ${MODCLANG_LIB_DEPENDS} \
CONFIGURE_ARGS +=
-DClang_DIR="${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/clang" \
-DBUILD_TESTS=OFF \
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \
+ -DSPHINX_BUILD=OFF
CONFIGURE_ENV =
LLVM_INSTALL_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}
MODCMAKE_LDFLAGS = -L${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
-Wl,-rpath=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
diff -rup /tmp/old/x11/qt6/pyside6/tools/Makefile
/tmp/new/x11/qt6/pyside6/tools/Makefile
--- /tmp/old/x11/qt6/pyside6/tools/Makefile Fri Oct 23 11:28:28 2026
+++ /tmp/new/x11/qt6/pyside6/tools/Makefile Fri Oct 23 11:28:16 2026
@@ -6,9 +6,10 @@ WANTLIB += Qt6DesignerComponents Qt6Gui Qt6Help Qt6Net
WANTLIB += Qt6OpenGLWidgets Qt6PrintSupport Qt6Qml Qt6QmlCompiler
WANTLIB += Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript Qt6Quick
WANTLIB += Qt6Quick3DAssetImport Qt6Quick3DIblBaker Qt6Quick3DRuntimeRender
-WANTLIB += Qt6Quick3DUtils Qt6QuickLayouts Qt6QuickVectorImageGenerator
-WANTLIB += Qt6QuickWidgets Qt6ShaderTools Qt6Sql Qt6UiTools Qt6Widgets
-WANTLIB += Qt6Xml c execinfo m xkbcommon zstd
+WANTLIB += Qt6Quick3DUtils Qt6QuickLayouts Qt6QuickVectorImage
+WANTLIB += Qt6QuickVectorImageGenerator Qt6QuickWidgets Qt6ShaderTools
+WANTLIB += Qt6Sql Qt6UiTools Qt6Widgets Qt6Xml c execinfo m xkbcommon
+WANTLIB += zstd
MODULES += lang/python
diff -rup /tmp/old/x11/qt6/qtmultimedia/Makefile
/tmp/new/x11/qt6/qtmultimedia/Makefile
--- /tmp/old/x11/qt6/qtmultimedia/Makefile Fri Oct 23 11:28:28 2026
+++ /tmp/new/x11/qt6/qtmultimedia/Makefile Fri Oct 23 11:28:16 2026
@@ -19,6 +19,7 @@ WANTLIB += gstreamer-1.0 gstvideo-1.0 intl m pulse swr
WANTLIB += swscale va va-drm wayland-client wayland-egl xcb xkbcommon
BUILD_DEPENDS = graphics/vulkan-headers \
+ multimedia/pipewire/pipewire \
x11/qt6/qtshadertools \
x11/qt6/qtsvg
Index: cad/freecad/Makefile
===================================================================
RCS file: /cvs/ports/cad/freecad/Makefile,v
diff -u -p -r1.18 Makefile
--- cad/freecad/Makefile 13 Oct 2026 10:01:01 -0000 1.18
+++ cad/freecad/Makefile 23 Oct 2026 13:34:22 -0000
@@ -7,6 +7,7 @@ COMMENT = general purpose parametric 3D
V = 1.1.4
DISTNAME = freecad_source_${V}
PKGNAME = freecad-${V}
+REVISION = 0
SHARED_LIBS += OndselSolver 2.0 # 0.0
SHARED_LIBS += E57Format 0.0 # 0.0
@@ -46,7 +47,8 @@ WANTLIB += xerces-c yaml-cpp z
SITES =
https://github.com/FreeCAD/FreeCAD/releases/download/${V}/
-FIX_CRLF_FILES = src/Mod/Sketcher/App/GeoEnum.h
+FIX_CRLF_FILES = src/Mod/Sketcher/App/GeoEnum.h \
+ src/Gui/PythonWrapper.cpp
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
Index: cad/freecad/patches/patch-src_Gui_PythonWrapper_cpp
===================================================================
RCS file: cad/freecad/patches/patch-src_Gui_PythonWrapper_cpp
diff -N cad/freecad/patches/patch-src_Gui_PythonWrapper_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cad/freecad/patches/patch-src_Gui_PythonWrapper_cpp 23 Oct 2026 13:34:22
-0000
@@ -0,0 +1,16 @@
+This patch has been merged upstream. Drop next update.
+Commit: 636365fd4a30e017c76ef6a44cf045e77ec5e632
+
+Index: src/Gui/PythonWrapper.cpp
+--- src/Gui/PythonWrapper.cpp.orig
++++ src/Gui/PythonWrapper.cpp
+@@ -121,6 +121,9 @@
+
+ #ifdef HAVE_PYSIDE
+ # include <signalmanager.h>
++# if __has_include(<pyobjectwrapper.h>)
++# include <pyobjectwrapper.h>
++# endif
+ #endif // HAVE_PYSIDE
+
+
//-----------------------------------------------------------------------------
