Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (254f04ac1f27313cba3b28798f6548dabb342ee1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (254f04ac1f27313cba3b28798f6548dabb342ee1)
  • Date: Wed, 12 Jun 2013 18:38:49 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null
|binary
gnome2-libs/gnome-keyring/DETAILS
| 2
gnome2-libs/gnome-keyring/HISTORY
| 4
gnome2-libs/gnome-keyring/gnome-keyring-3.6.3.tar.xz.sig
|binary

gnome2-libs/gnome-panel/0001-panel-Fix-launcher-icon-animation-ending-with-black.patch
| 35 +

gnome2-libs/gnome-panel/0002-fix-build-error-due-to-missing-gweather-xml.h.patch
| 29 +
gnome2-libs/gnome-panel/0003-na-apply-style-after-realize.patch
| 47 ++

gnome2-libs/gnome-panel/0004-drop-support-for-commandline-based-calendar-tasks-ap.patch
| 53 ++

gnome2-libs/gnome-panel/0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch
| 177 ++++++++++
gnome2-libs/gnome-panel/0006-panel-run-dialog-rename-helper-function.patch
| 69 +++
gnome2-libs/gnome-panel/DETAILS
| 2
gnome2-libs/gnome-panel/HISTORY
| 14
gnome2-libs/gnome-panel/PRE_BUILD
| 8
gnome2-libs/gnome-panel/gnome-panel-3.6.2.tar.xz.sig
|binary
gnome2-libs/gsettings-desktop-schemas/DETAILS
| 5
gnome2-libs/gsettings-desktop-schemas/HISTORY
| 4

gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.2.tar.xz.sig
|binary
gnome2-libs/libgnome-keyring/DETAILS
| 3
gnome2-libs/libgnome-keyring/HISTORY
| 4
gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.1.tar.xz.sig
|binary
gnome2-libs/libgweather/DETAILS
| 2
gnome2-libs/libgweather/HISTORY
| 4
gnome2-libs/libgweather/libgweather-3.6.2.tar.xz.sig
|binary
gnome3-libs/gnome-desktop3/DETAILS
| 2
gnome3-libs/gnome-desktop3/HISTORY
| 3
gnome3-libs/gnome-desktop3/gnome-desktop-3.8.3.tar.xz.sig
|binary
26 files changed, 459 insertions(+), 8 deletions(-)

New commits:
commit 254f04ac1f27313cba3b28798f6548dabb342ee1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libgweather: Updated to 3.6.2
SOURCE matches upstream posted SHA256

commit 9cc3043f09ab46fa6c8f4fe78566864001fd1321
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-keyring: Updated to 3.6.3
SOURCE matches upstream SHA256

commit 4592754da4c0166613ce1c9195ad714577684172
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libgnome-keyring: Updated to 3.4.1
SOURCE matches upstream SHA256

commit 08f34a936836b73bdcddb0356953771543060151
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gsettings-desktop-schemas: Updated to 3.8.2
Match upstream posted SHA256

commit 333d904332c421e6b4e6e534c73453832fd37c77
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-desktop3: Updated to 3.8.3 (various memory leak fixes)

commit eb8d5a5993e81d5c4b3c3535f000e8362a7e1897
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-panel: Updated to 3.6.2

commit d0f7158bfbbe4fc8ca2d8a8a8367c38a76014991
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-panel: Fix compilation against gnome-desktop 3.8+
0001-panel-Fix-launcher-icon-animation-ending-with-black.patch,
0002-fix-build-error-due-to-missing-gweather-xml.h.patch,
0003-na-apply-style-after-realize.patch,
0004-drop-support-for-commandline-based-calendar-tasks-ap.patch,
0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch,
0006-panel-run-dialog-rename-helper-function.patch,
0007-notification_area-Use-the-generic-marshaller.patch: Added
from
http://git.pld-linux.org/gitweb.cgi/packages/gnome-panel.git/commitdiff/fd33e2e0d0dd96ab56e3ee8b297e7de83556c0e0

See https://bugzilla.gnome.org/show_bug.cgi?id=692385 for
removal of gnome-desktop-utils.h which lead me down this chase.

panel-run-dialog.c:45:50: fatal error:
libgnome-desktop/gnome-desktop-utils.h: No such file or directory
compilation terminated.

commit f45499dbff5dfc6fa9e1261518dab05d300d4524
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-panel: Depends on gnome-desktop in addition to gnome-desktop3

With gnome-desktop3 installed, but not gnome-desktop:
panel-run-dialog.c:45:50: fatal error:
libgnome-desktop/gnome-desktop-utils.h: No such file or directory

diff --git a/gnome2-libs/gnome-keyring/DETAILS
b/gnome2-libs/gnome-keyring/DETAILS
index 4b25d7c..fd1ade7 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-keyring
- VERSION=3.6.1
+ VERSION=3.6.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gnome-keyring/HISTORY
b/gnome2-libs/gnome-keyring/HISTORY
index 261d8a9..9c5a999 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,7 @@
+2013-06-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.6.3
+ SOURCE matches upstream SHA256
+
2012-10-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.1

diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-3.6.1.tar.xz.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-3.6.1.tar.xz.sig
deleted file mode 100644
index 210f5ac..0000000
Binary files a/gnome2-libs/gnome-keyring/gnome-keyring-3.6.1.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-3.6.3.tar.xz.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-3.6.3.tar.xz.sig
new file mode 100644
index 0000000..7598e7f
Binary files /dev/null and
b/gnome2-libs/gnome-keyring/gnome-keyring-3.6.3.tar.xz.sig differ
diff --git
a/gnome2-libs/gnome-panel/0001-panel-Fix-launcher-icon-animation-ending-with-black.patch

b/gnome2-libs/gnome-panel/0001-panel-Fix-launcher-icon-animation-ending-with-black.patch
new file mode 100644
index 0000000..66906f9
--- /dev/null
+++
b/gnome2-libs/gnome-panel/0001-panel-Fix-launcher-icon-animation-ending-with-black.patch
@@ -0,0 +1,35 @@
+From be33e799d968a073c0a8856c96d11e8594b88bc4 Mon Sep 17 00:00:00 2001
+From: Yannick Gicquel <ygicquel AT gmail.com>
+Date: Thu, 22 Nov 2012 08:37:26 +0100
+Subject: [PATCH] panel: Fix launcher icon animation ending with black
artifact
+
+We simply need to hide the animation window before unref'ing the pixbuf.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688618
+---
+ gnome-panel/xstuff.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
+index 5acbf66..4f8b605 100644
+--- a/gnome-panel/xstuff.c
++++ b/gnome-panel/xstuff.c
+@@ -326,12 +326,13 @@ zoom_draw (GtkWidget *widget,
+ g_source_remove (zoom->timeout_id);
+ zoom->timeout_id = 0;
+
++ gtk_widget_hide (widget);
++ g_idle_add (idle_destroy, widget);
++
+ g_object_unref (zoom->pixbuf);
+ zoom->pixbuf = NULL;
+
+ g_slice_free (CompositedZoomData, zoom);
+-
+- g_idle_add (idle_destroy, widget);
+ } else {
+ GdkPixbuf *scaled;
+ int width, height;
+--
+1.8.2
+
diff --git
a/gnome2-libs/gnome-panel/0002-fix-build-error-due-to-missing-gweather-xml.h.patch

b/gnome2-libs/gnome-panel/0002-fix-build-error-due-to-missing-gweather-xml.h.patch
new file mode 100644
index 0000000..8eabd1d
--- /dev/null
+++
b/gnome2-libs/gnome-panel/0002-fix-build-error-due-to-missing-gweather-xml.h.patch
@@ -0,0 +1,29 @@
+From f5550422e202041a70cce8776785e3e651a01d8d Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk AT src.gnome.org>
+Date: Thu, 3 Jan 2013 11:51:19 +0100
+Subject: [PATCH] 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
+---
+ applets/clock/clock.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+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 <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>
+--
+1.8.2
+
diff --git a/gnome2-libs/gnome-panel/0003-na-apply-style-after-realize.patch
b/gnome2-libs/gnome-panel/0003-na-apply-style-after-realize.patch
new file mode 100644
index 0000000..4895760
--- /dev/null
+++ b/gnome2-libs/gnome-panel/0003-na-apply-style-after-realize.patch
@@ -0,0 +1,47 @@
+From 58b73a9e3129eb25f030f8d02bcd15303b300814 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd AT laptop.org>
+Date: Mon, 17 Dec 2012 14:58:20 +0000
+Subject: [PATCH] na: apply style after realize
+
+Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
+icon from gnome-settings-daemon are appearing all-black on top of a black
+background.
+
+This is because style_updated is being called before the tray applet
+is realized, meaning that the following code in
+na_tray_applet_style_updated() causes a bail-out:
+
+ if (!applet->priv->tray)
+ return;
+
+and the style is never applied.
+
+Fix this by updating the style explicitly after realizing the widget.
+---
+ applets/notification_area/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/applets/notification_area/main.c
b/applets/notification_area/main.c
+index 5fc4d1d..5dad715 100644
+--- a/applets/notification_area/main.c
++++ b/applets/notification_area/main.c
+@@ -36,6 +36,8 @@
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
+
++static void na_tray_applet_style_updated (GtkWidget *widget);
++
+ struct _NaTrayAppletPrivate
+ {
+ NaTray *tray;
+@@ -78,6 +80,7 @@ na_tray_applet_realize (GtkWidget *widget)
+
get_gtk_orientation_from_applet_orient (orient));
+
+ gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET
(applet->priv->tray));
++ na_tray_applet_style_updated (widget);
+ gtk_widget_show (GTK_WIDGET (applet->priv->tray));
+ }
+
+--
+1.8.2
+
diff --git
a/gnome2-libs/gnome-panel/0004-drop-support-for-commandline-based-calendar-tasks-ap.patch

b/gnome2-libs/gnome-panel/0004-drop-support-for-commandline-based-calendar-tasks-ap.patch
new file mode 100644
index 0000000..c18c1bf
--- /dev/null
+++
b/gnome2-libs/gnome-panel/0004-drop-support-for-commandline-based-calendar-tasks-ap.patch
@@ -0,0 +1,53 @@
+From 452f59be8f9babf0ae33654e754da65151760a76 Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk AT src.gnome.org>
+Date: Fri, 8 Mar 2013 17:51:23 +0100
+Subject: [PATCH 4/6] drop support for commandline-based calendar/tasks
+ applications
+
+It's not worth the layering violations this would need.
+(Partial fix for bug #237308 .)
+---
+ applets/clock/calendar-window.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+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 */
+--
+1.8.2
+
diff --git
a/gnome2-libs/gnome-panel/0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch

b/gnome2-libs/gnome-panel/0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch
new file mode 100644
index 0000000..b6a6bf8
--- /dev/null
+++
b/gnome2-libs/gnome-panel/0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch
@@ -0,0 +1,177 @@
+From bf6af945130299a69a244afaee4eecbd3fb77233 Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk AT src.gnome.org>
+Date: Fri, 8 Mar 2013 18:08:32 +0100
+Subject: [PATCH 5/6] 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 .)
+---
+ gnome-panel/panel-run-dialog.c | 135
++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 133 insertions(+), 2 deletions(-)
+
+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,
+--
+1.8.2
+
diff --git
a/gnome2-libs/gnome-panel/0006-panel-run-dialog-rename-helper-function.patch
b/gnome2-libs/gnome-panel/0006-panel-run-dialog-rename-helper-function.patch
new file mode 100644
index 0000000..236c588
--- /dev/null
+++
b/gnome2-libs/gnome-panel/0006-panel-run-dialog-rename-helper-function.patch
@@ -0,0 +1,69 @@
+From 44eba7db43b227d9b15a2d64d0af97167522891d Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk AT src.gnome.org>
+Date: Fri, 8 Mar 2013 18:48:04 +0100
+Subject: [PATCH 6/6] 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).
+---
+ gnome-panel/panel-run-dialog.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+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);
+
+--
+1.8.2
+
diff --git a/gnome2-libs/gnome-panel/DETAILS b/gnome2-libs/gnome-panel/DETAILS
index e403d7d..c1d217d 100755
--- a/gnome2-libs/gnome-panel/DETAILS
+++ b/gnome2-libs/gnome-panel/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-panel
- VERSION=3.6.0
+ VERSION=3.6.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index 4e00e01..ef6928b 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,17 @@
+2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.6.2
+ * PRE_BUILD: Fix compilation against gnome-desktop 3.8+
+ * 0001-panel-Fix-launcher-icon-animation-ending-with-black.patch,
+ 0002-fix-build-error-due-to-missing-gweather-xml.h.patch,
+ 0003-na-apply-style-after-realize.patch,
+ 0004-drop-support-for-commandline-based-calendar-tasks-ap.patch,
+ 0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch,
+ 0006-panel-run-dialog-rename-helper-function.patch,
+ 0007-notification_area-Use-the-generic-marshaller.patch: Added from
+
http://git.pld-linux.org/gitweb.cgi/packages/gnome-panel.git/commitdiff/fd33e2e0d0dd96ab56e3ee8b297e7de83556c0e0
+ See https://bugzilla.gnome.org/show_bug.cgi?id=692385 for removal of
+ gnome-desktop-utils.h which lead me down this chase.
+
2012-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.0

diff --git a/gnome2-libs/gnome-panel/PRE_BUILD
b/gnome2-libs/gnome-panel/PRE_BUILD
new file mode 100755
index 0000000..3fb8e36
--- /dev/null
+++ b/gnome2-libs/gnome-panel/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+message "${MESSAGE_COLOR}Fix compilation against gnome-desktop
3.8+...${DEFAULT_COLOR}" &&
+# 0007-notification_area-Use-the-generic-marshaller.patch # doesn't apply to
us
+for patch in 0001-panel-Fix-launcher-icon-animation-ending-with-black.patch
0002-fix-build-error-due-to-missing-gweather-xml.h.patch
0003-na-apply-style-after-realize.patch
0004-drop-support-for-commandline-based-calendar-tasks-ap.patch
0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch
0006-panel-run-dialog-rename-helper-function.patch; do
+ patch -p1 < "${SPELL_DIRECTORY}"/$patch
+done
diff --git a/gnome2-libs/gnome-panel/gnome-panel-3.6.0.tar.xz.sig
b/gnome2-libs/gnome-panel/gnome-panel-3.6.0.tar.xz.sig
deleted file mode 100644
index 0b2b5d2..0000000
Binary files a/gnome2-libs/gnome-panel/gnome-panel-3.6.0.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-panel/gnome-panel-3.6.2.tar.xz.sig
b/gnome2-libs/gnome-panel/gnome-panel-3.6.2.tar.xz.sig
new file mode 100644
index 0000000..df9ddfc
Binary files /dev/null and
b/gnome2-libs/gnome-panel/gnome-panel-3.6.2.tar.xz.sig differ
diff --git a/gnome2-libs/gsettings-desktop-schemas/DETAILS
b/gnome2-libs/gsettings-desktop-schemas/DETAILS
index 734037a..82e531c 100755
--- a/gnome2-libs/gsettings-desktop-schemas/DETAILS
+++ b/gnome2-libs/gsettings-desktop-schemas/DETAILS
@@ -1,9 +1,10 @@
SPELL=gsettings-desktop-schemas
- VERSION=3.8.0
+ VERSION=3.8.2
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:a05d2c105418f6bdc84ed11594ba38f9057c8307999122a6adb04b4499e450ae3443c3777d8b2dc58fb08021f5488dd0cf4fdf541e7940808d2212f72cfb510c
+#
SOURCE_HASH=sha512:a05d2c105418f6bdc84ed11594ba38f9057c8307999122a6adb04b4499e450ae3443c3777d8b2dc58fb08021f5488dd0cf4fdf541e7940808d2212f72cfb510c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnome.org/
LICENSE[0]=LGPL
diff --git a/gnome2-libs/gsettings-desktop-schemas/HISTORY
b/gnome2-libs/gsettings-desktop-schemas/HISTORY
index a9ab588..b71e6ed 100644
--- a/gnome2-libs/gsettings-desktop-schemas/HISTORY
+++ b/gnome2-libs/gsettings-desktop-schemas/HISTORY
@@ -1,3 +1,7 @@
+2013-06-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.8.2
+ Match upstream posted SHA256
+
2013-05-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.1

diff --git
a/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.2.tar.xz.sig

b/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.2.tar.xz.sig
new file mode 100644
index 0000000..b5eb043
Binary files /dev/null and
b/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.2.tar.xz.sig
differ
diff --git a/gnome2-libs/libgnome-keyring/DETAILS
b/gnome2-libs/libgnome-keyring/DETAILS
index ac5983a..c018f70 100755
--- a/gnome2-libs/libgnome-keyring/DETAILS
+++ b/gnome2-libs/libgnome-keyring/DETAILS
@@ -1,6 +1,5 @@
SPELL=libgnome-keyring
- VERSION=3.4.0
- PATCHLEVEL=1
+ VERSION=3.4.1
BRANCH=${VERSION:0:3}
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/libgnome-keyring/HISTORY
b/gnome2-libs/libgnome-keyring/HISTORY
index 2e289be..ec84ef6 100644
--- a/gnome2-libs/libgnome-keyring/HISTORY
+++ b/gnome2-libs/libgnome-keyring/HISTORY
@@ -1,3 +1,7 @@
+2013-06-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.4.1
+ SOURCE matches upstream SHA256
+
2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: killed syntax error

diff --git a/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.0.tar.xz.sig
b/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.0.tar.xz.sig
deleted file mode 100644
index 2be757b..0000000
Binary files a/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.0.tar.xz.sig
and /dev/null differ
diff --git a/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.1.tar.xz.sig
b/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.1.tar.xz.sig
new file mode 100644
index 0000000..b020733
Binary files /dev/null and
b/gnome2-libs/libgnome-keyring/libgnome-keyring-3.4.1.tar.xz.sig differ
diff --git a/gnome2-libs/libgweather/DETAILS b/gnome2-libs/libgweather/DETAILS
index 787e132..3497590 100755
--- a/gnome2-libs/libgweather/DETAILS
+++ b/gnome2-libs/libgweather/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgweather
- VERSION=3.6.0
+ VERSION=3.6.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgweather/HISTORY b/gnome2-libs/libgweather/HISTORY
index d238c8e..f456ef2 100644
--- a/gnome2-libs/libgweather/HISTORY
+++ b/gnome2-libs/libgweather/HISTORY
@@ -1,3 +1,7 @@
+2013-06-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.6.2
+ SOURCE matches upstream posted SHA256
+
2012-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.0

diff --git a/gnome2-libs/libgweather/libgweather-3.6.0.tar.xz.sig
b/gnome2-libs/libgweather/libgweather-3.6.0.tar.xz.sig
deleted file mode 100644
index 4ae4eff..0000000
Binary files a/gnome2-libs/libgweather/libgweather-3.6.0.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/libgweather/libgweather-3.6.2.tar.xz.sig
b/gnome2-libs/libgweather/libgweather-3.6.2.tar.xz.sig
new file mode 100644
index 0000000..149e927
Binary files /dev/null and
b/gnome2-libs/libgweather/libgweather-3.6.2.tar.xz.sig differ
diff --git a/gnome3-libs/gnome-desktop3/DETAILS
b/gnome3-libs/gnome-desktop3/DETAILS
index 2964e5a..2285de0 100755
--- a/gnome3-libs/gnome-desktop3/DETAILS
+++ b/gnome3-libs/gnome-desktop3/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-desktop3
- VERSION=3.8.1
+ VERSION=3.8.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-desktop-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-desktop-$VERSION
diff --git a/gnome3-libs/gnome-desktop3/HISTORY
b/gnome3-libs/gnome-desktop3/HISTORY
index 5b80d4d..268ee32 100644
--- a/gnome3-libs/gnome-desktop3/HISTORY
+++ b/gnome3-libs/gnome-desktop3/HISTORY
@@ -1,3 +1,6 @@
+2013-06-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.8.3 (various memory leak fixes)
+
2013-05-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.1

diff --git a/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.1.tar.xz.sig
b/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.1.tar.xz.sig
deleted file mode 100644
index 28c2ca9..0000000
Binary files a/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.1.tar.xz.sig and
/dev/null differ
diff --git a/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.3.tar.xz.sig
b/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.3.tar.xz.sig
new file mode 100644
index 0000000..4c68bcd
Binary files /dev/null and
b/gnome3-libs/gnome-desktop3/gnome-desktop-3.8.3.tar.xz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (254f04ac1f27313cba3b28798f6548dabb342ee1), Eric Sandall, 06/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page