From owner-svn-ports-all@freebsd.org Fri Oct 9 17:08:33 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4E05E3FF1C2; Fri, 9 Oct 2020 17:08:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7F0117qhz4c7X; Fri, 9 Oct 2020 17:08:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A7691CF07; Fri, 9 Oct 2020 17:08:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 099H8Wvu011391; Fri, 9 Oct 2020 17:08:32 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 099H8WlR011388; Fri, 9 Oct 2020 17:08:32 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202010091708.099H8WlR011388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 9 Oct 2020 17:08:32 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/sysutils/gnome-settings-daemon: . files X-SVN-Commit-Revision: 551789 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 17:08:33 -0000 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