r38501 - in /desktop/experimental/gnome-panel/debian: ./ patches/
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Sun Jun 9 02:59:35 UTC 2013
Author: jbicha-guest
Date: Sun Jun 9 02:59:35 2013
New Revision: 38501
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38501
Log:
refresh patches and such so that this actually builds
Added:
desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part1.patch
desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part2.patch
desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part3.patch
Removed:
desktop/experimental/gnome-panel/debian/patches/gnome-desktop-3.8.patch
Modified:
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch
desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
desktop/experimental/gnome-panel/debian/patches/series
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=38501&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,5 +1,8 @@
gnome-panel (3.6.2-1) UNRELEASED; urgency=low
+ * TODO:
+ - Should we rename gnome-session-fallback to gnome-session-flashback or
+ should we just have gnome-panel provide gnome-session-fallback?
* New upstream release
* Moved gnome-session-fallback from gnome-session:
- debian/control.in
@@ -13,7 +16,7 @@
* debian/control.in:
- Have gnome-session-fallback depend on nautilus >= 3.8
and gnome-screensaver per .session file
- * debian/patches/gnome-desktop-3.8.patch
+ * debian/patches/git-build-with-gnome-desktop38*.patch
- Fix build with gnome-desktop3 3.8
* debian/patches/drop-gweather-xml-include.patch:
- Fix build with libgweather 3.8
Modified: desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch?rev=38501&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,10 +1,10 @@
Index: gnome-panel-3.6.2/data/gnome-flashback.desktop.in
===================================================================
---- gnome-panel-3.6.2.orig/data/gnome-flashback.desktop.in 2013-02-25 21:04:11.761830320 -0500
-+++ gnome-panel-3.6.2/data/gnome-flashback.desktop.in 2013-02-25 21:05:08.737827937 -0500
+--- gnome-panel-3.6.2.orig/data/gnome-flashback.desktop.in 2013-06-08 21:52:30.806805799 -0400
++++ gnome-panel-3.6.2/data/gnome-flashback.desktop.in 2013-06-08 21:52:30.798805799 -0400
@@ -1,7 +1,7 @@
[Desktop Entry]
- _Name=GNOME Fallback
+ _Name=GNOME Flashback
_Comment=This session logs you into GNOME with the traditional panel
-Exec=gnome-session --session=gnome-flashback
+Exec=gnome-session-fallback
Modified: desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch?rev=38501&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,7 +1,7 @@
-Index: gnome-panel-3.5.91/applets/clock/clock.c
+Index: gnome-panel-3.6.2/applets/clock/clock.c
===================================================================
---- gnome-panel-3.5.91.orig/applets/clock/clock.c 2012-09-08 21:46:24.868146546 -0400
-+++ gnome-panel-3.5.91/applets/clock/clock.c 2012-09-08 21:46:26.464146479 -0400
+--- gnome-panel-3.6.2.orig/applets/clock/clock.c 2013-06-08 22:15:34.778747917 -0400
++++ gnome-panel-3.6.2/applets/clock/clock.c 2013-06-08 22:15:34.770747917 -0400
@@ -66,6 +66,7 @@
#include "clock-location-tile.h"
#include "clock-map.h"
@@ -10,10 +10,10 @@
#include "system-timezone.h"
enum {
-Index: gnome-panel-3.5.91/applets/clock/set-timezone.c
+Index: gnome-panel-3.6.2/applets/clock/set-timezone.c
===================================================================
---- gnome-panel-3.5.91.orig/applets/clock/set-timezone.c 2012-09-08 21:46:24.868146546 -0400
-+++ gnome-panel-3.5.91/applets/clock/set-timezone.c 2012-09-08 21:46:26.464146479 -0400
+--- gnome-panel-3.6.2.orig/applets/clock/set-timezone.c 2013-06-08 22:15:34.778747917 -0400
++++ gnome-panel-3.6.2/applets/clock/set-timezone.c 2013-06-08 22:15:34.774747917 -0400
@@ -23,17 +23,23 @@
#endif
@@ -136,10 +136,10 @@
NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
callback, user_data);
}
-Index: gnome-panel-3.5.91/configure.ac
+Index: gnome-panel-3.6.2/configure.ac
===================================================================
---- gnome-panel-3.5.91.orig/configure.ac 2012-09-04 08:07:29.000000000 -0400
-+++ gnome-panel-3.5.91/configure.ac 2012-09-08 21:46:43.796145754 -0400
+--- gnome-panel-3.6.2.orig/configure.ac 2012-11-12 12:51:14.000000000 -0500
++++ gnome-panel-3.6.2/configure.ac 2013-06-08 22:15:52.390747180 -0400
@@ -131,7 +131,7 @@
AC_SUBST(TZ_CFLAGS)
AC_SUBST(TZ_LIBS)
Added: desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part1.patch?rev=38501&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part1.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part1.patch [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,0 +1,171 @@
+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 .)
+---
+diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
+index 801b9bc..faf3d7e 100644
+--- a/gnome-panel/panel-run-dialog.c
++++ b/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,
+
Added: desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part2.patch?rev=38501&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part2.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part2.patch [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,0 +1,64 @@
+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).
+---
+diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
+index faf3d7e..d89ac06 100644
+--- a/gnome-panel/panel-run-dialog.c
++++ b/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);
+
+
Added: desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part3.patch?rev=38501&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part3.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/git-build-with-gnome-desktop38-part3.patch [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,0 +1,47 @@
+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 .)
+---
+diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
+index 458852c..708e921 100644
+--- a/applets/clock/calendar-window.c
++++ b/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 */
+
Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=38501&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sun Jun 9 02:59:35 2013
@@ -1,5 +1,5 @@
00-Add-the-GNOME-Flashback-session.patch
-#01_gnome-wm.patch
+01_gnome-wm.patch
01_menus_rename.patch
02_fallback_desktop.patch
03_tasklist_orientation.patch
@@ -8,4 +8,6 @@
14_revert_timedate_change.patch
18_fix_force_quit_applet.patch
drop-gweather-xml-include.patch
-gnome-desktop-3.8.patch
+git-build-with-gnome-desktop38-part1.patch
+git-build-with-gnome-desktop38-part2.patch
+git-build-with-gnome-desktop38-part3.patch
More information about the pkg-gnome-commits
mailing list