[111032] users/devans/GNOME-3/stable/dports/gnome/gnome-panel
devans at macports.org
devans at macports.org
Fri Sep 13 15:19:53 PDT 2013
Revision: 111032
https://trac.macports.org/changeset/111032
Author: devans at macports.org
Date: 2013-09-13 15:19:53 -0700 (Fri, 13 Sep 2013)
Log Message:
-----------
users/devans/GNOME-3/stable/dports: gnome-panel, update to version 3.6.2.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile
Added 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-configure.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/gmodule.patch
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile 2013-09-13 22:13:12 UTC (rev 111031)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/Portfile 2013-09-13 22:19:53 UTC (rev 111032)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-panel
-version 2.32.1
+version 3.6.2
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -18,56 +18,52 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 03a440cee7e219b42a0375ae2d2d53fbd17b604b \
- sha256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
+checksums rmd160 427f3fc560c5a39d37f3a7b1fa4b2a0b1abc9cf4 \
+ sha256 a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079
depends_build port:pkgconfig \
- port:intltool \
- port:gnome-common \
- port:gnome-doc-utils \
- port:gtk-doc \
- port:shared-mime-info
+ port:intltool
depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:gconf \
+ port:dconf \
port:gnome-desktop \
port:gnome-menus \
- port:policykit-gnome \
- port:libbonoboui \
- port:libcanberra \
+ port:telepathy-glib \
+ port:policykit \
port:libgweather \
port:librsvg \
- port:libwnck
+ port:libwnck \
+ port:xorg-libX11 \
+ port:xorg-libXau \
+ port:xorg-libice \
+ port:xorg-libsm \
+ port:xorg-libXrandr
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles gmodule.patch
+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
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.args --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --with-in-process-applets=all \
- --disable-scrollkeeper \
+configure.args --with-in-process-applets=all \
+ --enable-introspection=yes \
+ --enable-telepathy-glib \
--disable-silent-rules \
- --disable-bonobo \
--disable-network-manager \
--disable-eds \
--disable-schemas-install \
- --enable-introspection=yes
+ --disable-schemas-compile
# gobject-introspection uses g-ir-scanner, which uses $CC from env
build.args-append CC="${configure.cc} ${configure.cc_archflags}"
-variant python25 conflicts python26 python27 description {Build using Python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_build-append port:python25
-}
-
variant python26 conflicts python25 python27 description {Build using Python 2.6} {
configure.python ${prefix}/bin/python2.6
depends_build-append port:python26
@@ -88,13 +84,9 @@
}
post-activate {
- system " \
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`&&\
- gconftool-2 --makefile-install-rule \
- ${prefix}/etc/gconf/schemas/*.schemas"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/scrollkeeper-update"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/gmodule.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/gmodule.patch 2013-09-13 22:13:12 UTC (rev 111031)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/gmodule.patch 2013-09-13 22:19:53 UTC (rev 111032)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2013-06-29 13:37:57.000000000 -0700
-+++ configure.ac 2013-06-29 13:39:14.000000000 -0700
-@@ -76,7 +76,7 @@ dnl pkg-config dependency checks
-
- PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
-
--PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
Added: 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 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-calendar-window.c.diff 2013-09-13 22:19:53 UTC (rev 111032)
@@ -0,0 +1,50 @@
+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
Added: 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 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-applets-clock-clock.c.diff 2013-09-13 22:19:53 UTC (rev 111032)
@@ -0,0 +1,27 @@
+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
Added: 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 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-configure.diff 2013-09-13 22:19:53 UTC (rev 111032)
@@ -0,0 +1,14 @@
+--- configure.orig 2012-11-12 09:54:35.000000000 -0800
++++ configure 2013-09-11 01:26:30.000000000 -0700
+@@ -13104,9 +13104,9 @@
+
+
+
+- PYTHON_PREFIX='${prefix}'
++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+
+- PYTHON_EXEC_PREFIX='${exec_prefix}'
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+
+
+
Added: 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 (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-panel/files/patch-gnome-panel-panel-run-dialog.c.diff 2013-09-13 22:19:53 UTC (rev 111032)
@@ -0,0 +1,241 @@
+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/20130913/8322618c/attachment.html>
More information about the macports-changes
mailing list