On Wed Dec 27, 2023 at 02:42:20PM +0100, Rafael Sadowski wrote:
> Please find attached kpipewire-5.27.10. I have not been able to test it.
> I also have no idea how far we are with pipewire. I need it to update
> krfb and spectacle. (New dependency since KDE Gear 23.08.x)
>
and here the mentioned kde ports:
Index: krfb/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/krfb/Makefile,v
diff -u -p -r1.21 Makefile
--- krfb/Makefile 19 Nov 2023 12:26:58 -0000 1.21
+++ krfb/Makefile 27 Dec 2023 15:53:50 -0000
@@ -2,18 +2,16 @@ COMMENT = desktop sharing
DISTNAME = krfb-${VERSION}
CATEGORIES = net x11
-# XXX Depends on KPipeWire (pipewire)
-VERSION = 22.12.3
-REVISION = 3
-
SHARED_LIBS += krfbprivate 3.0 # 5.0
+
WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5ConfigCore
WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5DBusAddons
-WANTLIB += KF5DNSSD KF5I18n KF5Notifications KF5Wallet KF5WidgetsAddons
-WANTLIB += KF5WindowSystem KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Network
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml X11 Xdamage Xext Xtst
-WANTLIB += c m vncserver xcb xcb-damage xcb-image xcb-render xcb-shape
-WANTLIB += xcb-shm xcb-xfixes
+WANTLIB += KF5DNSSD KF5I18n KF5Notifications KF5Wallet KF5WaylandClient
+WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui KPipeWire
+WANTLIB += KPipeWireDmaBuf Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets
+WANTLIB += Qt5X11Extras Qt5Xml X11 Xdamage Xext Xtst c m vncserver
+WANTLIB += wayland-client xcb xcb-damage xcb-image xcb-render
+WANTLIB += xcb-shape xcb-shm xcb-xfixes
WANTLIB += lib/inotify/inotify
@@ -40,12 +38,12 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kwallet \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
+ devel/kf5/kwayland \
net/libvncserver \
devel/libinotify \
+ x11/kde-plasma/kpipewire \
x11/qt5/qtx11extras
CXXFLAGS += -I${LOCALBASE}/include
-
-CONFIGURE_ARGS = -DDISABLE_PIPEWIRE=ON
.include <bsd.port.mk>
Index: krfb/distinfo
===================================================================
RCS file: /cvs/ports/x11/kde-applications/krfb/distinfo,v
diff -u -p -r1.29 distinfo
--- krfb/distinfo 8 Mar 2023 20:43:34 -0000 1.29
+++ krfb/distinfo 27 Dec 2023 15:53:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (kde-applications/krfb-22.12.3.tar.xz) =
3I0muRCfNg0hnFci/NUwCfaXiRuJ39/nLjaAupQxluQ=
-SIZE (kde-applications/krfb-22.12.3.tar.xz) = 1324320
+SHA256 (kde-applications/krfb-23.08.4.tar.xz) =
uxWjAkKMRfgzHSWpFGZ0Q2fLOC1LLvoeiKPMc9rLaYQ=
+SIZE (kde-applications/krfb-23.08.4.tar.xz) = 1322700
Index: krfb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde-applications/krfb/pkg/PLIST,v
diff -u -p -r1.11 PLIST
--- krfb/pkg/PLIST 18 Dec 2022 09:11:05 -0000 1.11
+++ krfb/pkg/PLIST 27 Dec 2023 15:53:50 -0000
@@ -5,7 +5,9 @@
lib/qt5/plugins/krfb/
lib/qt5/plugins/krfb/events/
@so lib/qt5/plugins/krfb/events/x11.so
+@so lib/qt5/plugins/krfb/events/xdp.so
lib/qt5/plugins/krfb/framebuffer/
+@so lib/qt5/plugins/krfb/framebuffer/pw.so
@so lib/qt5/plugins/krfb/framebuffer/qt.so
@so lib/qt5/plugins/krfb/framebuffer/xcb.so
share/applications/org.kde.krfb.desktop
Index: spectacle/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/spectacle/Makefile,v
diff -u -p -r1.32 Makefile
--- spectacle/Makefile 28 Oct 2023 07:47:54 -0000 1.32
+++ spectacle/Makefile 27 Dec 2023 15:53:50 -0000
@@ -1,23 +1,20 @@
COMMENT = KDE screen capture and screenshot program
DISTNAME = spectacle-${VERSION}
CATEGORIES = x11
-# XXX Depends on KPipeWire (pipewire)
-VERSION = 22.12.3
-REVISION = 1
HOMEPAGE = https://apps.kde.org/spectacle/
-WANTLIB += ${COMPILER_LIBCXX} KF5Attica KF5Auth KF5AuthCore KF5Codecs
-WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
-WANTLIB += KF5CoreAddons KF5DBusAddons KF5GlobalAccel KF5GuiAddons
-WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui KF5KIOWidgets
-WANTLIB += KF5NewStuff KF5NewStuffCore KF5Notifications KF5Purpose
-WANTLIB += KF5PurposeWidgets KF5Service KF5Solid KF5WaylandClient
-WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport Qt5Svg
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml X11 c kImageAnnotator
-WANTLIB += m xcb xcb-cursor xcb-image xcb-render xcb-shape xcb-shm
-WANTLIB += xcb-util xcb-xfixes
+WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
+WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
+WANTLIB += KF5DBusAddons KF5GlobalAccel KF5GuiAddons KF5I18n KF5JobWidgets
+WANTLIB += KF5KIOCore KF5KIOGui KF5KIOWidgets KF5Kirigami2 KF5Notifications
+WANTLIB += KF5Purpose KF5PurposeWidgets KF5Service KF5Solid KF5WidgetsAddons
+WANTLIB += KF5WindowSystem KF5XmlGui KPipeWire KPipeWireRecord
+WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2 Qt5QuickTemplates2
+WANTLIB += Qt5WaylandClient Qt5Widgets Qt5X11Extras Qt5Xml X11
+WANTLIB += c m wayland-client xcb xcb-cursor xcb-image xcb-render
+WANTLIB += xcb-shape xcb-shm xcb-util xcb-xfixes
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -26,9 +23,7 @@ MODKDE5_DOCS = yes
MODULES += lang/python
-LIB_DEPENDS = graphics/kimageannotator>=0.6.0 \
- devel/kf5/attica \
- devel/kf5/kauth \
+LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kcodecs \
devel/kf5/kcompletion \
devel/kf5/kconfig \
@@ -38,14 +33,15 @@ LIB_DEPENDS = graphics/kimageannotator>=
devel/kf5/ki18n \
devel/kf5/kio \
devel/kf5/kjobwidgets \
- devel/kf5/knewstuff \
devel/kf5/knotifications \
devel/kf5/kservice \
devel/kf5/kwidgetsaddons \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
devel/kf5/purpose \
- devel/kf5/kwayland \
+ devel/kf5/kirigami2 \
+ x11/qt5/qtquickcontrols2 \
+ x11/kde-plasma/kpipewire \
x11/qt5/qtx11extras
post-install:
Index: spectacle/distinfo
===================================================================
RCS file: /cvs/ports/x11/kde-applications/spectacle/distinfo,v
diff -u -p -r1.17 distinfo
--- spectacle/distinfo 8 Mar 2023 20:43:37 -0000 1.17
+++ spectacle/distinfo 27 Dec 2023 15:53:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (kde-applications/spectacle-22.12.3.tar.xz) =
SX5LcfTKOyBFYhOmbbPNKzHDwwQMkkqm/CsFMEcXzQc=
-SIZE (kde-applications/spectacle-22.12.3.tar.xz) = 1272768
+SHA256 (kde-applications/spectacle-23.08.4.tar.xz) =
eGXlPUMRVRtRqVugpVp4BYUY0biTjSBZ5vrODC4AzRM=
+SIZE (kde-applications/spectacle-23.08.4.tar.xz) = 1352620
Index: spectacle/patches/patch-src_QuickEditor_QuickEditor_cpp
===================================================================
RCS file: spectacle/patches/patch-src_QuickEditor_QuickEditor_cpp
diff -N spectacle/patches/patch-src_QuickEditor_QuickEditor_cpp
--- spectacle/patches/patch-src_QuickEditor_QuickEditor_cpp 11 Mar 2022
20:16:32 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Unbreak build wild Qt 5.15.2
-
-Index: src/QuickEditor/QuickEditor.cpp
---- src/QuickEditor/QuickEditor.cpp.orig
-+++ src/QuickEditor/QuickEditor.cpp
-@@ -9,6 +9,7 @@
- #include "ComparableQPoint.h"
- #include "settings.h"
-
-+#include <QPainterPath>
- #include <KLocalizedString>
- #include <KWayland/Client/plasmashell.h>
- #include <KWayland/Client/surface.h>
Index: spectacle/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde-applications/spectacle/pkg/PLIST,v
diff -u -p -r1.12 PLIST
--- spectacle/pkg/PLIST 18 Dec 2022 09:11:10 -0000 1.12
+++ spectacle/pkg/PLIST 27 Dec 2023 15:53:50 -0000
@@ -77,6 +77,7 @@ share/locale/da/LC_MESSAGES/spectacle.mo
share/locale/de/LC_MESSAGES/spectacle.mo
share/locale/el/LC_MESSAGES/spectacle.mo
share/locale/en_GB/LC_MESSAGES/spectacle.mo
+share/locale/eo/LC_MESSAGES/spectacle.mo
share/locale/es/LC_MESSAGES/spectacle.mo
share/locale/et/LC_MESSAGES/spectacle.mo
share/locale/eu/LC_MESSAGES/spectacle.mo
