<!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>[116768] users/devans/GNOME-3/stable/dports</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/116768">116768</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-02-06 10:12:09 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: gnome3-core, gnome3-apps, libgweather, epiphany, sync with trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphanyPortfile">users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3appsPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3corePortfile">users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherPortfile">users/devans/GNOME-3/stable/dports/net/libgweather/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherfilesautogensh">users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh</a></li>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdiff">users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdiff">users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeepiphany">users/devans/GNOME-3/stable/dports/gnome/epiphany/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3apps">users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnome3core">users/devans/GNOME-3/stable/dports/gnome/gnome3-core/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomeepiphany"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/epiphany</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/epiphany:108265-114987
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/epiphany:108265-116767
</span><span class="cx">/users/rmstonecipher/gnome/epiphany:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomeepiphanyPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile (116767 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-02-06 17:34:32 UTC (rev 116767)
+++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -48,21 +48,22 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><ins>+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</ins><span class="cx"> platform darwin {
</span><del>- set cxx_stdlib {}
</del><ins>+ set cxxstdlib {}
</ins><span class="cx">
</span><span class="cx"> if {[info exists configure.cxx_stdlib] &&
</span><span class="cx"> ${configure.cxx_stdlib} ne {} &&
</span><span class="cx"> [string match *clang* ${configure.cxx}]} {
</span><del>- set cxx_stdlib ${configure.cxx_stdlib}
</del><ins>+ set cxxstdlib ${configure.cxx_stdlib}
</ins><span class="cx"> } elseif {[string match *clang* ${configure.cxx}] &&
</span><span class="cx"> ${os.major} >= 13} {
</span><del>- set cxx_stdlib libc++
</del><ins>+ set cxxstdlib libc++
</ins><span class="cx"> } else {
</span><del>- set cxx_stdlib libstdc++
</del><ins>+ set cxxstdlib libstdc++
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if {${cxx_stdlib} eq "libstdc++"} {
</del><ins>+ if {${cxxstdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3apps"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3appsPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile (116767 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-02-06 17:34:32 UTC (rev 116767)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> description The GNOME 3 Apps module set
</span><span class="cx"> long_description \
</span><span class="cx"> ${description}
</span><del>-homepage https://help.gnome.org/misc/release-notes/3.8/
</del><ins>+homepage https://help.gnome.org/misc/release-notes/3.10/
</ins><span class="cx"> master_sites
</span><span class="cx"> platforms darwin
</span><span class="cx"> distfiles
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnome3core"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/gnome3-core</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/gnome3-core:113334-116735
</span><a id="usersdevansGNOME3stabledportsgnomegnome3corePortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile (116767 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-02-06 17:34:32 UTC (rev 116767)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -5,14 +5,14 @@
</span><span class="cx">
</span><span class="cx"> name gnome3-core
</span><span class="cx"> version 3.10.2
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> categories gnome
</span><span class="cx"> license Permissive
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> description The Core GNOME 3 User Experience module set
</span><span class="cx"> long_description \
</span><span class="cx"> ${description}
</span><del>-homepage https://help.gnome.org/misc/release-notes/3.8/
</del><ins>+homepage https://help.gnome.org/misc/release-notes/3.10/
</ins><span class="cx"> master_sites
</span><span class="cx"> platforms darwin
</span><span class="cx"> distfiles
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> # gnome-shell-extensions
</span><span class="cx"> # gnome-user-share
</span><span class="cx"> # gnome-video-effects
</span><del>-# grilo
</del><span class="cx"> # grilo-plugins
</span><span class="cx"> # libgxps
</span><span class="cx"> # libqmi
</span><span class="lines">@@ -108,6 +107,7 @@
</span><span class="cx"> path:share/themes/HighContrast/index.theme:gnome-themes-standard \
</span><span class="cx"> port:gnome-user-docs \
</span><span class="cx"> port:gobject-introspection \
</span><ins>+ port:grilo \
</ins><span class="cx"> port:gsettings-desktop-schemas \
</span><span class="cx"> port:gssdp \
</span><span class="cx"> port:gstreamer1-gst-plugins-base \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/net/libgweather/Portfile (116767 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2014-02-06 17:34:32 UTC (rev 116767)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/Portfile 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libgweather
</span><del>-version 3.10.1
-revision 1
</del><ins>+version 3.10.2
</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">@@ -23,11 +22,15 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 191904bc5b242eb368e2fdaaa0fcf1eef7ed6525 \
- sha256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7
</del><ins>+checksums rmd160 d0139d2e198e4ec65b044a6fbea6f75199de2a30 \
+ sha256 454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><ins>+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:gnome-common \
</ins><span class="cx"> port:gtk-doc
</span><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="lines">@@ -39,6 +42,15 @@
</span><span class="cx"> patchfiles patch-libgweather-gweather-location.c.diff \
</span><span class="cx"> patch-libgweather-weather.c.diff
</span><span class="cx">
</span><ins>+# use autogen.sh from upstream git to update m4/intltool.m4 using intltoolize and autoreconf
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+ file delete -force ${worksrcpath}/m4
+}
+
+configure.cmd ./autogen.sh
+
</ins><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherfilesautogenshfromrev116765trunkdportsnetlibgweatherfilesautogensh"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh (from rev 116765, trunk/dports/net/libgweather/files/autogen.sh) (0 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME="libgweather"
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+test -f configure.ac || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+mkdir m4/
+
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
+if test -z $GTKDOCIZE; then
+ echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
+ rm -f gtk-doc.make
+ cat > gtk-doc.make <<EOF
+EXTRA_DIST =
+CLEANFILES =
+EOF
+else
+ gtkdocize || exit $?
+fi
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please install it ***"
+ exit 1
+fi
+
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
+autoreconf --force --install --verbose || exit $?
+intltoolize --force --automake || exit $?
+
+# Replace autopoint Makefile.in.in with intltool's one
+sed -e 's/subdir = po/subdir = po-locations/' \
+ -e 's/GETTEXT_PACKAGE = @GETTEXT_PACKAGE@/GETTEXT_PACKAGE = libgweather-locations/' \
+ po/Makefile.in.in > po-locations/Makefile.in.in
+
+# Now configure, if asked
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff (116767 => 116768)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff 2014-02-06 17:34:32 UTC (rev 116767)
+++ users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff 2014-02-06 18:12:09 UTC (rev 116768)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-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
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsnetlibgweatherfilespatchlibgweatherweathercdifffromrev116765trunkdportsnetlibgweatherfilespatchlibgweatherweathercdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff (from rev 116765, trunk/dports/net/libgweather/files/patch-libgweather-weather.c.diff) (0 => 116768)</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 2014-02-06 18:12:09 UTC (rev 116768)
</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>