Revision: 116768 https://trac.macports.org/changeset/116768 Author: devans@macports.org Date: 2014-02-06 10:12:09 -0800 (Thu, 06 Feb 2014) Log Message: ----------- GNOME-3/stable/dports: gnome3-core, gnome3-apps, libgweather, epiphany, sync with trunk. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile users/devans/GNOME-3/stable/dports/net/libgweather/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff Removed Paths: ------------- users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/epiphany/ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/epiphany ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/epiphany:108265-114987 /users/rmstonecipher/gnome/epiphany:102363-103172 + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/epiphany:108265-116767 /users/rmstonecipher/gnome/epiphany:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile =================================================================== --- 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) @@ -48,21 +48,22 @@ depends_run port:gnome-settings-daemon +# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released platform darwin { - set cxx_stdlib {} + set cxxstdlib {} if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} { - set cxx_stdlib ${configure.cxx_stdlib} + set cxxstdlib ${configure.cxx_stdlib} } elseif {[string match *clang* ${configure.cxx}] && ${os.major} >= 13} { - set cxx_stdlib libc++ + set cxxstdlib libc++ } else { - set cxx_stdlib libstdc++ + set cxxstdlib libstdc++ } - if {${cxx_stdlib} eq "libstdc++"} { + if {${cxxstdlib} eq "libstdc++"} { depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0 } Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps ___________________________________________________________________ Added: svn:mergeinfo + /trunk/dports/gnome/gnome3-apps:113335-116735 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile =================================================================== --- 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) @@ -11,7 +11,7 @@ description The GNOME 3 Apps module set long_description \ ${description} -homepage https://help.gnome.org/misc/release-notes/3.8/ +homepage https://help.gnome.org/misc/release-notes/3.10/ master_sites platforms darwin distfiles Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-core ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/gnome/gnome3-core:113334-116103 + /trunk/dports/gnome/gnome3-core:113334-116735 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile =================================================================== --- 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) @@ -5,14 +5,14 @@ name gnome3-core version 3.10.2 -revision 3 +revision 4 categories gnome license Permissive maintainers devans openmaintainer description The Core GNOME 3 User Experience module set long_description \ ${description} -homepage https://help.gnome.org/misc/release-notes/3.8/ +homepage https://help.gnome.org/misc/release-notes/3.10/ master_sites platforms darwin distfiles @@ -44,7 +44,6 @@ # gnome-shell-extensions # gnome-user-share # gnome-video-effects -# grilo # grilo-plugins # libgxps # libqmi @@ -108,6 +107,7 @@ path:share/themes/HighContrast/index.theme:gnome-themes-standard \ port:gnome-user-docs \ port:gobject-introspection \ + port:grilo \ port:gsettings-desktop-schemas \ port:gssdp \ port:gstreamer1-gst-plugins-base \ Modified: users/devans/GNOME-3/stable/dports/net/libgweather/Portfile =================================================================== --- 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) @@ -4,8 +4,7 @@ PortSystem 1.0 name libgweather -version 3.10.1 -revision 1 +version 3.10.2 set branch [join [lrange [split ${version} .] 0 1] .] maintainers devans openmaintainer categories net gnome @@ -23,11 +22,15 @@ use_xz yes -checksums rmd160 191904bc5b242eb368e2fdaaa0fcf1eef7ed6525 \ - sha256 ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7 +checksums rmd160 d0139d2e198e4ec65b044a6fbea6f75199de2a30 \ + sha256 454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005 depends_build port:pkgconfig \ port:intltool \ + port:autoconf \ + port:automake \ + port:libtool \ + port:gnome-common \ port:gtk-doc depends_lib port:gtk3 \ @@ -39,6 +42,15 @@ 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 { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} + file delete -force ${worksrcpath}/m4 +} + +configure.cmd ./autogen.sh + configure.cflags-append \ -Wno-format-nonliteral Copied: users/devans/GNOME-3/stable/dports/net/libgweather/files/autogen.sh (from rev 116765, trunk/dports/net/libgweather/files/autogen.sh) =================================================================== --- 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) @@ -0,0 +1,54 @@ +#!/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" "$@" + Deleted: users/devans/GNOME-3/stable/dports/net/libgweather/files/patch-libgweather-weather.c.diff =================================================================== --- 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) @@ -1,43 +0,0 @@ -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 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) =================================================================== --- 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) @@ -0,0 +1,43 @@ +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