diff options
Diffstat (limited to 'x11/budgie')
| -rw-r--r-- | x11/budgie/Makefile | 15 | ||||
| -rw-r--r-- | x11/budgie/files/pkg-message.in | 11 | ||||
| -rw-r--r-- | x11/budgie/files/xinitrc.in | 13 | ||||
| -rw-r--r-- | x11/budgie/files/xprofile.in | 48 | ||||
| -rw-r--r-- | x11/budgie/pkg-plist | 1 |
5 files changed, 35 insertions, 53 deletions
diff --git a/x11/budgie/Makefile b/x11/budgie/Makefile index 4902cbd47d9a..088b5e7c8297 100644 --- a/x11/budgie/Makefile +++ b/x11/budgie/Makefile @@ -1,15 +1,14 @@ PORTNAME= budgie -PORTVERSION= 10.8 +PORTVERSION= 10.9 CATEGORIES= x11 budgie MAINTAINER= duchateau.olivier@gmail.com COMMENT= Meta-port for the Budgie Desktop Environment -WWW= https://blog.buddiesofbudgie.org/ +WWW= https://buddiesofbudgie.org/ -RUN_DEPENDS= budgie-desktop>0:x11/budgie-desktop \ +RUN_DEPENDS= budgie-desktop:x11/budgie-desktop \ budgie-desktop-view>0:deskutils/budgie-desktop-view \ - budgie-control-center>0:sysutils/budgie-control-center \ - qogir-gtk-themes>0:x11-themes/qogir-gtk-themes \ + budgie-control-center:sysutils/budgie-control-center \ adwaita-icon-theme>0:x11-themes/adwaita-icon-theme \ tela-icon-theme>0:x11-themes/tela-icon-theme \ xdg-user-dirs>0:devel/xdg-user-dirs @@ -26,14 +25,12 @@ USES= metaport OPTIONS_DEFINE= EXAMPLES OPTIONS_SUB= yes -EXAMPLES_SUB_FILES= pkg-message xinitrc xprofile +EXAMPLES_SUB_FILES= pkg-message xprofile pre-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} post-install-EXAMPLES-on: -.for f in xinitrc xprofile - ${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${EXAMPLESDIR} -.endfor + ${INSTALL_SCRIPT} ${WRKDIR}/xprofile ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/x11/budgie/files/pkg-message.in b/x11/budgie/files/pkg-message.in index 352d3b0622f7..82d7f9947fda 100644 --- a/x11/budgie/files/pkg-message.in +++ b/x11/budgie/files/pkg-message.in @@ -1,13 +1,16 @@ [ { type: install message: <<EOM -Copy 'xprofile' into your home directory: +In order to launch your session. Copy 'xprofile' into your home directory: cp %%EXAMPLESDIR%%/xprofile ~/.xprofile -More information, https://codeberg.org/olivierd/freebsd-ports-budgie/wiki +Create or edit /var/db/AccountsService/users/YOURLOGIN file: + [User] + Language=fr_FR.UTF-8 # e.g. for French users + Session=budgie-desktop + SystemAccount=false -If you want to launch new session from a console (without login manager) - cp %%EXAMPLESDIR%%/xinitrc ~/.xinitrc +Replace YOURLOGIN by your login. EOM } ] diff --git a/x11/budgie/files/xinitrc.in b/x11/budgie/files/xinitrc.in deleted file mode 100644 index 105933e55bd4..000000000000 --- a/x11/budgie/files/xinitrc.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Use only .xinitrc script from a console (startx or xdm). -# - -#export LC_CTYPE="fr_FR.UTF-8" -#export LANG="fr_FR.UTF-8" - -[ -f $HOME/.xprofile ] && . $HOME/.xprofile - -# -#%%PREFIX%%/libexec/gvfsd-trash & -exec ck-launch-session gnome-session --builtin --disable-acceleration-check --session=org.buddiesofbudgie.BudgieDesktop diff --git a/x11/budgie/files/xprofile.in b/x11/budgie/files/xprofile.in index 665e94b1329c..01a953228194 100644 --- a/x11/budgie/files/xprofile.in +++ b/x11/budgie/files/xprofile.in @@ -1,31 +1,24 @@ #!/bin/sh -# Use the Xorg backend -if test "x$GDK_BACKEND" = "x"; then - GDK_BACKEND="x11" +# Set $XDG_RUNTIME_DIR (comment, if use with x11/gdm) +_version=$(sysctl kern.osreldate | awk -F " " '{printf("%s", $2);}') +if [ ${_version} -gt 1401000 ]; then + _user_id=$(id -un) + if [ -d "/var/run/xdg/${_user_id}" ]; then + XDG_RUNTIME_DIR="/var/run/xdg/${_user_id}" + fi +else + _user_id=$(id -u) + if [ -d "/var/run/user/${_user_id}" ]; then + XDG_RUNTIME_DIR="/var/run/user/${_user_id}" + fi fi -export XDG_SESSION_TYPE +export XDG_RUNTIME_DIR -# Set $XDG_MENU_PREFIX -if test "x$XDG_MENU_PREFIX" = "x" ; then - XDG_MENU_PREFIX="gnome-" +# Set environment variables for D-Bus session services +if command -v dbus-update-activation-environment >/dev/null 2>&1 ; then + dbus-update-activation-environment --all fi -export XDG_MENU_PREFIX - -# Set $DESKTOP_SESSION -if test "x$DESKTOP_SESSION" = "x" ; then - DESKTOP_SESSION="budgie-desktop" -fi -export DESKTOP_SESSION - -# Set $XDG_CURRENT_DESKTOP -if test "x$XDG_CURRENT_DESKTOP" = "x" ; then - XDG_CURRENT_DESKTOP="Budgie:GNOME" -fi -export XDG_CURRENT_DESKTOP - -# Suppress warning about accessibility bus -#export NO_AT_BRIDGE=1 # Set $XDG_CONFIG_DIRS if test "x$XDG_CONFIG_DIRS" = "x" ; then @@ -69,14 +62,17 @@ if test "x$XDG_STATE_HOME" = "x" ; then fi [ -d "$XDG_STATE_HOME" ] || mkdir -p "$XDG_STATE_HOME" -# Unlock gnome-keyring +# Unlock gnome-keyring daemon if test -n "$DESKTOP_SESSION" ; then - # If .xinitrc is used, uncomment the next line + SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/keyring" + + # Uncomment, if gnome-keyring daemon is not started automatically + # by XDG desktop portal backend #eval $(gnome-keyring-daemon --start --components=pkc11,secrets,ssh) export SSH_AUTH_SOCK fi -# Set up XDG user directores. See +# Set up XDG user directories (devel/xdg-user-dirs) # https://freedesktop.org/wiki/Software/xdg-user-dirs if command -v xdg-user-dirs-update >/dev/null 2>&1 ; then xdg-user-dirs-update diff --git a/x11/budgie/pkg-plist b/x11/budgie/pkg-plist index 2cf4e3624959..fa017c0001ef 100644 --- a/x11/budgie/pkg-plist +++ b/x11/budgie/pkg-plist @@ -1,2 +1 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xinitrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xprofile |