diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile index 17602450cfbb..52f5b6beb89b 100644 --- a/x11/plasma5-plasma-workspace/Makefile +++ b/x11/plasma5-plasma-workspace/Makefile @@ -1,58 +1,59 @@ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 Plasma workspace LIB_DEPENDS= libcln.so:math/cln \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libqalculate.so:math/libqalculate \ libwayland-client.so:graphics/wayland \ libxcb-image.so:x11/xcb-util-image \ libxcb-util.so:x11/xcb-util RUN_DEPENDS= ck-launch-session:sysutils/consolekit2\ iceauth:x11/iceauth \ xmessage:x11/xmessage \ xrdb:x11/xrdb \ xset:x11/xset \ xsetroot:x11/xsetroot \ ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config \ iso-codes>=0:misc/iso-codes \ ${LOCALBASE}/bin/genv:sysutils/coreutils USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \ pkgconfig qt:5 tar:xz xorg USE_KDE= activities activities-stats activitymanagerd archive attica \ auth baloo bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons emoticons filemetadata globalaccel \ guiaddons holidays i18n iconthemes idletime init itemmodels \ itemviews jobwidgets js jsembed kcmutils kdeclarative kdesu \ kdewebkit kio kscreenlocker kwin libkscreen libksysguard \ newstuff notifications notifyconfig package parts people \ plasma-framework plasma-integration prison pty runner service \ solid sonnet texteditor textwidgets unitconversion wallet \ wayland widgetsaddons windowsystem xmlgui xmlrpcclient \ doctools_build ecm_build \ breeze-icons_run breeze_run kded_run kquickcharts_run \ milou_run oxygen-icons5_run USE_QT= concurrent core dbus declarative graphicaleffects gui network \ phonon4 printsupport qdbus script sql svg wayland webkit \ widgets x11extras xml \ buildtools_build qmake_build testlib_build \ paths_run quickcontrols_run USE_XORG= ice sm x11 xau xcb xcomposite xcursor xext xfixes xft xkbfile xrender xtst CPE_VENDOR= kde CMAKE_OFF= BUILD_TESTING # In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace: CONFLICTS_INSTALL= plasma5-plasma-desktop-5.14.* post-stage: ${INSTALL_SCRIPT} ${FILESDIR}/startplasma-wayland.sh ${STAGEDIR}/${LOCALBASE}/bin/ .include diff --git a/x11/plasma5-plasma-workspace/files/startplasma-wayland.sh b/x11/plasma5-plasma-workspace/files/startplasma-wayland.sh index b94c59f82efa..7f91ce9a10d5 100755 --- a/x11/plasma5-plasma-workspace/files/startplasma-wayland.sh +++ b/x11/plasma5-plasma-workspace/files/startplasma-wayland.sh @@ -1,66 +1,66 @@ #! /bin/sh # # Try to run a Plasma Wayland session; to be invoked from a text console. # This script is far longer than it needs to be, because it documents # all kinds of settings that you **might** want to set for specific # use-cases or testing. ### TOOLKIT SETTINGS # # Force toolkits to use wayland. # - MOZ is for Firefox # - GDK is for GDK, will crash non-Wayland GDK-users like emacs # - QPA is for Qt, forces EGL, causes graphics glitches # export MOZ_ENABLE_WAYLAND=1 # export GDK_BACKEND=wayland # export QT_QPA_PLATFORM=wayland-egl ### DRIVER SETTINGS # # Some (older) Intel HD iGPU need this: # export LIBVA_DRIVER_NAME=i965 ### XDG SETTINGS # # # export XDG_SESSION_TYPE=wayland ### KDE / Plasma / Qt SETTINGS # # # To switch on software rendering: # export KWIN_COMPOSE=Q # Disable client-side-decorations: # export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # To log debug things: # export QT_LOGGING_RULES="kwin_core.debug=true;kwin_libinput.debug=true" # To log to a specific file (recommended if you're using the logging rules # and want to debug startup problems): # LOGFILE=/tmp/plasma-wayland.log ### STARTUP SEQUENCE # # Plasma needs a DBus session-bus, and it needs to have access to # the DRM GPU (e.g. to /dev/dri/card0) which we arrange through # ConsoleKit2. # scaffolding="ck-launch-session" if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then scaffolding="$scaffolding dbus-run-session" fi startup_dir=`/usr/bin/dirname "$0"` startup_exe=`/usr/bin/basename "$0" .sh` -if [ -z "$LOGFILE" ] ; then +if [ -n "$LOGFILE" ] ; then { echo "Starting KDE Plasma Wayland from PID $$" echo "XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR" echo "scaffolding=$scaffolding" echo "startup=$startup_dir/$startup_exe" } > $LOGFILE - exec $scaffolding $startup_dir/$startup_exe 2>&1 | tee -a $LOG + exec $scaffolding $startup_dir/$startup_exe 2>&1 | tee -a $LOGFILE else exec $scaffolding $startup_dir/$startup_exe fi