diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2017-09-15 15:12:44 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2017-09-15 15:12:44 +0800 |
| commit | ab1f40794d9dbcc1388a9257d285362f52f74596 (patch) | |
| tree | 2a6a7e2dc039c429914eaca76a443556bf403df2 /x11 | |
| parent | fd6770ac21bfbaf4055314e3e44262e074d8043b (diff) | |
| parent | 26f34f6d62441f81a8d0d43f1908a496c283ee05 (diff) | |
| download | freebsd-ports-gnome-gnome-3.24.tar.gz freebsd-ports-gnome-gnome-3.24.tar.zst freebsd-ports-gnome-gnome-3.24.zip | |
Merge branch 'master' into gnome-3.24gnome-3.24
Diffstat (limited to 'x11')
49 files changed, 580 insertions, 21 deletions
diff --git a/x11/Makefile b/x11/Makefile index 9ea9ad840bc8..0b5eb11c77b4 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -296,6 +296,7 @@ SUBDIR += screen-message SUBDIR += scripts SUBDIR += scrnsaverproto + SUBDIR += sddm SUBDIR += sessreg SUBDIR += setlayout SUBDIR += setxkbmap diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index a3e3ba7c1273..94f51d211f80 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon PORTVERSION= 2.4.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 diff --git a/x11/cl-clx-sbcl/Makefile b/x11/cl-clx-sbcl/Makefile index 16124d288d56..0df49df99771 100644 --- a/x11/cl-clx-sbcl/Makefile +++ b/x11/cl-clx-sbcl/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= clx -PORTVERSION= 0.7.4 +DISTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= x11 lisp PKGNAMEPREFIX= cl- PKGNAMESUFFIX= -sbcl diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile index e856bf83a252..286c407a5fd7 100644 --- a/x11/cool-retro-term/Makefile +++ b/x11/cool-retro-term/Makefile @@ -3,7 +3,7 @@ PORTNAME= cool-retro-term PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= x11 diff --git a/x11/dsbautostart/Makefile b/x11/dsbautostart/Makefile index 8f6560237ea0..eae549152399 100644 --- a/x11/dsbautostart/Makefile +++ b/x11/dsbautostart/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= dsbautostart -PORTVERSION= 1.0.2 +PORTVERSION= 1.1 CATEGORIES= x11 MASTER_SITES= http://freeshell.de/~mk/download/ @@ -14,6 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= tar:tgz qmake USE_GL= gl -USE_QT5= buildtools_build core gui linguisttools widgets +USE_QT5= buildtools_build core gui linguisttools_build widgets .include <bsd.port.mk> diff --git a/x11/dsbautostart/distinfo b/x11/dsbautostart/distinfo index d86995931145..912b1e8f4e9c 100644 --- a/x11/dsbautostart/distinfo +++ b/x11/dsbautostart/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502017745 -SHA256 (dsbautostart-1.0.2.tgz) = 3912f3680a50d7ff1ed3104117c2fb6af5cc34830f149c744d5903e80a4b81be -SIZE (dsbautostart-1.0.2.tgz) = 14472 +TIMESTAMP = 1504432503 +SHA256 (dsbautostart-1.1.tgz) = 0be3a153eca44e2a16596670c1a2abbae97a742dec2da1fd990966feb4cc38dc +SIZE (dsbautostart-1.1.tgz) = 16406 diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index f507efbe7668..c6c642420e89 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -3,7 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.93.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/x11/enventor/Makefile b/x11/enventor/Makefile index 2825a2c70f79..fd2a0b529a5d 100644 --- a/x11/enventor/Makefile +++ b/x11/enventor/Makefile @@ -2,6 +2,7 @@ PORTNAME= enventor PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= x11 enlightenment MASTER_SITES= http://download.enlightenment.org/rel/apps/${PORTNAME}/ DIST_SUBDIR= enlightenment diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile index f1ab03a03ff2..c5e7d718f88b 100644 --- a/x11/kactivities/Makefile +++ b/x11/kactivities/Makefile @@ -2,7 +2,7 @@ PORTNAME= kactivities PORTVERSION= ${KDE4_ACTIVITIES_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= KDE/Attic/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile index 3f667197976d..4bba71593c55 100644 --- a/x11/kactivitymanagerd/Makefile +++ b/x11/kactivitymanagerd/Makefile @@ -2,7 +2,7 @@ PORTNAME= kactivitymanagerd PORTVERSION= ${KDE4_ACTIVITIES_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= KDE/Attic/${PORTVERSION}/src DISTNAME= kactivities-${PORTVERSION} diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index b17a7ca9a117..d82a33d95727 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -129,6 +129,9 @@ pre-configure: post-install: ${LN} -sf ${PREFIX}/bin/startkde ${STAGEDIR}${PREFIX}/bin/startkde4 +# Install kde4.desktop to launch kde4 via sddm. + ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions + ${INSTALL_DATA} ${FILESDIR}/kde4.desktop ${STAGEDIR}${PREFIX}/share/xsessions post-install-GSTREAMER-on: @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} diff --git a/x11/kde4-workspace/files/kde4.desktop b/x11/kde4-workspace/files/kde4.desktop new file mode 100644 index 000000000000..9b5bb888248d --- /dev/null +++ b/x11/kde4-workspace/files/kde4.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=/usr/local/bin/startkde +TryExec=/usr/local/bin/startkde +DesktopNames=KDE +Name=KDE4 diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 67c6f016eef8..c7fa75ee303f 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -2122,3 +2122,4 @@ share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy share/sounds/pop.wav share/wallpapers/stripes.png share/wallpapers/stripes.png.desktop +share/xsessions/kde4.desktop diff --git a/x11/kdelibs4/files/patch-git_57eaf65 b/x11/kdelibs4/files/patch-git_57eaf65 new file mode 100644 index 000000000000..19f5b5abc5fc --- /dev/null +++ b/x11/kdelibs4/files/patch-git_57eaf65 @@ -0,0 +1,33 @@ +From 57eaf65accb8d058644dc8eee7332e0ec0c1952f Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Thu, 20 Jul 2017 20:12:10 +0200 +Subject: [PATCH] [cmake]: De-duplicate "else" to fix build with cmake-3.9 + +Otherwise it errors out with: +"CMake Error at kdeui/CMakeLists.txt:316 (else): A duplicate ELSE +command was found inside an IF block." +Also adjust the indentation to match the surrounding lines and remove +the arguments from else() and endif(). +--- + kdeui/CMakeLists.txt | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git kdeui/CMakeLists.txt kdeui/CMakeLists.txt +index d6ec8b47e9..cadb52e713 100644 +--- kdeui/CMakeLists.txt ++++ kdeui/CMakeLists.txt +@@ -311,11 +311,9 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) + FIND_LIBRARY(SECURITY_LIBRARY Security) + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp util/qosxkeychain.cpp) + add_definitions(-DMAC_USE_OSXKEYCHAIN) +-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) +- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) +-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) +- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) +-endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) ++else() ++ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) ++endif() + + if(NOT WINCE) + set(kdeui_LIB_SRCS diff --git a/x11/kf5-frameworkintegration/Makefile b/x11/kf5-frameworkintegration/Makefile index b3318481182c..1462a56a5b3c 100644 --- a/x11/kf5-frameworkintegration/Makefile +++ b/x11/kf5-frameworkintegration/Makefile @@ -3,6 +3,7 @@ PORTNAME= frameworkintegration PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kactivities/Makefile b/x11/kf5-kactivities/Makefile index c81e1f155ae6..0b017c694ab6 100644 --- a/x11/kf5-kactivities/Makefile +++ b/x11/kf5-kactivities/Makefile @@ -3,6 +3,7 @@ PORTNAME= kactivities PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kded/Makefile b/x11/kf5-kded/Makefile index 42fc48df01f2..bceb7aacbca8 100644 --- a/x11/kf5-kded/Makefile +++ b/x11/kf5-kded/Makefile @@ -3,6 +3,7 @@ PORTNAME= kded PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kdelibs4support/Makefile b/x11/kf5-kdelibs4support/Makefile index 2f4a05eef3a8..90fe4f86c12e 100644 --- a/x11/kf5-kdelibs4support/Makefile +++ b/x11/kf5-kdelibs4support/Makefile @@ -3,6 +3,7 @@ PORTNAME= kdelibs4support PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kglobalaccel/Makefile b/x11/kf5-kglobalaccel/Makefile index 6f8ce5c7aa7c..02f0e84df0d2 100644 --- a/x11/kf5-kglobalaccel/Makefile +++ b/x11/kf5-kglobalaccel/Makefile @@ -3,6 +3,7 @@ PORTNAME= kglobalaccel PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kinit/Makefile b/x11/kf5-kinit/Makefile index e94adbef427c..7b2ebd8e22fb 100644 --- a/x11/kf5-kinit/Makefile +++ b/x11/kf5-kinit/Makefile @@ -3,6 +3,7 @@ PORTNAME= kinit PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile index dc630718abf3..fb90640932f7 100644 --- a/x11/kf5-krunner/Makefile +++ b/x11/kf5-krunner/Makefile @@ -3,6 +3,7 @@ PORTNAME= krunner PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kwayland/Makefile b/x11/kf5-kwayland/Makefile index 35f4b71dfee9..999d3d045fd9 100644 --- a/x11/kf5-kwayland/Makefile +++ b/x11/kf5-kwayland/Makefile @@ -3,6 +3,7 @@ PORTNAME= kwayland PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-kwindowsystem/Makefile b/x11/kf5-kwindowsystem/Makefile index 4c6356787f75..5186d6011f8d 100644 --- a/x11/kf5-kwindowsystem/Makefile +++ b/x11/kf5-kwindowsystem/Makefile @@ -3,6 +3,7 @@ PORTNAME= kwindowsystem PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/kf5-plasma-framework/Makefile b/x11/kf5-plasma-framework/Makefile index 301dfe430869..c8659abcb200 100644 --- a/x11/kf5-plasma-framework/Makefile +++ b/x11/kf5-plasma-framework/Makefile @@ -3,6 +3,7 @@ PORTNAME= plasma-framework PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11/lemonbar/Makefile b/x11/lemonbar/Makefile index 12ff067b4af3..a140a1f78f45 100644 --- a/x11/lemonbar/Makefile +++ b/x11/lemonbar/Makefile @@ -3,7 +3,7 @@ PORTNAME= lemonbar PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX=v CATEGORIES= x11 diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile index 4d9be0e67756..500fa6f77b77 100644 --- a/x11/libfm-qt/Makefile +++ b/x11/libfm-qt/Makefile @@ -3,7 +3,7 @@ PORTNAME= libfm-qt PORTVERSION= 0.11.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= LXQT/${PORTNAME} diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index ff73c0588a23..09e04e4da0ca 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -4,7 +4,7 @@ PORTNAME= libgnomemm PORTVERSION= 2.30.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile index ac27f3d1e8c9..014f42884f2e 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -3,7 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ diff --git a/x11/qterminal/Makefile b/x11/qterminal/Makefile index 7b6942c40ee4..c7e2ed32ae4d 100644 --- a/x11/qterminal/Makefile +++ b/x11/qterminal/Makefile @@ -3,7 +3,7 @@ PORTNAME= qterminal PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= bacon4000@gmail.com diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile new file mode 100644 index 000000000000..f99aa29e2bd8 --- /dev/null +++ b/x11/sddm/Makefile @@ -0,0 +1,46 @@ +# $FreeBSD$ + +PORTNAME= sddm +PORTVERSION= 0.14.0 +DISTVERSIONPREFIX= v +CATEGORIES= x11 + +MAINTAINER= kde@FreeBSD.org +COMMENT= QML based login manager + +USES= cmake:outsource desktop-file-utils kde:5 +USE_KDE= ecm +USE_QT5= concurrent core dbus gui linguisttools multimedia network \ + printsupport qml quick script sql webkit widgets \ + buildtools_build qmake_build +USE_XORG= xcb + +CMAKE_ARGS= -DUID_MIN=1000 \ + -DUID_MAX=65000 \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc +# We need to disable PAM at the moment and use the passwd-based backend; +# the two backend are mutually exclusive, and we have to investigate how +# to make it compatible with OpenPAM. +CMAKE_ARGS+= -DENABLE_PAM:BOOL=FALSE + +USE_RC_SUBR= sddm + +USERS= sddm +GROUPS= sddm + +USE_GITHUB= yes + +post-patch: +# Patch in the correct location for X11 startup files, and make the session start +# script of sddm use the value of ${STARTUP} defined by 90-consolekit + ${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#g' \ + -e '/exec.*session/s#exec#exec $${STARTUP}#g' \ + ${PATCH_WRKSRC}/data/scripts/Xsession + +post-install: +# Install xsession.desktop to launch .xinitrc via sddm. + ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions + ${INSTALL_DATA} ${FILESDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions + ${INSTALL_SCRIPT} ${FILESDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts + +.include <bsd.port.mk> diff --git a/x11/sddm/distinfo b/x11/sddm/distinfo new file mode 100644 index 000000000000..ac69c1466563 --- /dev/null +++ b/x11/sddm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1488014449 +SHA256 (sddm-sddm-v0.14.0_GH0.tar.gz) = a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205 +SIZE (sddm-sddm-v0.14.0_GH0.tar.gz) = 3367582 diff --git a/x11/sddm/files/patch-CMakeLists.txt b/x11/sddm/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2a7e3aa57836 --- /dev/null +++ b/x11/sddm/files/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +1) On FreeBSD X is normally started on VT9. +2) The shutdown command uses '-p' and not '-P' on FreeBSD. + +--- CMakeLists.txt.orig 2016-08-28 11:54:03 UTC ++++ CMakeLists.txt +@@ -143,8 +143,8 @@ if(SYSTEMD_FOUND) + set(REBOOT_COMMAND "/usr/bin/systemctl reboot") + else() + set(SYSTEMD_FOUND 0) +- set(MINIMUM_VT 7) +- set(HALT_COMMAND "/sbin/shutdown -h -P now") ++ set(MINIMUM_VT 9) ++ set(HALT_COMMAND "/sbin/shutdown -h -p now") + set(REBOOT_COMMAND "/sbin/shutdown -r now") + endif() + add_feature_info("systemd" SYSTEMD_FOUND "systemd support") diff --git a/x11/sddm/files/patch-src_common_Configuration.h b/x11/sddm/files/patch-src_common_Configuration.h new file mode 100644 index 000000000000..b166b904512c --- /dev/null +++ b/x11/sddm/files/patch-src_common_Configuration.h @@ -0,0 +1,39 @@ +Modify the default configuration to fit in to FreeBSD. That is replace '/usr/bin' +with '/usr/local/bin' and so on. +The setting of '$PATH' I find a bit dumb... this should respect the values of the +users profile... + +--- src/common/Configuration.h.orig 2016-08-28 11:54:03 UTC ++++ src/common/Configuration.h +@@ -58,11 +58,11 @@ namespace SDDM { + + // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal + Section(X11, +- Entry(ServerPath, QString, _S("/usr/bin/X"), _S("Path to X server binary")); ++ Entry(ServerPath, QString, _S("/usr/local/bin/X"), _S("Path to X server binary")); + Entry(ServerArguments, QString, _S("-nolisten tcp"), _S("Arguments passed to the X server invocation")); +- Entry(XephyrPath, QString, _S("/usr/bin/Xephyr"), _S("Path to Xephyr binary")); +- Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Path to xauth binary")); +- Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Directory containing available X sessions")); ++ Entry(XephyrPath, QString, _S("/usr/local/bin/Xephyr"), _S("Path to Xephyr binary")); ++ Entry(XauthPath, QString, _S("/usr/local/bin/xauth"), _S("Path to xauth binary")); ++ Entry(SessionDir, QString, _S("/usr/local/share/xsessions"), _S("Directory containing available X sessions")); + Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); + Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file")); + Entry(UserAuthFile, QString, _S(".Xauthority"), _S("Path to the Xauthority file")); +@@ -72,13 +72,13 @@ namespace SDDM { + ); + + Section(Wayland, +- Entry(SessionDir, QString, _S("/usr/share/wayland-sessions"), _S("Directory containing available Wayland sessions")); ++ Entry(SessionDir, QString, _S("/usr/local/share/wayland-sessions"), _S("Directory containing available Wayland sessions")); + Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); + Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file")); + ); + + Section(Users, +- Entry(DefaultPath, QString, _S("/bin:/usr/bin:/usr/local/bin"), _S("Default $PATH for logged in users")); ++ Entry(DefaultPath, QString, _S("/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"), _S("Default $PATH for logged in users")); + Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users")); + Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users")); + Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed")); diff --git a/x11/sddm/files/patch-src_daemon_CMakeLists.txt b/x11/sddm/files/patch-src_daemon_CMakeLists.txt new file mode 100644 index 000000000000..6e4e688fe83c --- /dev/null +++ b/x11/sddm/files/patch-src_daemon_CMakeLists.txt @@ -0,0 +1,23 @@ +This patch does two things: +1) Add the include directories for 'libxcb' to the compiler search directories, +2) Remove VirtualTerminal.cpp from the sources that need to be built. + see also 'patch-src_daemon_Display.cpp' + +--- src/daemon/CMakeLists.txt.orig 2016-08-28 11:54:03 UTC ++++ src/daemon/CMakeLists.txt +@@ -3,6 +3,7 @@ include_directories( + "${CMAKE_SOURCE_DIR}/src/auth" + ) + include_directories("${CMAKE_BINARY_DIR}/src/common") ++include_directories("${LIBXCB_INCLUDE_DIR}") + + set(DAEMON_SOURCES + ${CMAKE_SOURCE_DIR}/src/common/Configuration.cpp +@@ -26,7 +27,6 @@ set(DAEMON_SOURCES + SeatManager.cpp + SignalHandler.cpp + SocketServer.cpp +- VirtualTerminal.cpp + ) + + qt5_add_dbus_adaptor(DAEMON_SOURCES "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.DisplayManager.xml" "DisplayManager.h" SDDM::DisplayManager) diff --git a/x11/sddm/files/patch-src_daemon_Display.cpp b/x11/sddm/files/patch-src_daemon_Display.cpp new file mode 100644 index 000000000000..548b57f5d031 --- /dev/null +++ b/x11/sddm/files/patch-src_daemon_Display.cpp @@ -0,0 +1,39 @@ +VirtualTerminal for Wayland is only present on Linux at the moment. +As we are only interested in an X11 session at the moment, we therefore +can hide it behind a Q_OS_LINUX. + +--- src/daemon/Display.cpp.orig 2016-08-28 11:54:03 UTC ++++ src/daemon/Display.cpp +@@ -30,7 +30,9 @@ + #include "Greeter.h" + #include "Utils.h" + #include "SignalHandler.h" ++#if defined(Q_OS_LINUX) + #include "VirtualTerminal.h" ++#endif + + #include <QDebug> + #include <QFile> +@@ -280,8 +282,10 @@ namespace SDDM { + + // create new VT for Wayland sessions otherwise use greeter vt + int vt = terminalId(); ++#if defined(Q_OS_LINUX) + if (session.xdgSessionType() == QLatin1String("wayland")) + vt = VirtualTerminal::setUpNewVt(); ++#endif + m_lastSession.setVt(vt); + + QProcessEnvironment env; +@@ -321,9 +325,11 @@ namespace SDDM { + stateConfig.Last.Session.setDefault(); + stateConfig.save(); + ++#if defined(Q_OS_LINUX) + // switch to the new VT for Wayland sessions + if (m_lastSession.xdgSessionType() == QLatin1String("wayland")) + VirtualTerminal::jumpToVt(m_lastSession.vt()); ++#endif + + if (m_socket) + emit loginSucceeded(m_socket); diff --git a/x11/sddm/files/patch-src_greeter_UserModel.cpp b/x11/sddm/files/patch-src_greeter_UserModel.cpp new file mode 100644 index 000000000000..421c946818f5 --- /dev/null +++ b/x11/sddm/files/patch-src_greeter_UserModel.cpp @@ -0,0 +1,12 @@ +Call 'setpwent' to rewind to the beginning of the passwd database. + +--- src/greeter/UserModel.cpp.orig 2016-07-10 21:26:13 UTC ++++ src/greeter/UserModel.cpp +@@ -55,6 +55,7 @@ namespace SDDM { + const QString defaultFace = QStringLiteral("%1/.face.icon").arg(facesDir); + + struct passwd *current_pw; ++ setpwent(); + while ((current_pw = getpwent()) != nullptr) { + + // skip entries with uids smaller than minimum uid diff --git a/x11/sddm/files/patch-src_helper_UserSession.cpp b/x11/sddm/files/patch-src_helper_UserSession.cpp new file mode 100644 index 000000000000..b89fbd121a76 --- /dev/null +++ b/x11/sddm/files/patch-src_helper_UserSession.cpp @@ -0,0 +1,12 @@ +Include '<errno.h>' as 'errno' is used. + +--- src/helper/UserSession.cpp.orig 2016-07-06 14:00:10 UTC ++++ src/helper/UserSession.cpp +@@ -25,6 +25,7 @@ + + #include <sys/types.h> + #include <sys/ioctl.h> ++#include <errno.h> + #include <unistd.h> + #include <pwd.h> + #include <grp.h> diff --git a/x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp b/x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp new file mode 100644 index 000000000000..f356b30c74ba --- /dev/null +++ b/x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp @@ -0,0 +1,46 @@ +Implement password authentication on FreeBSD. +This needs review :) + +--- src/helper/backend/PasswdBackend.cpp.orig 2016-07-06 14:00:10 UTC ++++ src/helper/backend/PasswdBackend.cpp +@@ -27,8 +27,13 @@ + + #include <sys/types.h> + #include <pwd.h> ++#if defined(Q_OS_LINUX) + #include <shadow.h> + #include <crypt.h> ++#endif ++#if defined(Q_OS_FREEBSD) ++#include <unistd.h> ++#endif + + namespace SDDM { + PasswdBackend::PasswdBackend(HelperApp *parent) +@@ -72,6 +77,17 @@ namespace SDDM { + return false; + } + ++#if defined(Q_OS_FREEBSD) ++ if (!*pw->pw_passwd) ++ { ++ //empty password ++ return true; ++ } ++ char *crypted = crypt(qPrintable(password), pw->pw_passwd); ++ if (0 == strcmp(crypted, pw->pw_passwd)) { ++ return true; ++ } ++#else + struct spwd *spw = getspnam(pw->pw_name); + if (!spw) { + qWarning() << "[Passwd] Could get passwd but not shadow"; +@@ -85,7 +101,7 @@ namespace SDDM { + if (0 == strcmp(crypted, spw->sp_pwdp)) { + return true; + } +- ++#endif + m_app->error(QStringLiteral("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); + return false; + } diff --git a/x11/sddm/files/sddm.in b/x11/sddm/files/sddm.in new file mode 100644 index 000000000000..8855b0f60a97 --- /dev/null +++ b/x11/sddm/files/sddm.in @@ -0,0 +1,75 @@ +#!/bin/sh +# $FreeBSD$ +# +# PROVIDE: sddm +# REQUIRE: LOGIN cleanvar moused syscons dbus hald +# KEYWORD: shutdown +# +# Add the following to /etc/rc.conf to start SDDM at boot time: +# +# sddm_enable="YES" + +. /etc/rc.subr + +name=sddm +rcvar=sddm_enable + +load_rc_config ${name} + +: ${sddm_lang="en_US"} # .UTF-8 suffix will be added later to comply with locale format + +command="/usr/local/bin/sddm" +pidfile="/var/run/sddm.pid" +start_cmd="sddm_start" +stop_cmd="sddm_stop" + +# Creates /etc/sddm.conf after `sddm --example-config` if it's not there already. +sddm_genconf() +{ + if [ ! -r /etc/sddm.conf ]; then + echo "Generating SDDM configuration." + ${command} --example-config > /etc/sddm.conf + fi +} + +sddm_start() +{ + echo "Starting ${name}." + local iter + sddm_genconf + + ( iter=0 + while ! ps -axoargs | grep "^/usr/libexec/getty" | grep -qv grep > /dev/null 2>&1; do + if [ ${iter} -eq 60 ]; then + break + fi + sleep 1 + iter=$((${iter} + 1)) + done + + if checkyesno hald_enable; then + if [ ! -x /usr/local/sbin/hald ]; then + err 1 "Hald does not seem to be installed." + fi + + iter=0 + while [ ${iter} -lt 60 ] && + !pgrep -f "^/usr/local/sbin/hald" > /dev/null 2>&1; do + sleep 1 + iter=$((${iter} + 1)) + done + fi + + LANG=${sddm_lang}.UTF-8 ${command} ${sddm_flags} ) & +} + +# Only takes the user back to the sddm screen when run from X +sddm_stop() +{ + echo "Stopping ${name}." + /bin/kill -9 $(/bin/cat "${pidfile}") + pkill -9 -U ${name} + pkill -9 X +} + +run_rc_command "$1" diff --git a/x11/sddm/files/xinit-session b/x11/sddm/files/xinit-session new file mode 100644 index 000000000000..804728c9ca53 --- /dev/null +++ b/x11/sddm/files/xinit-session @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Runs the user's .xinitrc (at this point, .xsession has already +# been sourced). + +RC="$HOME/.xinitrc" + +test -f "$RC" || exit 1 + +test -x "$RC" && exec "$RC" +test -f "$RC" && exec /bin/sh "$RC" + diff --git a/x11/sddm/files/xinitrc.desktop b/x11/sddm/files/xinitrc.desktop new file mode 100644 index 000000000000..72c266b4260f --- /dev/null +++ b/x11/sddm/files/xinitrc.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=/usr/local/share/sddm/scripts/xinit-session +TryExec=/usr/local/share/sddm/scripts/xinit-session +DesktopNames=User Session +Name=User Session diff --git a/x11/sddm/pkg-descr b/x11/sddm/pkg-descr new file mode 100644 index 000000000000..b3c4b7af0a63 --- /dev/null +++ b/x11/sddm/pkg-descr @@ -0,0 +1,3 @@ +QML based X11 and Wayland display manager. + +WWW: https://github.com/sddm/sddm diff --git a/x11/sddm/pkg-plist b/x11/sddm/pkg-plist new file mode 100644 index 000000000000..f9c9ac03a60f --- /dev/null +++ b/x11/sddm/pkg-plist @@ -0,0 +1,164 @@ +bin/sddm +bin/sddm-greeter +etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf +etc/pam.d/sddm +etc/pam.d/sddm-autologin +etc/pam.d/sddm-greeter +etc/sddm.conf +%%QT_QMLDIR%%/SddmComponents/Background.qml +%%QT_QMLDIR%%/SddmComponents/Button.qml +%%QT_QMLDIR%%/SddmComponents/Clock.qml +%%QT_QMLDIR%%/SddmComponents/ComboBox.qml +%%QT_QMLDIR%%/SddmComponents/ImageButton.qml +%%QT_QMLDIR%%/SddmComponents/LayoutBox.qml +%%QT_QMLDIR%%/SddmComponents/Menu.qml +%%QT_QMLDIR%%/SddmComponents/PasswordBox.qml +%%QT_QMLDIR%%/SddmComponents/PictureBox.qml +%%QT_QMLDIR%%/SddmComponents/TextBox.qml +%%QT_QMLDIR%%/SddmComponents/TextConstants.qml +%%QT_QMLDIR%%/SddmComponents/qmldir +%%QT_QMLDIR%%/SddmComponents/warning.png +libexec/sddm-helper +%%DATADIR%%/faces/.face.icon +%%DATADIR%%/faces/root.face.icon +%%DATADIR%%/flags/ae.png +%%DATADIR%%/flags/am.png +%%DATADIR%%/flags/ar.png +%%DATADIR%%/flags/at.png +%%DATADIR%%/flags/az.png +%%DATADIR%%/flags/be.png +%%DATADIR%%/flags/bg.png +%%DATADIR%%/flags/bh.png +%%DATADIR%%/flags/br.png +%%DATADIR%%/flags/by.png +%%DATADIR%%/flags/ca.png +%%DATADIR%%/flags/ch.png +%%DATADIR%%/flags/cu.png +%%DATADIR%%/flags/cz.png +%%DATADIR%%/flags/de.png +%%DATADIR%%/flags/dj.png +%%DATADIR%%/flags/dk.png +%%DATADIR%%/flags/dz.png +%%DATADIR%%/flags/ee.png +%%DATADIR%%/flags/eg.png +%%DATADIR%%/flags/es.png +%%DATADIR%%/flags/eu.png +%%DATADIR%%/flags/fi.png +%%DATADIR%%/flags/fr.png +%%DATADIR%%/flags/gb.png +%%DATADIR%%/flags/ge.png +%%DATADIR%%/flags/gr.png +%%DATADIR%%/flags/hr.png +%%DATADIR%%/flags/hu.png +%%DATADIR%%/flags/il.png +%%DATADIR%%/flags/in.png +%%DATADIR%%/flags/iq.png +%%DATADIR%%/flags/is.png +%%DATADIR%%/flags/it.png +%%DATADIR%%/flags/jo.png +%%DATADIR%%/flags/jp.png +%%DATADIR%%/flags/km.png +%%DATADIR%%/flags/kr.png +%%DATADIR%%/flags/kw.png +%%DATADIR%%/flags/la.png +%%DATADIR%%/flags/lb.png +%%DATADIR%%/flags/lt.png +%%DATADIR%%/flags/lv.png +%%DATADIR%%/flags/ly.png +%%DATADIR%%/flags/ma.png +%%DATADIR%%/flags/mk.png +%%DATADIR%%/flags/mn.png +%%DATADIR%%/flags/mx.png +%%DATADIR%%/flags/nl.png +%%DATADIR%%/flags/no.png +%%DATADIR%%/flags/om.png +%%DATADIR%%/flags/pl.png +%%DATADIR%%/flags/ps.png +%%DATADIR%%/flags/pt.png +%%DATADIR%%/flags/qa.png +%%DATADIR%%/flags/qc.png +%%DATADIR%%/flags/ro.png +%%DATADIR%%/flags/ru.png +%%DATADIR%%/flags/sa.png +%%DATADIR%%/flags/sd.png +%%DATADIR%%/flags/se.png +%%DATADIR%%/flags/si.png +%%DATADIR%%/flags/sk.png +%%DATADIR%%/flags/so.png +%%DATADIR%%/flags/sr.png +%%DATADIR%%/flags/sy.png +%%DATADIR%%/flags/th.png +%%DATADIR%%/flags/tn.png +%%DATADIR%%/flags/tr.png +%%DATADIR%%/flags/ua.png +%%DATADIR%%/flags/uk.png +%%DATADIR%%/flags/un.png +%%DATADIR%%/flags/us.png +%%DATADIR%%/flags/uy.png +%%DATADIR%%/flags/vn.png +%%DATADIR%%/flags/ye.png +%%DATADIR%%/flags/yu.png +%%DATADIR%%/flags/zz.png +%%DATADIR%%/scripts/Xsession +%%DATADIR%%/scripts/Xsetup +%%DATADIR%%/scripts/Xstop +%%DATADIR%%/scripts/wayland-session +%%DATADIR%%/scripts/xinit-session +%%DATADIR%%/themes/elarun/Main.qml +%%DATADIR%%/themes/elarun/README +%%DATADIR%%/themes/elarun/angle-down.png +%%DATADIR%%/themes/elarun/elarun.jpg +%%DATADIR%%/themes/elarun/images/background.png +%%DATADIR%%/themes/elarun/images/lock.png +%%DATADIR%%/themes/elarun/images/login_active.png +%%DATADIR%%/themes/elarun/images/login_normal.png +%%DATADIR%%/themes/elarun/images/rectangle.png +%%DATADIR%%/themes/elarun/images/rectangle_overlay.png +%%DATADIR%%/themes/elarun/images/session_normal.png +%%DATADIR%%/themes/elarun/images/system_hibernate.png +%%DATADIR%%/themes/elarun/images/system_reboot.png +%%DATADIR%%/themes/elarun/images/system_shutdown.png +%%DATADIR%%/themes/elarun/images/system_suspend.png +%%DATADIR%%/themes/elarun/images/system_switch_user.png +%%DATADIR%%/themes/elarun/images/user_icon.png +%%DATADIR%%/themes/elarun/metadata.desktop +%%DATADIR%%/themes/elarun/theme.conf +%%DATADIR%%/themes/maldives/LICENSE +%%DATADIR%%/themes/maldives/Main.qml +%%DATADIR%%/themes/maldives/README +%%DATADIR%%/themes/maldives/angle-down.png +%%DATADIR%%/themes/maldives/background.jpg +%%DATADIR%%/themes/maldives/maldives.jpg +%%DATADIR%%/themes/maldives/metadata.desktop +%%DATADIR%%/themes/maldives/rectangle.png +%%DATADIR%%/themes/maldives/theme.conf +%%DATADIR%%/translations/ar.qm +%%DATADIR%%/translations/ca.qm +%%DATADIR%%/translations/cs.qm +%%DATADIR%%/translations/de.qm +%%DATADIR%%/translations/es.qm +%%DATADIR%%/translations/et.qm +%%DATADIR%%/translations/fi.qm +%%DATADIR%%/translations/fr.qm +%%DATADIR%%/translations/hu.qm +%%DATADIR%%/translations/it.qm +%%DATADIR%%/translations/ja.qm +%%DATADIR%%/translations/ko.qm +%%DATADIR%%/translations/lt.qm +%%DATADIR%%/translations/lv.qm +%%DATADIR%%/translations/nb.qm +%%DATADIR%%/translations/nn.qm +%%DATADIR%%/translations/pl.qm +%%DATADIR%%/translations/pt_BR.qm +%%DATADIR%%/translations/pt_PT.qm +%%DATADIR%%/translations/ro.qm +%%DATADIR%%/translations/ru.qm +%%DATADIR%%/translations/sr.qm +%%DATADIR%%/translations/sr@ijekavian.qm +%%DATADIR%%/translations/sr@ijekavianlatin.qm +%%DATADIR%%/translations/sr@latin.qm +%%DATADIR%%/translations/sv.qm +%%DATADIR%%/translations/tr.qm +%%DATADIR%%/translations/zh_CN.qm +%%DATADIR%%/translations/zh_TW.qm +share/xsessions/xinitrc.desktop diff --git a/x11/terminology/Makefile b/x11/terminology/Makefile index cdec9c99a318..378338725757 100644 --- a/x11/terminology/Makefile +++ b/x11/terminology/Makefile @@ -3,7 +3,7 @@ PORTNAME= terminology PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 enlightenment MASTER_SITES= http://download.enlightenment.org/rel/apps/${PORTNAME}/ diff --git a/x11/thingylaunch/Makefile b/x11/thingylaunch/Makefile index 61591432140c..51296df7e13c 100644 --- a/x11/thingylaunch/Makefile +++ b/x11/thingylaunch/Makefile @@ -3,7 +3,7 @@ PORTNAME= thingylaunch PORTVERSION= 2.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://gahr.ch/thingylaunch/ diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile index 5d4c90c37bc1..11cff9a622de 100644 --- a/x11/tkXwin/Makefile +++ b/x11/tkXwin/Makefile @@ -10,6 +10,10 @@ MASTER_SITES= http://beepcore-tcl.sourceforge.net/ MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session +DEPRECATED= This port depends on Tcl/Tk 8.4 , which is no longer\ + maintained. Please port it to 8.5+ +EXPIRATION_DATE= 2017-10-15 + USES= libtool tk:84,tea tar:tgz USE_XORG= xt xscrnsaver USE_LDCONFIG= yes diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile index 309ce5b04c58..9c5bd32a2881 100644 --- a/x11/virtualgl/Makefile +++ b/x11/virtualgl/Makefile @@ -3,7 +3,7 @@ PORTNAME= virtualgl PORTVERSION= 2.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= VirtualGL-${PORTVERSION} diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index c06f3fc4785b..06175b96d15f 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -4,6 +4,7 @@ PORTNAME= workrave DISTVERSIONPREFIX= v DISTVERSION= 1_10_16 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 26cdbdd1b53c..745445f3711d 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -3,7 +3,7 @@ PORTNAME= xpra PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ |