<!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>[115760] trunk/dports/gnome/gnome-settings-daemon</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/115760">115760</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-10 14:04:07 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-settings-daemon: merge version 3.10.2 from GNOME-3 stable test branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesettingsdaemonPortfile">trunk/dports/gnome/gnome-settings-daemon/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomesettingsdaemonfilespatchpluginsdiff">trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesettingsdaemon">trunk/dports/gnome/gnome-settings-daemon/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomesettingsdaemon"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-settings-daemon</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/stable/dports/gnome/gnome-settings-daemon:108269-115730
</span><a id="trunkdportsgnomegnomesettingsdaemonPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-settings-daemon/Portfile (115759 => 115760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-settings-daemon/Portfile        2014-01-10 22:01:42 UTC (rev 115759)
+++ trunk/dports/gnome/gnome-settings-daemon/Portfile        2014-01-10 22:04:07 UTC (rev 115760)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-settings-daemon
</span><del>-version 3.8.5
-revision 1
</del><ins>+version 3.10.2
</ins><span class="cx"> license GPL-2 LGPL-2.1
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Gnome 3 settings daemon.
</span><span class="lines">@@ -18,8 +17,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 93986c863df423c712251c528c86f8d123c3dfe9 \
- sha256 19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784
</del><ins>+checksums rmd160 759f890c3a322615c94ce5ba8512d98f814f9a40 \
+ sha256 808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,7 +31,10 @@
</span><span class="cx"> port:lcms2 \
</span><span class="cx"> port:libnotify \
</span><span class="cx"> port:fontconfig \
</span><ins>+ port:geocode-glib \
+ port:geoclue2 \
</ins><span class="cx"> port:libcanberra \
</span><ins>+ port:libgweather \
</ins><span class="cx"> port:pulseaudio \
</span><span class="cx"> port:upower \
</span><span class="cx"> port:xorg-kbproto \
</span><span class="lines">@@ -60,6 +62,7 @@
</span><span class="cx"> --disable-gudev \
</span><span class="cx"> --disable-ibus \
</span><span class="cx"> --disable-smartcard-support \
</span><ins>+ --disable-rfkill \
</ins><span class="cx"> --disable-maintainer-mode \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegnomesettingsdaemonfilespatchpluginsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff (115759 => 115760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff        2014-01-10 22:01:42 UTC (rev 115759)
+++ trunk/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff        2014-01-10 22:04:07 UTC (rev 115760)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig        2013-07-19 09:07:40.000000000 -0700
-+++ configure.ac        2013-07-24 11:08:09.000000000 -0700
-@@ -78,7 +78,7 @@
</del><ins>+--- configure.ac.orig        2013-11-12 11:02:04.000000000 -0800
++++ configure.ac        2013-12-13 08:57:55.000000000 -0800
+@@ -82,7 +82,7 @@
</ins><span class="cx"> GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
</span><span class="cx"> case $host_os in
</span><span class="cx"> darwin*)
</span><span class="lines">@@ -9,51 +9,30 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> AC_SUBST([GSD_PLUGIN_LDFLAGS])
</span><del>-@@ -241,7 +241,7 @@
</del><ins>+@@ -245,7 +245,7 @@
</ins><span class="cx"> dnl - color
</span><span class="cx"> dnl ---------------------------------------------------------------------------
</span><span class="cx">
</span><del>--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+dnl PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
</del><ins>+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++dnl PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
</ins><span class="cx">
</span><span class="cx"> dnl ---------------------------------------------------------------------------
</span><del>- dnl - wacom (disabled for s390/s390x and non Linux platforms)
---- plugins/media-keys/Makefile.am.orig        2013-07-24 12:18:39.000000000 -0700
-+++ plugins/media-keys/Makefile.am        2013-07-24 12:21:19.000000000 -0700
-@@ -61,6 +61,7 @@
-
- libmedia_keys_la_LIBADD =                 \
-         $(top_builddir)/plugins/common/libcommon.la                        \
-+        $(top_builddir)/gnome-settings-daemon/libgsd.la \
-         $(top_builddir)/plugins/media-keys/gvc/libgvc.la                \
-         $(MEDIA_KEYS_LIBS)                                                \
-         $(SETTINGS_PLUGIN_LIBS)                                                \
---- plugins/screensaver-proxy/Makefile.am.orig        2013-07-24 12:34:25.000000000 -0700
-+++ plugins/screensaver-proxy/Makefile.am        2013-07-24 12:36:18.000000000 -0700
-@@ -19,7 +19,8 @@
-
- libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
-
--libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS)
-+libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) \
-+                                 $(top_builddir)/gnome-settings-daemon/libgsd.la
-
- libexec_PROGRAMS = gsd-test-screensaver-proxy
-
---- plugins/Makefile.am.orig        2013-07-19 09:07:29.000000000 -0700
-+++ plugins/Makefile.am        2013-07-27 13:48:33.000000000 -0700
-@@ -4,10 +4,8 @@
</del><ins>+ dnl - datetime
+--- plugins/Makefile.am.orig        2013-11-11 09:25:13.000000000 -0800
++++ plugins/Makefile.am        2013-12-13 09:01:21.000000000 -0800
+@@ -4,11 +4,9 @@
</ins><span class="cx">         a11y-keyboard        \
</span><span class="cx">         a11y-settings        \
</span><span class="cx">         clipboard        \
</span><span class="cx"> -        color                \
</span><span class="cx">         cursor                \
</span><ins>+         datetime        \
</ins><span class="cx">         dummy                \
</span><span class="cx"> -        power                \
</span><span class="cx">         housekeeping \
</span><span class="cx">         keyboard        \
</span><span class="cx">         media-keys        \
</span><del>-@@ -15,11 +13,13 @@
</del><ins>+@@ -16,11 +14,13 @@
</ins><span class="cx">         remote-display        \
</span><span class="cx">         screensaver-proxy \
</span><span class="cx">         sound                \
</span><span class="lines">@@ -69,3 +48,25 @@
</span><span class="cx">
</span><span class="cx"> if HAVE_PACKAGEKIT
</span><span class="cx"> enabled_plugins += updates
</span><ins>+--- plugins/media-keys/Makefile.am.orig        2013-11-11 09:25:13.000000000 -0800
++++ plugins/media-keys/Makefile.am        2013-12-13 08:52:02.000000000 -0800
+@@ -66,6 +66,7 @@
+
+ libmedia_keys_la_LIBADD =                 \
+         $(top_builddir)/plugins/common/libcommon.la                        \
++        $(top_builddir)/gnome-settings-daemon/libgsd.la \
+         $(top_builddir)/plugins/media-keys/gvc/libgvc.la                \
+         $(MEDIA_KEYS_LIBS)                                                \
+         $(SETTINGS_PLUGIN_LIBS)                                                \
+--- plugins/screensaver-proxy/Makefile.am.orig        2013-11-11 09:25:13.000000000 -0800
++++ plugins/screensaver-proxy/Makefile.am        2013-12-13 08:52:02.000000000 -0800
+@@ -20,7 +20,8 @@
+
+ libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
+
+-libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS)
++libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) \
++                                 $(top_builddir)/gnome-settings-daemon/libgsd.la
+
+ libexec_PROGRAMS = gsd-test-screensaver-proxy
+
</ins></span></pre>
</div>
</div>
</body>
</html>