[111593] users/devans/GNOME-3/stable/dports/gnome/gnome-panel
devans at macports.org
devans at macports.org
Thu Sep 26 10:47:59 PDT 2013
Revision: 111593
https://trac.macports.org/changeset/111593
Author: devans at macports.org
Date: 2013-09-26 10:47:59 -0700 (Thu, 26 Sep 2013)
Log Message:
-----------
users/devans/GNOME-3/stable/dports: update gnome-panel to version 3.8.0.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-calendar-window.c.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-clock.c.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile 2013-09-26 15:47:00 UTC (rev 111592)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile 2013-09-26 17:47:59 UTC (rev 111593)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-panel
-version 3.6.2
+version 3.8.0
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -20,8 +20,8 @@
use_xz yes
-checksums rmd160 427f3fc560c5a39d37f3a7b1fa4b2a0b1abc9cf4 \
- sha256 a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079
+checksums rmd160 b6bd10681666b0aece2e47ce81cf2f0297dc0004 \
+ sha256 d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a
depends_build port:pkgconfig \
port:intltool
@@ -46,11 +46,11 @@
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles patch-configure.diff \
- patch-gnome-panel-panel-run-dialog.c.diff \
- patch-applets-clock-calendar-window.c.diff \
- patch-applets-clock-clock.c.diff
+patchfiles patch-configure.diff
+configure.cflags-append \
+ -Wno-format-nonliteral
+
configure.args --with-in-process-applets=all \
--enable-introspection=yes \
--enable-telepathy-glib \
@@ -74,7 +74,7 @@
depends_build-append port:python27
}
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
default_variants +python27
}
@@ -83,6 +83,10 @@
configure.args-delete --disable-eds
}
+if {[variant_isset eds]} {
+ universal_variant no
+}
+
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-calendar-window.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-calendar-window.c.diff 2013-09-26 15:47:00 UTC (rev 111592)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-calendar-window.c.diff 2013-09-26 17:47:59 UTC (rev 111593)
@@ -1,50 +0,0 @@
-From 452f59be8f9babf0ae33654e754da65151760a76 Mon Sep 17 00:00:00 2001
-From: Philipp Kaluza <phk at src.gnome.org>
-Date: Fri, 08 Mar 2013 16:51:23 +0000
-Subject: drop support for commandline-based calendar/tasks applications
-
-It's not worth the layering violations this would need.
-(Partial fix for bug #237308 .)
----
-(limited to 'applets/clock/calendar-window.c')
-
-diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
-index 458852c..708e921 100644
---- applets/clock/calendar-window.c.orig
-+++ applets/clock/calendar-window.c
-@@ -42,9 +42,6 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
-
--#define GNOME_DESKTOP_USE_UNSTABLE_API
--#include <libgnome-desktop/gnome-desktop-utils.h>
--
- #include "calendar-window.h"
-
- #include "clock.h"
-@@ -168,6 +165,13 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
- return;
- }
-
-+ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
-+ if (terminal) {
-+ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
-+ "Please configure a different application.\n");
-+ return;
-+ }
-+
- command_line = g_find_program_in_path (program);
- if (command_line == NULL) {
- g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
-@@ -189,9 +193,6 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
- screen = gtk_widget_get_screen (calwin->priv->calendar);
- error = NULL;
-
-- if (terminal)
-- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
--
- display = gdk_screen_make_display_name (screen);
-
- result = g_spawn_async (NULL, /* working directory */
---
-cgit v0.9.2
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-clock.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-clock.c.diff 2013-09-26 15:47:00 UTC (rev 111592)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-clock.c.diff 2013-09-26 17:47:59 UTC (rev 111593)
@@ -1,27 +0,0 @@
-From f5550422e202041a70cce8776785e3e651a01d8d Mon Sep 17 00:00:00 2001
-From: Philipp Kaluza <phk at src.gnome.org>
-Date: Thu, 03 Jan 2013 10:51:19 +0000
-Subject: fix build error due to missing gweather-xml.h
-
-GWeather doesn't export the deprecated GWeatherXML anymore since
-commit 354f1aa9003ee08c6e63ecbaaa6b9179b9178184 . Luckily, our last
-usage of it is long gone. Remove leftover include.
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=890219
----
-(limited to 'applets/clock/clock.c')
-
-diff --git a/applets/clock/clock.c b/applets/clock/clock.c
-index 90ee62b..6b62daa 100644
---- applets/clock/clock.c.orig
-+++ applets/clock/clock.c
-@@ -54,7 +54,6 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-wall-clock.h>
-
--#include <libgweather/gweather-xml.h>
- #include <libgweather/location-entry.h>
- #include <libgweather/timezone-menu.h>
- #include <libgweather/gweather-enum-types.h>
---
-cgit v0.9.2
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff 2013-09-26 15:47:00 UTC (rev 111592)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff 2013-09-26 17:47:59 UTC (rev 111593)
@@ -1,6 +1,6 @@
---- configure.orig 2012-11-12 09:54:35.000000000 -0800
-+++ configure 2013-09-11 01:26:30.000000000 -0700
-@@ -13104,9 +13104,9 @@
+--- configure.orig 2013-09-25 09:14:35.000000000 -0700
++++ configure 2013-09-26 10:15:03.000000000 -0700
+@@ -13100,9 +13100,9 @@
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff 2013-09-26 15:47:00 UTC (rev 111592)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff 2013-09-26 17:47:59 UTC (rev 111593)
@@ -1,241 +0,0 @@
-From bf6af945130299a69a244afaee4eecbd3fb77233 Mon Sep 17 00:00:00 2001
-From: Philipp Kaluza <phk at src.gnome.org>
-Date: Fri, 08 Mar 2013 17:08:32 +0000
-Subject: panel-run-dialog: resurrect function gnome_desktop_prepend_terminal_to_vector
-
-, which was removed from gnome-desktop in commit
-9bab2144b7c8ace0c057720be3c48fb24a80a19d , and keep a local
-copy in panel-run-dialog.c (simple helper function, static).
-(Second half of fix for bug #237308 .)
----
-(limited to 'gnome-panel/panel-run-dialog.c')
-
-diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
-index 801b9bc..faf3d7e 100644
---- gnome-panel/panel-run-dialog.c.orig
-+++ gnome-panel/panel-run-dialog.c
-@@ -25,6 +25,7 @@
- * Havoc Pennington <hp at pobox.com>
- * George Lebl <jirka at 5z.com>
- * Mark McLoughlin <mark at skynet.ie>
-+ * Tom Tromey (Copyright (C) 1998)
- */
-
- #include <config.h>
-@@ -42,8 +43,6 @@
- #include <gdk/gdkkeysyms.h>
- #include <gmenu-tree.h>
-
--#include <libgnome-desktop/gnome-desktop-utils.h>
--
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
- #include <libpanel-util/panel-gtk.h>
-@@ -335,6 +334,138 @@ dummy_child_watch (GPid pid,
- */
- }
-
-+
-+/**
-+ * gnome_desktop_prepend_terminal_to_vector:
-+ * @argc: a pointer to the vector size
-+ * @argv: a pointer to the vector
-+ *
-+ * Description: Prepends a terminal (either the one configured as default in
-+ * the user's GNOME setup, or one of the common xterm emulators) to the passed
-+ * in vector, modifying it in the process. The vector should be allocated with
-+ * #g_malloc, as this will #g_free the original vector. Also all elements must
-+ * have been allocated separately. That is the standard glib/GNOME way of
-+ * doing vectors however. If the integer that @argc points to is negative, the
-+ * size will first be computed. Also note that passing in pointers to a vector
-+ * that is empty, will just create a new vector for you.
-+ **/
-+static void
-+gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
-+{
-+#ifndef G_OS_WIN32
-+ char **real_argv;
-+ int real_argc;
-+ int i, j;
-+ char **term_argv = NULL;
-+ int term_argc = 0;
-+ GSettings *settings;
-+
-+ gchar *terminal = NULL;
-+
-+ char **the_argv;
-+
-+ g_return_if_fail (argc != NULL);
-+ g_return_if_fail (argv != NULL);
-+
-+ // _gnome_desktop_init_i18n ();
-+
-+ /* sanity */
-+ if(*argv == NULL)
-+ *argc = 0;
-+
-+ the_argv = *argv;
-+
-+ /* compute size if not given */
-+ if (*argc < 0) {
-+ for (i = 0; the_argv[i] != NULL; i++)
-+ ;
-+ *argc = i;
-+ }
-+
-+ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
-+ terminal = g_settings_get_string (settings, "exec");
-+
-+ if (terminal) {
-+ gchar *command_line;
-+ gchar *exec_flag;
-+
-+ exec_flag = g_settings_get_string (settings, "exec-arg");
-+
-+ if (exec_flag == NULL)
-+ command_line = g_strdup (terminal);
-+ else
-+ command_line = g_strdup_printf ("%s %s", terminal,
-+ exec_flag);
-+
-+ g_shell_parse_argv (command_line,
-+ &term_argc,
-+ &term_argv,
-+ NULL /* error */);
-+
-+ g_free (command_line);
-+ g_free (exec_flag);
-+ g_free (terminal);
-+ }
-+
-+ g_object_unref (settings);
-+
-+ if (term_argv == NULL) {
-+ char *check;
-+
-+ term_argc = 2;
-+ term_argv = g_new0 (char *, 3);
-+
-+ check = g_find_program_in_path ("gnome-terminal");
-+ if (check != NULL) {
-+ term_argv[0] = check;
-+ /* Note that gnome-terminal takes -x and
-+ * as -e in gnome-terminal is broken we use that. */
-+ term_argv[1] = g_strdup ("-x");
-+ } else {
-+ if (check == NULL)
-+ check = g_find_program_in_path ("nxterm");
-+ if (check == NULL)
-+ check = g_find_program_in_path ("color-xterm");
-+ if (check == NULL)
-+ check = g_find_program_in_path ("rxvt");
-+ if (check == NULL)
-+ check = g_find_program_in_path ("xterm");
-+ if (check == NULL)
-+ check = g_find_program_in_path ("dtterm");
-+ if (check == NULL) {
-+ g_warning (_("Cannot find a terminal, using "
-+ "xterm, even if it may not work"));
-+ check = g_strdup ("xterm");
-+ }
-+ term_argv[0] = check;
-+ term_argv[1] = g_strdup ("-e");
-+ }
-+ }
-+
-+ real_argc = term_argc + *argc;
-+ real_argv = g_new (char *, real_argc + 1);
-+
-+ for (i = 0; i < term_argc; i++)
-+ real_argv[i] = term_argv[i];
-+
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+
-+ real_argv[i] = NULL;
-+
-+ g_free (*argv);
-+ *argv = real_argv;
-+ *argc = real_argc;
-+
-+ /* we use g_free here as we sucked all the inner strings
-+ * out from it into real_argv */
-+ g_free (term_argv);
-+#else
-+ /* FIXME: Implement when needed */
-+ g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
-+#endif
-+}
-+
- static gboolean
- panel_run_dialog_launch_command (PanelRunDialog *dialog,
- const char *command,
---
-cgit v0.9.2
-From 44eba7db43b227d9b15a2d64d0af97167522891d Mon Sep 17 00:00:00 2001
-From: Philipp Kaluza <phk at src.gnome.org>
-Date: Fri, 08 Mar 2013 17:48:04 +0000
-Subject: panel-run-dialog: rename helper function
-
-that I resurrected earlier from gnome_desktop_prepend_terminal_to_vector
-to panel_run_dialog_prepend_terminal_to_vector (use proper namespace).
----
-(limited to 'gnome-panel/panel-run-dialog.c')
-
-diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
-index faf3d7e..d89ac06 100644
---- gnome-panel/panel-run-dialog.c
-+++ gnome-panel/panel-run-dialog.c
-@@ -336,7 +336,7 @@ dummy_child_watch (GPid pid,
-
-
- /**
-- * gnome_desktop_prepend_terminal_to_vector:
-+ * panel_run_dialog_prepend_terminal_to_vector:
- * @argc: a pointer to the vector size
- * @argv: a pointer to the vector
- *
-@@ -349,10 +349,10 @@ dummy_child_watch (GPid pid,
- * size will first be computed. Also note that passing in pointers to a vector
- * that is empty, will just create a new vector for you.
- **/
-+/* TODO: throw out this function if there ever is a proper GAppInfo port */
- static void
--gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
-+panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
- {
--#ifndef G_OS_WIN32
- char **real_argv;
- int real_argc;
- int i, j;
-@@ -367,8 +367,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
- g_return_if_fail (argc != NULL);
- g_return_if_fail (argv != NULL);
-
-- // _gnome_desktop_init_i18n ();
--
- /* sanity */
- if(*argv == NULL)
- *argc = 0;
-@@ -460,10 +458,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
- /* we use g_free here as we sucked all the inner strings
- * out from it into real_argv */
- g_free (term_argv);
--#else
-- /* FIXME: Implement when needed */
-- g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
--#endif
- }
-
- static gboolean
-@@ -485,7 +479,7 @@ panel_run_dialog_launch_command (PanelRunDialog *dialog,
- screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
-
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
-- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
-+ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
-
- display = gdk_screen_make_display_name (screen);
-
---
-cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130926/24c85f88/attachment-0001.html>
More information about the macports-changes
mailing list