<!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>[114068] users/devans/GNOME-3/stable/dports/net/libgweather</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/114068">114068</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-11-27 13:28:08 -0800 (Wed, 27 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: libgweather, sync with trunk, version 3.10.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherPortfile">users/devans/GNOME-3/stable/dports/net/libgweather/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweathergweatherlocationcdiff">users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdiff">users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsnetlibgweatherPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/libgweather/Portfile (114067 => 114068)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2013-11-27 21:15:12 UTC (rev 114067)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2013-11-27 21:28:08 UTC (rev 114068)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libgweather
</span><del>-version 3.8.2
</del><ins>+version 3.10.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories net gnome
</span><span class="lines">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 cf260ce71378eeecc9621b7b667ba47167158455 \
- sha256 b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5
</del><ins>+checksums rmd160 191904bc5b242eb368e2fdaaa0fcf1eef7ed6525 \
+ sha256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,11 +32,17 @@
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libsoup \
</span><del>- port:gobject-introspection
</del><ins>+ port:gobject-introspection \
+ port:vala
</ins><span class="cx">
</span><del>-patchfiles patch-libgweather-gweather-location.c.diff
</del><ins>+patchfiles patch-libgweather-gweather-location.c.diff \
+ patch-libgweather-weather.c.diff
</ins><span class="cx">
</span><ins>+configure.cflags-append \
+ -Wno-format-nonliteral
+
</ins><span class="cx"> configure.args --enable-introspection=yes \
</span><ins>+ --enable-vala=yes \
</ins><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-glibtest
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweathergweatherlocationcdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff (114067 => 114068)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff 2013-11-27 21:15:12 UTC (rev 114067)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff 2013-11-27 21:28:08 UTC (rev 114068)
</span><span class="lines">@@ -1,6 +1,15 @@
</span><del>---- libgweather/gweather-location.c.orig 2013-08-23 10:08:22.000000000 -0700
-+++ libgweather/gweather-location.c 2013-08-23 10:08:36.000000000 -0700
-@@ -916,8 +916,8 @@
</del><ins>+--- libgweather/gweather-location.c.orig 2013-11-15 22:59:44.000000000 -0800
++++ libgweather/gweather-location.c 2013-11-15 22:59:51.000000000 -0800
+@@ -714,7 +714,7 @@
+ * calling gweather_location_get_name() on the location's parent. For
+ * other locations it will return %NULL.
+ *
+- * Return value: (allow-none) @loc's city name, or %NULL
++ * Return value: (allow-none): @loc's city name, or %NULL
+ **/
+ char *
+ gweather_location_get_city_name (GWeatherLocation *loc)
+@@ -904,8 +904,8 @@
</ins><span class="cx"> location->latitude,
</span><span class="cx"> location->longitude,
</span><span class="cx"> location->parent && location->parent->latlon_valid,
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff (0 => 114068)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff 2013-11-27 21:28:08 UTC (rev 114068)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+From 1105cf3c5021f129fbfa090cb843fbd3e70c54f5 Mon Sep 17 00:00:00 2001
+From: Javier Jardón <jjardon@gnome.org>
+Date: Thu, 26 Sep 2013 15:12:01 +0000
+Subject: Add fallback in case _NL_MEASUREMENT_MEASUREMENT is not available
+
+---
+diff --git a/libgweather/weather.c b/libgweather/weather.c
+index b847e3a..4140f1c 100644
+--- libgweather/weather.c
++++ libgweather/weather.c
+@@ -701,6 +701,15 @@ gweather_info_get_conditions (GWeatherInfo *info)
+ static gboolean
+ is_locale_metric (void)
+ {
++ /* Translate to the default units to use for presenting
++ * lengths to the user. Translate to default:inch if you
++ * want inches, otherwise translate to default:mm.
++ * Do *not* translate it to "predefinito:mm", if it
++ * it isn't default:mm or default:inch it will not work
++ */
++ gchar *e = _("default:mm");
++
++#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+ const char *fmt;
+ fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT);
+
+@@ -708,6 +717,14 @@ is_locale_metric (void)
+ return FALSE;
+ else
+ return TRUE;
++#endif
++
++ if (strcmp (e, "default:inch")==0)
++ return FALSE;
++ else if (strcmp (e, "default:mm"))
++ g_warning ("Whoever translated default:mm did so wrongly.\n");
++
++ return TRUE;
+ }
+
+ static GWeatherTemperatureUnit
+--
+cgit v0.9.2
</ins></span></pre>
</div>
</div>
</body>
</html>