[113442] trunk/dports/net/libgweather
devans at macports.org
devans at macports.org
Sat Nov 16 02:22:41 PST 2013
Revision: 113442
https://trac.macports.org/changeset/113442
Author: devans at macports.org
Date: 2013-11-16 02:22:40 -0800 (Sat, 16 Nov 2013)
Log Message:
-----------
libgweather: update to version 3.10.1.
Modified Paths:
--------------
trunk/dports/net/libgweather/Portfile
trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff
Added Paths:
-----------
trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff
Modified: trunk/dports/net/libgweather/Portfile
===================================================================
--- trunk/dports/net/libgweather/Portfile 2013-11-16 09:47:54 UTC (rev 113441)
+++ trunk/dports/net/libgweather/Portfile 2013-11-16 10:22:40 UTC (rev 113442)
@@ -4,7 +4,7 @@
PortSystem 1.0
name libgweather
-version 3.8.2
+version 3.10.1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories net gnome
@@ -22,8 +22,8 @@
use_xz yes
-checksums rmd160 cf260ce71378eeecc9621b7b667ba47167158455 \
- sha256 b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5
+checksums rmd160 191904bc5b242eb368e2fdaaa0fcf1eef7ed6525 \
+ sha256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7
depends_build port:pkgconfig \
port:intltool \
@@ -32,11 +32,17 @@
depends_lib port:gtk3 \
port:libxml2 \
port:libsoup \
- port:gobject-introspection
+ port:gobject-introspection \
+ port:vala
-patchfiles patch-libgweather-gweather-location.c.diff
+patchfiles patch-libgweather-gweather-location.c.diff \
+ patch-libgweather-weather.c.diff
+configure.cflags-append \
+ -Wno-format-nonliteral
+
configure.args --enable-introspection=yes \
+ --enable-vala=yes \
--disable-schemas-compile \
--disable-silent-rules \
--disable-glibtest
Modified: trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff
===================================================================
--- trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff 2013-11-16 09:47:54 UTC (rev 113441)
+++ trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff 2013-11-16 10:22:40 UTC (rev 113442)
@@ -1,6 +1,15 @@
---- 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 @@
+--- 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 @@
location->latitude,
location->longitude,
location->parent && location->parent->latlon_valid,
Added: trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff
===================================================================
--- trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff (rev 0)
+++ trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff 2013-11-16 10:22:40 UTC (rev 113442)
@@ -0,0 +1,43 @@
+From 1105cf3c5021f129fbfa090cb843fbd3e70c54f5 Mon Sep 17 00:00:00 2001
+From: Javier Jardón <jjardon at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131116/2808bb43/attachment.html>
More information about the macports-changes
mailing list