[118880] trunk/dports/devel/upower

devans at macports.org devans at macports.org
Sun Apr 13 16:15:29 PDT 2014


Revision: 118880
          https://trac.macports.org/changeset/118880
Author:   devans at macports.org
Date:     2014-04-13 16:15:29 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
upower: update to version 0.99.0.

Modified Paths:
--------------
    trunk/dports/devel/upower/Portfile
    trunk/dports/devel/upower/files/patch-configure.ac.diff

Added Paths:
-----------
    trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff

Property Changed:
----------------
    trunk/dports/devel/upower/


Property changes on: trunk/dports/devel/upower
___________________________________________________________________
Added: svn:mergeinfo
   + /users/devans/GNOME-3/stable/dports/devel/upower:118155-118645
/users/devans/GNOME-3/unstable/dports/devel/upower:116524-118151

Modified: trunk/dports/devel/upower/Portfile
===================================================================
--- trunk/dports/devel/upower/Portfile	2014-04-13 23:15:20 UTC (rev 118879)
+++ trunk/dports/devel/upower/Portfile	2014-04-13 23:15:29 UTC (rev 118880)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            upower
-version         0.9.23
+version         0.99.0
 license         GPL-2+
 description     UPower is an abstraction for enumerating power devices, \
                 listening to device events and querying history and statistics.
@@ -22,8 +22,8 @@
 
 use_xz          yes
 
-checksums       rmd160  20a4216726fb0e1666e52d3f024bda8b36b3936b \
-                sha256  433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b
+checksums       rmd160  3136af1c858605a9191d69669386eedc85e25c56 \
+                sha256  5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -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

Modified: trunk/dports/devel/upower/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/upower/files/patch-configure.ac.diff	2014-04-13 23:15:20 UTC (rev 118879)
+++ trunk/dports/devel/upower/files/patch-configure.ac.diff	2014-04-13 23:15:29 UTC (rev 118880)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2013-10-18 07:59:43.000000000 -0700
-+++ configure.ac	2014-02-19 07:40:53.000000000 -0800
-@@ -222,9 +222,9 @@
+--- configure.ac.orig	2013-10-29 03:37:08.000000000 -0700
++++ configure.ac	2014-02-19 09:15:24.000000000 -0800
+@@ -227,9 +227,9 @@
  	      enable_tests=$enableval,enable_tests=yes)
  AM_CONDITIONAL(UP_BUILD_TESTS, test x$enable_tests = xyes)
  

Copied: trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff (from rev 118645, users/devans/GNOME-3/stable/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff)
===================================================================
--- trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff	                        (rev 0)
+++ trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff	2014-04-13 23:15:29 UTC (rev 118880)
@@ -0,0 +1,26 @@
+From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/75992a89/attachment.html>


More information about the macports-changes mailing list