On Sat Nov 06, 2021 at 08:19:29PM +0100, Rafael Sadowski wrote:
>
> Information for inst:kwayland-5.87.0
>
> Comment:
> Qt API to interact with the wayland-client and -server
>
> Required by:
> kscreenlocker-5.23.1
> libkscreen-5.23.1
>
> Description:
> KWayland provides two libraries:
>
> - KWayland::Client
> - KWayland::Server
>
> As the names suggest they implement a Client respectively a Server API for the
> Wayland protocol. The API is Qt-styled removing the needs to interact with a
> for a Qt developer uncomfortable low-level C-API. For example the callback
> mechanism from the Wayland API is replaced by signals; data types are adjusted
> to be what a Qt developer expects, e.g. two arguments of int are represented
> by
> a QPoint or a QSize.
>
> Maintainer: Rafael Sadowski <[email protected]>
>
> WWW: https://projects.kde.org/projects/frameworks/kwayland
>
> OK to import?
To test kwayland you need some more bits. The following diff unlocks
Wayland support in devel/kf5.
diff --git a/devel/kf5/Makefile b/devel/kf5/Makefile
index ba2c4cbe311..08614f4f152 100644
--- a/devel/kf5/Makefile
+++ b/devel/kf5/Makefile
@@ -78,6 +78,7 @@ SUBDIR += krunner
SUBDIR += qqc2-desktop-style
SUBDIR += purpose
SUBDIR += kdav
+SUBDIR += kwayland
# porting aids
SUBDIR += kxmlrpcclient
@@ -96,6 +97,5 @@ SUBDIR += frameworkintegration
# corresponding software isn't ported
#SUBDIR += modemmanager-qt
#SUBDIR += network-manager-qt
-#SUBDIR += kwayland
.include <bsd.port.subdir.mk>
diff --git a/devel/kf5/kguiaddons/Makefile b/devel/kf5/kguiaddons/Makefile
index ed7fa83c8b0..77f2030f2b3 100644
--- a/devel/kf5/kguiaddons/Makefile
+++ b/devel/kf5/kguiaddons/Makefile
@@ -2,16 +2,18 @@
COMMENT = Utilities for graphical user interfaces
DISTNAME = kguiaddons-${VERSION}
+REVISION = 0
-SHARED_LIBS = KF5GuiAddons 6.3
+SHARED_LIBS = KF5GuiAddons 6.4
WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Core Qt5Gui Qt5X11Extras
WANTLIB += SM X11 Xext m xcb
+RUN_DEPENDS = x11/qt5/qtwayland
+BUILD_DEPENDS = x11/qt5/qtwayland
+
LIB_DEPENDS = x11/qt5/qtx11extras
TEST_IS_INTERACTIVE = X11
-CONFIGURE_ARGS += -DWITH_WAYLAND=OFF
-
.include <bsd.port.mk>
diff --git a/devel/kf5/kguiaddons/pkg/PLIST b/devel/kf5/kguiaddons/pkg/PLIST
index 5fa69391664..eafcc4a32b5 100644
--- a/devel/kf5/kguiaddons/pkg/PLIST
+++ b/devel/kf5/kguiaddons/pkg/PLIST
@@ -27,12 +27,15 @@ include/KF5/KGuiAddons/kmodifierkeyinfo.h
include/KF5/KGuiAddons/kmodifierkeyinfoprovider_p.h
include/KF5/KGuiAddons/kwordwrap.h
include/KF5/kguiaddons_version.h
+lib/cmake/
lib/cmake/KF5GuiAddons/
lib/cmake/KF5GuiAddons/KF5GuiAddonsConfig.cmake
lib/cmake/KF5GuiAddons/KF5GuiAddonsConfigVersion.cmake
lib/cmake/KF5GuiAddons/KF5GuiAddonsTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/KF5GuiAddons/KF5GuiAddonsTargets.cmake
@lib lib/libKF5GuiAddons.so.${LIBKF5GuiAddons_VERSION}
+lib/qt5/
+lib/qt5/plugins/
lib/qt5/plugins/kf5/
lib/qt5/plugins/kf5/kguiaddons/
lib/qt5/plugins/kf5/kguiaddons/kmodifierkey/
diff --git a/devel/kf5/plasma-framework/Makefile
b/devel/kf5/plasma-framework/Makefile
index 67f72a269a9..b79224ebf25 100644
--- a/devel/kf5/plasma-framework/Makefile
+++ b/devel/kf5/plasma-framework/Makefile
@@ -3,8 +3,8 @@
COMMENT = core components and tools of the Plasma Workspaces
DISTNAME = plasma-framework-${VERSION}
-SHARED_LIBS = KF5Plasma 10.1
-SHARED_LIBS += KF5PlasmaQuick 7.2
+SHARED_LIBS = KF5Plasma 11.0
+SHARED_LIBS += KF5PlasmaQuick 8.0
WANTLIB += ${COMPILER_LIBCXX} EGL ICE KF5Activities KF5Archive
WANTLIB += KF5Auth KF5AuthCore KF5CalendarEvents KF5Codecs KF5Completion
@@ -12,11 +12,12 @@ WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
KF5CoreAddons
WANTLIB += KF5Declarative KF5GlobalAccel KF5GuiAddons KF5I18n
WANTLIB += KF5IconThemes KF5JobWidgets KF5KIOCore KF5KIOGui KF5KIOWidgets
WANTLIB += KF5Kirigami2 KF5Notifications KF5Package KF5QuickAddons
-WANTLIB += KF5Service KF5Solid KF5WidgetsAddons KF5WindowSystem
-WANTLIB += KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network
-WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5Sql Qt5Svg Qt5Widgets
-WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext c m xcb xcb-composite
-WANTLIB += xcb-damage xcb-render xcb-shape xcb-xfixes
+WANTLIB += KF5Service KF5Solid KF5WaylandClient KF5WidgetsAddons
+WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
+WANTLIB += Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5Sql
+WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xml SM X11 Xext c
+WANTLIB += m xcb xcb-composite xcb-damage xcb-render xcb-shape
+WANTLIB += xcb-xfixes
BUILD_DEPENDS = archivers/bzip2 \
devel/gettext,-tools \
@@ -26,12 +27,14 @@ BUILD_DEPENDS = archivers/bzip2 \
devel/kf5/kirigami2>=${MODKF5_VERSION} \
devel/kf5/kparts>=${MODKF5_VERSION} \
devel/kf5/solid>=${MODKF5_VERSION} \
+ x11/qt5/qtwayland \
x11/qt5/qtquickcontrols
RUN_DEPENDS = archivers/bzip2 \
devel/kf5/kdbusaddons>=${MODKF5_VERSION} \
devel/kf5/kdoctools>=${MODKF5_VERSION} \
devel/kf5/oxygen-icons>=${MODKF5_VERSION} \
+ x11/qt5/qtwayland \
x11/qt5/qtquickcontrols
LIB_DEPENDS = devel/kf5/kactivities>=${MODKF5_VERSION} \
@@ -52,12 +55,12 @@ LIB_DEPENDS =
devel/kf5/kactivities>=${MODKF5_VERSION} \
devel/kf5/kwidgetsaddons>=${MODKF5_VERSION} \
devel/kf5/kwindowsystem>=${MODKF5_VERSION} \
devel/kf5/kxmlgui>=${MODKF5_VERSION} \
+ devel/kf5/kwayland>=${MODKF5_VERSION} \
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qtx11extras
-CONFIGURE_ARGS += -DBUILD_EXAMPLES=ON \
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5Wayland=ON
+CONFIGURE_ARGS += -DBUILD_EXAMPLES=ON
# TODO: The following tests FAILED (some dependencies missing?):
# 1 - plasma-dialogqmltest (Failed)
