Revision: 119624 https://trac.macports.org/changeset/119624 Author: devans@macports.org Date: 2014-05-02 10:51:54 -0700 (Fri, 02 May 2014) Log Message: ----------- GNOME-3/unstable: updates to GNOME release 3.13.1. * gnome-desktop 3.13.1 (copy from stable and update, remove unused patch files) * gnome-settings-daemon 3.13.1 (copy from stable and update) * gsettings-desktop-schemas 3.13.1 (copy from stable and update) * gnome3-apps, gnome3-core 3.13.1 (stealth update to official list of release versions) Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/Portfile users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps/files/versions.txt users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/Portfile users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/files/versions.txt users/devans/GNOME-3/unstable/dports/gnome/gsettings-desktop-schemas/Portfile Added Paths: ----------- users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/ users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/ users/devans/GNOME-3/unstable/dports/gnome/gsettings-desktop-schemas/ Removed Paths: ------------- users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop ___________________________________________________________________ Added: svn:mergeinfo + /trunk/dports/gnome/gnome-desktop:108265-119077 /users/devans/GNOME-3/stable/dports/gnome/gnome-desktop:119619-119622 /users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop:116416-118152 Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-05-02 15:13:06 UTC (rev 119618) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/Portfile 2014-05-02 17:51:54 UTC (rev 119624) @@ -4,7 +4,7 @@ PortSystem 1.0 name gnome-desktop -version 3.12.1 +version 3.13.1 set branch [join [lrange [split ${version} .] 0 1] .] maintainers devans openmaintainer categories gnome @@ -24,8 +24,8 @@ use_xz yes -checksums rmd160 5503a3837a2531062c62ef318a733f898a55417e \ - sha256 853604f55158343d7220a557f4705aa3270770fa47f5c0453d7fdde61f8c0691 +checksums rmd160 e224b37ddaf066571c43135892f158a102e45792 \ + sha256 cc62cc5e5f4f03221cbbd36d6c5098fff7f0d6330137af8010cab0aa294f81a1 depends_build port:pkgconfig \ port:intltool \ @@ -35,6 +35,7 @@ depends_lib port:desktop-file-utils \ port:gsettings-desktop-schemas \ path:share/themes/HighContrast/index.theme:gnome-themes-standard \ + port:adwaita-icon-theme \ port:gtk3 \ port:gobject-introspection \ port:iso-codes \ @@ -43,8 +44,7 @@ port:xkeyboard-config \ port:xorg-libxkbfile -patchfiles patch-gnome-desktop-Makefile.am.diff \ - patch-libgnome-destktop-libgsystem.diff +patchfiles patch-libgnome-destktop-libgsystem.diff # update m4/intltool.m4 and autoreconf @@ -72,4 +72,4 @@ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" } -livecheck.type gnome +livecheck.type gnome-with-unstable Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff 2014-05-02 15:13:06 UTC (rev 119618) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-gnome-desktop-Makefile.am.diff 2014-05-02 17:51:54 UTC (rev 119624) @@ -1,12 +0,0 @@ ---- libgnome-desktop/Makefile.am.orig 2014-01-15 13:04:02.000000000 -0800 -+++ libgnome-desktop/Makefile.am 2014-01-24 16:42:17.000000000 -0800 -@@ -78,8 +78,7 @@ - $(XLIB_LIBS) \ - $(LIBM) \ - $(GNOME_DESKTOP_LIBS) \ -- libgsystem.la \ -- -lrt -+ libgsystem.la - - libgnome_desktop_3_la_LDFLAGS = \ - -version-info $(LT_VERSION) \ Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff 2014-05-02 15:13:06 UTC (rev 119618) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-bg.c.diff 2014-05-02 17:51:54 UTC (rev 119624) @@ -1,61 +0,0 @@ ---- libgnome-desktop/gnome-bg.c.orig 2010-06-21 18:40:37.000000000 -0700 -+++ libgnome-desktop/gnome-bg.c 2010-08-23 02:21:26.000000000 -0700 -@@ -34,9 +34,12 @@ - - #include <gio/gio.h> - -+#include <gdk/gdk.h> -+#ifndef GDK_WINDOWING_QUARTZ - #include <gdk/gdkx.h> - #include <X11/Xlib.h> - #include <X11/Xatom.h> -+#endif - - #include <cairo.h> - -@@ -132,9 +135,11 @@ - - G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT) - -+#ifndef GDK_WINDOWING_QUARTZ - static GdkPixmap *make_root_pixmap (GdkScreen *screen, - gint width, - gint height); -+#endif - - /* Pixbuf utils */ - static guint32 pixbuf_average_value (GdkPixbuf *pixbuf); -@@ -1061,6 +1066,7 @@ - return intensity < 160; /* biased slightly to be dark */ - } - -+#ifndef GDK_WINDOWING_QUARTZ - /* - * Create a persistent pixmap. We create a separate display - * and set the closedown mode on it to RetainPermanent. -@@ -1114,6 +1120,8 @@ - return gdk_pixmap; - } - -+#endif -+ - static gboolean - get_original_size (const char *filename, - int *orig_width, -@@ -1359,6 +1367,7 @@ - (guchar *) &pixmap_id, 1); - } - -+#ifndef GDK_WINDOWING_QUARTZ - /** - * gnome_bg_set_pixmap_as_root: - * @screen: the #GdkScreen to change root background on -@@ -1396,6 +1405,8 @@ - gdk_x11_display_ungrab (gdk_screen_get_display (screen)); - } - -+#endif -+ - /** - * gnome_bg_set_pixmap_as_root_with_crossfade: - * @screen: the #GdkScreen to change root background on Deleted: users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff 2014-05-02 15:13:06 UTC (rev 119618) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-desktop/files/patch-libgnome-destop-gnome-rr-config.c.diff 2014-05-02 17:51:54 UTC (rev 119624) @@ -1,33 +0,0 @@ ---- libgnome-desktop/gnome-rr-config.c.orig 2010-06-21 18:40:37.000000000 -0700 -+++ libgnome-desktop/gnome-rr-config.c 2010-08-23 02:18:31.000000000 -0700 -@@ -35,6 +35,7 @@ - #include <gdk/gdkx.h> - - #undef GNOME_DISABLE_DEPRECATED -+#include <gdk/gdk.h> - #include "libgnomeui/gnome-rr-config.h" - - #include "edid.h" -@@ -68,6 +69,8 @@ - * </monitors> - */ - -+#ifndef GDK_WINDOWING_QUARTZ -+ - /* A helper wrapper around the GMarkup parser stuff */ - static gboolean parse_file_gmarkup (const gchar *file, - const GMarkupParser *parser, -@@ -1609,7 +1612,6 @@ - } - } - } -- - return FALSE; - } - -@@ -1807,3 +1809,5 @@ - - return success; - } -+ -+#endif Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/Portfile 2014-05-01 21:25:12 UTC (rev 119588) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/Portfile 2014-05-02 17:51:54 UTC (rev 119624) @@ -5,7 +5,7 @@ PortGroup active_variants 1.1 name gnome-settings-daemon -version 3.12.1 +version 3.13.1 license GPL-2 LGPL-2.1 set branch [join [lrange [split ${version} .] 0 1] .] description Gnome 3 settings daemon. @@ -18,8 +18,8 @@ use_xz yes -checksums rmd160 d6ac569f239355498f6b30c5373b21f31b2a4b97 \ - sha256 639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c +checksums rmd160 66279b37db8f7b210a834eb5307c6c17ce44ee55 \ + sha256 a03aabd471d1853782fc3f34e531fea487302dacbbe9afa7d1866361460cd5c0 depends_build port:pkgconfig \ port:intltool \ @@ -85,4 +85,4 @@ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } -livecheck.type gnome +livecheck.type gnome-with-unstable Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-05-01 21:25:12 UTC (rev 119588) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-settings-daemon/files/patch-plugins.diff 2014-05-02 17:51:54 UTC (rev 119624) @@ -1,33 +1,3 @@ ---- plugins/Makefile.am.orig 2013-12-17 01:29:53.000000000 -0800 -+++ plugins/Makefile.am 2014-01-24 12:46:28.000000000 -0800 -@@ -4,22 +4,23 @@ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - cursor \ - datetime \ - dummy \ -- power \ - housekeeping \ - keyboard \ - media-keys \ - mouse \ - screensaver-proxy \ - sound \ -- xrandr \ - xsettings \ - $(NULL) - --disabled_plugins = $(NULL) -+disabled_plugins = \ -+ color \ -+ power \ -+ xrandr \ -+ $(NULL) - - if HAVE_PACKAGEKIT - enabled_plugins += updates --- plugins/media-keys/Makefile.am.orig 2013-11-11 09:25:13.000000000 -0800 +++ plugins/media-keys/Makefile.am 2013-12-13 08:52:02.000000000 -0800 @@ -66,6 +66,7 @@ @@ -100,3 +70,33 @@ $(SETTINGS_PLUGIN_LIBS) \ $(XF86MISC_LIBS) \ $(KEYBOARD_LIBS) \ +--- plugins/Makefile.am.orig 2014-04-02 13:09:44.000000000 -0700 ++++ plugins/Makefile.am 2014-05-01 22:28:08.000000000 -0700 +@@ -4,22 +4,23 @@ + a11y-keyboard \ + a11y-settings \ + clipboard \ +- color \ + cursor \ + datetime \ + dummy \ +- power \ + housekeeping \ + keyboard \ + media-keys \ + mouse \ + screensaver-proxy \ + sound \ +- xrandr \ + xsettings \ + $(NULL) + +-disabled_plugins = $(NULL) ++disabled_plugins = \ ++ color \ ++ power \ ++ xrandr \ ++ $(NULL) + + if SMARTCARD_SUPPORT + enabled_plugins += smartcard Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps/files/versions.txt =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps/files/versions.txt 2014-05-02 17:28:49 UTC (rev 119623) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps/files/versions.txt 2014-05-02 17:51:54 UTC (rev 119624) @@ -40,7 +40,7 @@ apps:lightsoff:3.13.1: apps:nautilus-sendto:3.8.1: apps:nemiver:0.9.5: -apps:orca:3.12.1: +apps:orca:3.13.1: apps:polari:3.13.1: apps:quadrapassel:3.13.1: apps:rygel:0.22.1: Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/Portfile =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/Portfile 2014-05-02 17:28:49 UTC (rev 119623) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/Portfile 2014-05-02 17:51:54 UTC (rev 119624) @@ -42,6 +42,7 @@ # gnome-shell-extensions # gnome-user-share # gnome-video-effects +# libgsystem # libgxps # libzapojit # mousetweaks Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/files/versions.txt =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/files/versions.txt 2014-05-02 17:28:49 UTC (rev 119623) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome3-core/files/versions.txt 2014-05-02 17:51:54 UTC (rev 119624) @@ -47,9 +47,9 @@ core:gnome-packagekit:3.12.1: core:gnome-screenshot:3.12.0: core:gnome-session:3.12.1: -core:gnome-settings-daemon:3.12.1: +core:gnome-settings-daemon:3.13.1: core:gnome-shell:3.13.1: -core:gnome-shell-extensions:3.12.0: +core:gnome-shell-extensions:3.13.1: core:gnome-system-log:3.9.90: core:gnome-system-monitor:3.13.1: core:gnome-terminal:3.13.0: @@ -60,7 +60,7 @@ core:gobject-introspection:1.40.0: core:grilo:0.2.10: core:grilo-plugins:0.2.12: -core:gsettings-desktop-schemas:3.12.0: +core:gsettings-desktop-schemas:3.13.1: core:gssdp:0.14.7: core:gst-plugins-base:1.2.4: core:gst-plugins-good:1.2.4: @@ -82,6 +82,7 @@ core:libgee:0.14.0: core:libgnomekbd:3.6.0: core:libgsf:1.14.30: +core:libgsystem:2014.1: core:libgtop:2.30.0: core:libgweather:3.13.1: core:libgxps:0.2.2: Modified: users/devans/GNOME-3/unstable/dports/gnome/gsettings-desktop-schemas/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gsettings-desktop-schemas/Portfile 2014-05-01 21:25:12 UTC (rev 119588) +++ users/devans/GNOME-3/unstable/dports/gnome/gsettings-desktop-schemas/Portfile 2014-05-02 17:51:54 UTC (rev 119624) @@ -4,7 +4,7 @@ PortSystem 1.0 name gsettings-desktop-schemas -version 3.12.0 +version 3.13.1 license LGPL-2.1 set branch [join [lrange [split ${version} .] 0 1] .] @@ -22,8 +22,8 @@ use_xz yes -checksums rmd160 7434a7160871402693c03bcbc54e86c4ec01ba13 \ - sha256 a623888a47999599abca9728156459b93634e93ac7243a86cf1fc8c2d75f478d +checksums rmd160 5f024a23beab6bd1e438791bdf2da747a70eb4cd \ + sha256 ce8a561a2a9b90ed2a1d76a3d7148fdd558143ab6338d325cf887c201a1ee11a supported_archs noarch @@ -59,4 +59,4 @@ build.cmd ${prefix}/bin/gmake } -livecheck.type gnome +livecheck.type gnome-with-unstable