[118879] trunk/dports/net/libgweather

[devans at macports.org]

Revision: 118879
          https://trac.macports.org/changeset/118879
Author:   devans at macports.org
Date:     2014-04-13 16:15:20 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
libgweather: update to version 3.12.0.

Modified Paths:
--------------
    trunk/dports/net/libgweather/Portfile

Removed Paths:
-------------
    trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff
    trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff

Property Changed:
----------------
    trunk/dports/net/libgweather/


Property changes on: trunk/dports/net/libgweather
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/net/libgweather:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/net/libgweather:108269-113174
   + /branches/mld-qt-481/dports/net/libgweather:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/net/libgweather:108269-118645
/users/devans/GNOME-3/unstable/dports/net/libgweather:116416-118154

Modified: trunk/dports/net/libgweather/Portfile
===================================================================
--- trunk/dports/net/libgweather/Portfile	2014-04-13 23:15:11 UTC (rev 118878)
+++ trunk/dports/net/libgweather/Portfile	2014-04-13 23:15:20 UTC (rev 118879)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            libgweather
-version         3.10.2
+version         3.12.0
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     devans openmaintainer
 categories      net gnome
@@ -22,8 +22,8 @@
 
 use_xz          yes
 
-checksums       rmd160  d0139d2e198e4ec65b044a6fbea6f75199de2a30 \
-                sha256  454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005
+checksums       rmd160  f65072df896353ea5d5dc871e90af86a5892a338 \
+                sha256  601502ffb7639c7d0cc9dfa5fc7fb3e006084be080b51f49786ad78401682154
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -39,9 +39,6 @@
                 port:gobject-introspection \
                 port:vala
 
-patchfiles      patch-libgweather-gweather-location.c.diff \
-                patch-libgweather-weather.c.diff
-
 # use autogen.sh from upstream git to update m4/intltool.m4 using intltoolize and autoreconf
 
 post-patch {
@@ -52,7 +49,7 @@
 configure.cmd   ./autogen.sh
 
 configure.cflags-append \
-                -Wno-format-nonliteral
+                -Wno-error=format-nonliteral
 
 configure.args  --enable-introspection=yes \
                 --enable-vala=yes \

Deleted: trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff
===================================================================
--- trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff	2014-04-13 23:15:11 UTC (rev 118878)
+++ trunk/dports/net/libgweather/files/patch-libgweather-gweather-location.c.diff	2014-04-13 23:15:20 UTC (rev 118879)
@@ -1,22 +0,0 @@
---- 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,
--			  location->parent ? location->parent->latitude : 0.0d,
--			  location->parent ? location->parent->longitude : 0.0d);
-+			  location->parent ? location->parent->latitude : 0.0,
-+			  location->parent ? location->parent->longitude : 0.0);
- }
- 
- GWeatherLocation *

Deleted: trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff
===================================================================
--- trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff	2014-04-13 23:15:11 UTC (rev 118878)
+++ trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff	2014-04-13 23:15:20 UTC (rev 118879)
@@ -1,43 +0,0 @@
-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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/36c992a5/attachment.html>