diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 75a9f06a0e42..eb43216e27ee 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -1,77 +1,76 @@ PORTNAME= gnome-shell -PORTVERSION= 47.8 -PORTREVISION= 1 +PORTVERSION= 47.10 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell WWW= https://gitlab.gnome.org/GNOME/gnome-shell LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ sassc:textproc/sassc LIB_DEPENDS= libgcr-4.so:security/gcr \ libgjs.so:lang/gjs \ libgraphene-1.0.so:graphics/graphene \ libical.so:devel/libical \ libjson-glib-1.0.so:devel/json-glib \ libmutter-15.so:x11-wm/mutter \ libp11-kit.so:security/p11-kit \ libpolkit-agent-1.so:sysutils/polkit \ libpulse-mainloop-glib.so:audio/pulseaudio \ libpipewire-0.3.so:multimedia/pipewire \ libibus-1.0.so:textproc/ibus RUN_DEPENDS= gdm:x11/gdm \ tecla:x11/tecla USES= compiler:c11 cpe gettext-tools gnome gstreamer localbase \ meson pathfix pkgconfig python:build shebangfix tar:xz xorg CPE_VENDOR= gnome USE_GNOME= atk evolutiondataserver3 gdkpixbuf glib20 \ gnomedesktop4 gnomecontrolcenter3 gtk40 introspection \ libxml2 libxslt:build -USE_XORG= x11 xfixes +USE_XORG= x11 xfixes xext PORTSCOUT= limit:^47\. SHEBANG_FILES= src/gnome-shell-test-tool.in \ src/data-to-c.py # These libs are found via rpath mechanism NO_SHLIB_REQUIRES_GLOB= libmutter-clutter-* libmutter-cogl-* libmutter-mtk-* OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT= EXAMPLES EXAMPLES_SUB_FILES= pkg-message xprofile MESON_ARGS= -Dnetworkmanager=false \ -Dportal_helper=false \ -Dsystemd=false \ -Dtests=false \ -Dextensions_tool=false GLIB_SCHEMAS= 00_org.gnome.shell.gschema.override \ org.gnome.shell.gschema.xml \ org.gnome.Extensions.gschema.xml post-extract: @${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces post-patch: @${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \ ${WRKSRC}/meson.build pre-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} post-install-EXAMPLES-on: @${INSTALL_SCRIPT} ${WRKDIR}/xprofile ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index 0dedebf54cb1..72647c61e07a 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751312448 -SHA256 (gnome/gnome-shell-47.8.tar.xz) = 42d19a2ff449ce0cb139ec240b4a969d8df9ad7c9b938364461a0360f1c3a028 -SIZE (gnome/gnome-shell-47.8.tar.xz) = 2142660 +TIMESTAMP = 1757857239 +SHA256 (gnome/gnome-shell-47.10.tar.xz) = 5174d25bb05d35f3612498efc33a1de533fc4e0f39e3eb377fd09591c94a10e6 +SIZE (gnome/gnome-shell-47.10.tar.xz) = 2144616 diff --git a/x11/gnome-shell/files/xprofile.in b/x11/gnome-shell/files/xprofile.in index 00c1ed131e99..fb2f001c9742 100644 --- a/x11/gnome-shell/files/xprofile.in +++ b/x11/gnome-shell/files/xprofile.in @@ -1,74 +1,79 @@ #!/bin/sh -# Set $XDG_RUNTIME_DIR -_user_id=$(id -u) -if [ -d "/var/run/user/${_user_id}" ]; then - XDG_RUNTIME_DIR="/var/run/user/${_user_id}" - export XDG_RUNTIME_DIR +_version=$(sysctl kern.osreldate | awk -F " " '{printf("%s", $2);}') - if [ ! -d "/var/run/user/${_user_id}" ]; then - mkdir "/var/run/user/${_user_id}/pulse" - fi -fi +# Set $XDG_RUNTIME_DIR (uncomment if use with login manager other than gdm) +#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_RUNTIME_DIR # 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 # Set $XDG_CONFIG_DIRS if test "x$XDG_CONFIG_DIRS" = "x" ; then XDG_CONFIG_DIRS="%%PREFIX%%/etc/xdg:/etc/xdg" fi export XDG_CONFIG_DIRS # Set $XDG_DATA_DIRS if test "x$XDG_DATA_DIRS" = "x" ; then XDG_DATA_DIRS="%%PREFIX%%/share/gnome:%%PREFIX%%/share:/usr/share" fi export XDG_DATA_DIRS # $XDG_CONFIG_HOME defines the base directory relative to which user-specific # configuration files should be stored. If $XDG_CONFIG_HOME is either not set # or empty, a default equal to $HOME/.config should be used. if test "x$XDG_CONFIG_HOME" = "x" ; then XDG_CONFIG_HOME=$HOME/.config fi [ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME" # $XDG_CACHE_HOME defines the base directory relative to which user-specific # non-essential data files should be stored. If $XDG_CACHE_HOME is either not # set or empty, a default equal to $HOME/.cache should be used. if test "x$XDG_CACHE_HOME" = "x" ; then XDG_CACHE_HOME=$HOME/.cache fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" # $XDG_DATA_HOME defines the base directory relative to which user-specific # data files should be stored. if test "x$XDG_DATA_HOME" = "x" ; then XDG_DATA_HOME=$HOME/.local/share fi [ -d "$XDG_DATA_HOME" ] || mkdir -p "$XDG_DATA_HOME" # $XDG_STATE_HOME defines the base directory relative to which user-specific # state files should be stored. if test "x$XDG_STATE_HOME" = "x" ; then XDG_STATE_HOME=$HOME/.local/state fi [ -d "$XDG_STATE_HOME" ] || mkdir -p "$XDG_STATE_HOME" # Unlock gnome-keyring-daemon if test -n "$DESKTOP_SESSION" ; then - SSH_AUTH_SOCK="/var/run/user/${_user_id}/keyring/ssh" + SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/keyring" # If .xinitrc is used, uncomment the next line #eval $(gnome-keyring-daemon --start --components=pkc11,secrets,ssh) export SSH_AUTH_SOCK fi # 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 fi