<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[124382] trunk/dports/devel/upower</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/124382">124382</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-08-23 14:51:46 -0700 (Sat, 23 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>upower: update to version 0.99.1, dependencies, configuration, disable broken man pages.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelupowerPortfile">trunk/dports/devel/upower/Portfile</a></li>
<li><a href="#trunkdportsdevelupowerfilespatchconfigureacdiff">trunk/dports/devel/upower/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelupowerfilespatchdocmanMakefileamdiff">trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff</a></li>
<li><a href="#trunkdportsdevelupowerfilespatchlibupowerglibupclientcdiff">trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsdevelupower">trunk/dports/devel/upower/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelupower"></a>
<div class="propset"><h4>Property changes: trunk/dports/devel/upower</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/unstable/dports/devel/upower:116524-118151
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/devel/upower:118155-124381
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/devel/upower:116524-118151
</span><a id="trunkdportsdevelupowerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/upower/Portfile (124381 => 124382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/upower/Portfile 2014-08-23 19:27:19 UTC (rev 124381)
+++ trunk/dports/devel/upower/Portfile 2014-08-23 21:51:46 UTC (rev 124382)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name upower
</span><del>-version 0.99.0
</del><ins>+version 0.99.1
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> description UPower is an abstraction for enumerating power devices, \
</span><span class="cx"> listening to device events and querying history and statistics.
</span><span class="lines">@@ -22,29 +22,26 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 3136af1c858605a9191d69669386eedc85e25c56 \
- sha256 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1
</del><ins>+checksums rmd160 bb6b91bf4ed22152c2b872fceeecc0a5141b1801 \
+ sha256 8c4de2101958ef2a0522e1bd1893caf9678cd3de45410e246fce2b4635315600
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:gtk-doc \
</span><del>- port:libxslt \
</del><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool
</span><span class="cx">
</span><span class="cx"> # upower uses xsltproc; using /usr/bin/xsltproc will fail without
</span><del>-# XML_CATALOG_FILES set because it'll attempt to download the DTDs. This
-# doesn't show without trace mode, because policykit has a build dependency on
-# libxslt, which hides this problem.
</del><ins>+# XML_CATALOG_FILES set because it'll attempt to download the DTDs.
</ins><span class="cx">
</span><ins>+depends_build-append \
+ port:libxslt
+
</ins><span class="cx"> depends_lib port:dbus-glib \
</span><del>- port:gobject-introspection \
- port:policykit
</del><ins>+ port:gobject-introspection
</ins><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff \
- patch-libupower-glib-up-client.c.diff \
- patch-doc-man-Makefile.am.diff
</del><ins>+patchfiles patch-configure.ac.diff
</ins><span class="cx">
</span><span class="cx"> # reconfigure with our intltool.m4 using autogen.sh from upstream git
</span><span class="cx">
</span><span class="lines">@@ -54,8 +51,10 @@
</span><span class="cx">
</span><span class="cx"> configure.cmd ./autogen.sh
</span><span class="cx">
</span><del>-configure.args --enable-deprecated \
</del><ins>+configure.args --with-backend=dummy \
+ --without-idevice \
</ins><span class="cx"> --enable-introspection \
</span><ins>+ --disable-man-pages \
</ins><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> # gobject-introspection uses g-ir-scanner, which uses $CC from env
</span></span></pre></div>
<a id="trunkdportsdevelupowerfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/upower/files/patch-configure.ac.diff (124381 => 124382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/upower/files/patch-configure.ac.diff 2014-08-23 19:27:19 UTC (rev 124381)
+++ trunk/dports/devel/upower/files/patch-configure.ac.diff 2014-08-23 21:51:46 UTC (rev 124382)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- configure.ac.orig 2014-07-14 11:34:46.000000000 -0700
++++ configure.ac 2014-08-19 09:52:02.000000000 -0700
+@@ -226,9 +226,9 @@
</ins><span class="cx"> enable_tests=$enableval,enable_tests=yes)
</span><span class="cx"> AM_CONDITIONAL(UP_BUILD_TESTS, test x$enable_tests = xyes)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelupowerfilespatchdocmanMakefileamdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff (124381 => 124382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff 2014-08-23 19:27:19 UTC (rev 124381)
+++ trunk/dports/devel/upower/files/patch-doc-man-Makefile.am.diff 2014-08-23 21:51:46 UTC (rev 124382)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- doc/man/Makefile.am.orig 2014-02-19 08:20:10.000000000 -0800
-+++ doc/man/Makefile.am 2014-02-19 08:21:12.000000000 -0800
-@@ -2,8 +2,7 @@
-
- man_MANS = \
- upower.1 \
-- upowerd.8 \
-- UPower.7
-+ upowerd.8
-
- %.1 %.7 %.8 : %.xml
- $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
</del></span></pre></div>
<a id="trunkdportsdevelupowerfilespatchlibupowerglibupclientcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff (124381 => 124382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff 2014-08-23 19:27:19 UTC (rev 124381)
+++ trunk/dports/devel/upower/files/patch-libupower-glib-up-client.c.diff 2014-08-23 21:51:46 UTC (rev 124382)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-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
</del></span></pre>
</div>
</div>
</body>
</html>