Hello community,
here is the log from the commit of package gnome-panel for openSUSE:Factory checked in at 2013-04-05 07:31:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-panel (Old)
and /work/SRC/openSUSE:Factory/.gnome-panel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-panel", Maintainer is "gnome-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-panel/gnome-panel.changes 2012-11-21 16:41:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-panel.new/gnome-panel.changes 2013-04-05 07:36:20.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Mar 17 16:09:59 UTC 2013 - dimstar@opensuse.org
+
+- Add gnome-panel-3.8.patch: Fix build with GNOME 3.8
+ infrastructure.
+
+-------------------------------------------------------------------
+Tue Feb 12 11:53:06 UTC 2013 - dimstar@opensuse.org
+
+- Drop pkgconfig(libedataserverui-3.0) BuildRequires: no longer
+ needed.
+- Add gnome-panel-libweather.patch: fix build error due to missing
+ gweather-xml.h
+
+-------------------------------------------------------------------
New:
----
gnome-panel-3.8.patch
gnome-panel-libweather.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.P5Slqy/_old 2013-04-05 07:36:24.000000000 +0200
+++ /var/tmp/diff_new_pack.P5Slqy/_new 2013-04-05 07:36:24.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gnome-panel
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,10 @@
Patch34: gnome-panel-beagle-search.patch
# PATCH-NEEDS-REBASE gnome-panel-run-fixes.patch bnc115576 bgo543604 -- Fix running a command like yast2 when we find the desktop file but the binary is not in $PATH (was PATCH-FIX-UPSTREAM)
Patch50: gnome-panel-run-fixes.patch
+# PATCH-FIX-UPSTREAM gnome-panel-libweather.patch dimstar@opensuse.org -- No longer include gweather.h. Taken from git.
+Patch51: gnome-panel-libweather.patch
+# PATCH-FIX-UPSTREAM gnome-panel-3.8.patch dimstar@opensuse.org -- Fix build with GNOME 3.8 infrastructure. Taken from git.
+Patch52: gnome-panel-3.8.patch
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-patch-translation
@@ -54,7 +58,6 @@
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libecal-1.2) >= 3.5.3
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.5.3
-BuildRequires: pkgconfig(libedataserverui-3.0)
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.1.4
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libwnck-3.0)
@@ -201,6 +204,8 @@
%patch25 -p0
%patch34
# %patch50
+%patch51 -p1
+%patch52 -p1
gnome-patch-translation-update
%build
++++++ gnome-panel-3.8.patch ++++++
commit bf6af945130299a69a244afaee4eecbd3fb77233
Author: Philipp Kaluza
Date: Fri Mar 8 18:08:32 2013 +0100
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
* George Lebl
* Mark McLoughlin
+ * Tom Tromey (Copyright (C) 1998)
*/
#include
@@ -42,8 +43,6 @@
#include
#include
-#include
-
#include
#include
#include
@@ -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,
commit 44eba7db43b227d9b15a2d64d0af97167522891d
Author: Philipp Kaluza
Date: Fri Mar 8 18:48:04 2013 +0100
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);
commit 452f59be8f9babf0ae33654e754da65151760a76
Author: Philipp Kaluza
Date: Fri Mar 8 17:51:23 2013 +0100
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
#include
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include
-
#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 */
++++++ gnome-panel-libweather.patch ++++++
From f5550422e202041a70cce8776785e3e651a01d8d Mon Sep 17 00:00:00 2001
From: Philipp Kaluza
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
---
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 90ee62b..6b62daa 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -54,7 +54,6 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include
-#include
#include
#include
#include
--
cgit v0.9.0.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org