Revision: 118270 https://trac.macports.org/changeset/118270 Author: devans@macports.org Date: 2014-03-28 03:13:15 -0700 (Fri, 28 Mar 2014) Log Message: ----------- GNOME-3/stable: upower, apply upstream patch that fixes segfault on getting property when daemon is not running. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/devel/upower/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff Modified: users/devans/GNOME-3/stable/dports/devel/upower/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/devel/upower/Portfile 2014-03-28 10:05:26 UTC (rev 118269) +++ users/devans/GNOME-3/stable/dports/devel/upower/Portfile 2014-03-28 10:13:15 UTC (rev 118270) @@ -43,6 +43,7 @@ port:policykit patchfiles patch-configure.ac.diff \ + patch-libupower-glib-up-client.c.diff \ patch-doc-man-Makefile.am.diff # reconfigure with our intltool.m4 using autogen.sh from upstream git Added: users/devans/GNOME-3/stable/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff =================================================================== --- users/devans/GNOME-3/stable/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff 2014-03-28 10:13:15 UTC (rev 118270) @@ -0,0 +1,26 @@ +From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martinpitt@gnome.org> +Date: Fri, 08 Nov 2013 13:59:50 +0000 +Subject: lib: Fix segfault on getting property when daemon is not running + +This fixes "upower --version" when the daemon is not running, and thus the +client proxy is NULL. +--- +(limited to 'libupower-glib/up-client.c') + +diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c +index 35d7b5d..17fb02d 100644 +--- libupower-glib/up-client.c ++++ libupower-glib/up-client.c +@@ -322,6 +322,9 @@ up_client_get_property (GObject *object, + UpClient *client; + client = UP_CLIENT (object); + ++ if (client->priv->proxy == NULL) ++ return; ++ + switch (prop_id) { + case PROP_DAEMON_VERSION: + g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy)); +-- +cgit v0.9.0.2-2-gbebe