Date: Fri, 9 Oct 2020 17:08:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551789 - in head/sysutils/gnome-settings-daemon: . files Message-ID: <202010091708.099H8WlR011388@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Oct 9 17:08:31 2020 New Revision: 551789 URL: https://svnweb.freebsd.org/changeset/ports/551789 Log: Properly handle logind -> consolekit Grab a patch from openbsd and extend it do other components which requires it Added: head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c (contents, props changed) head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c (contents, props changed) head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c (contents, props changed) Modified: head/sysutils/gnome-settings-daemon/Makefile Modified: head/sysutils/gnome-settings-daemon/Makefile ============================================================================== --- head/sysutils/gnome-settings-daemon/Makefile Fri Oct 9 16:11:16 2020 (r551788) +++ head/sysutils/gnome-settings-daemon/Makefile Fri Oct 9 17:08:31 2020 (r551789) @@ -3,6 +3,7 @@ PORTNAME= gnome-settings-daemon PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Added: head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c Fri Oct 9 17:08:31 2020 (r551789) @@ -0,0 +1,20 @@ +$OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.17 2020/05/14 15:04:21 ajacoutot Exp $ + +Inhibit support (login1 -> ConsoleKit). + +Index: plugins/media-keys/gsd-media-keys-manager.c +--- plugins/media-keys/gsd-media-keys-manager.c.orig 2020-09-13 22:34:14 UTC ++++ plugins/media-keys/gsd-media-keys-manager.c +@@ -123,9 +123,9 @@ static const gchar introspection_xml[] = + #define VOLUME_STEP_PRECISE 2 + #define MAX_VOLUME 65536.0 + +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" + + #define AUDIO_SELECTION_DBUS_NAME "org.gnome.Shell.AudioDeviceSelection" + #define AUDIO_SELECTION_DBUS_PATH "/org/gnome/Shell/AudioDeviceSelection" Added: head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c Fri Oct 9 17:08:31 2020 (r551789) @@ -0,0 +1,15 @@ +--- plugins/power/gsd-backlight.c.orig 2020-09-13 22:34:14 UTC ++++ plugins/power/gsd-backlight.c +@@ -61,9 +61,9 @@ enum { + PROP_LAST, + }; + +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1/session/auto" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Session" ++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" + + static GParamSpec *props[PROP_LAST]; + Added: head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c Fri Oct 9 17:08:31 2020 (r551789) @@ -0,0 +1,15 @@ +--- plugins/power/gsd-power-manager.c.orig 2020-09-13 22:34:14 UTC ++++ plugins/power/gsd-power-manager.c +@@ -70,9 +70,9 @@ + #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ + #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ + +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" + + /* Time between notifying the user about a critical action and the action itself in UPower. */ + #define GSD_ACTION_DELAY 20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010091708.099H8WlR011388>