sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by George Sherwood (138c354fdc0db3e7236d6a6c58355fc3cfe77ea6)

From: George Sherwood <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (138c354fdc0db3e7236d6a6c58355fc3cfe77ea6)
Date: Sun, 30 Jan 2011 15:44:59 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

xfce/terminal/DETAILS | 4 +-
xfce/terminal/HISTORY | 6 +++
xfce/terminal/PRE_BUILD | 5 ++
xfce/terminal/terminal.patch | 81
+++++++++++++++++++++++++++++++++++++++++++
4 files changed, 94 insertions(+), 2 deletions(-)

New commits:
commit 138c354fdc0db3e7236d6a6c58355fc3cfe77ea6
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

terminal: Updated to version 0.4.6. Added upstream patch needed until
0.4.7 is released.

diff --git a/xfce/terminal/DETAILS b/xfce/terminal/DETAILS
index 06b1815..e431648 100755
--- a/xfce/terminal/DETAILS
+++ b/xfce/terminal/DETAILS
@@ -1,10 +1,10 @@
SPELL=terminal
- VERSION=0.4.5
+ VERSION=0.4.6
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Terminal-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Terminal-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:faf0b45270a580b06bb8f27ad9e4a30e912de3f143d530651744fd5bbc62f831e2040b401b02897aaa2583fe4dacce2f3c05dac0c6a594410659ded7bc65211b
+
SOURCE_HASH=sha512:d49e4eb958ab84c355b22077138baa45a48e2b31fe2fd7c4552d675f2470403ab2f383ba695a8399dd3948540a048f8e8d9d80663604fa73dc00af7fd49b9d6e
WEB_SITE=http://terminal.os-cillation.com/
ENTERED=20050101
LICENSE=GPL
diff --git a/xfce/terminal/HISTORY b/xfce/terminal/HISTORY
index 0786955..13b7a36 100644
--- a/xfce/terminal/HISTORY
+++ b/xfce/terminal/HISTORY
@@ -1,3 +1,9 @@
+2011-01-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.4.6
+ * PRE_BUILD: Added to apply upstream patch
+ * terminal.patch: Added upstream patch
+ See http://bugzilla.xfce.org/show_bug.cgi?id=6921
+
2011-01-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: renewed source urls

diff --git a/xfce/terminal/PRE_BUILD b/xfce/terminal/PRE_BUILD
new file mode 100755
index 0000000..bfa9511
--- /dev/null
+++ b/xfce/terminal/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/terminal.patch
diff --git a/xfce/terminal/terminal.patch b/xfce/terminal/terminal.patch
new file mode 100644
index 0000000..a992a90
--- /dev/null
+++ b/xfce/terminal/terminal.patch
@@ -0,0 +1,81 @@
+--- terminal/terminal-screen.c
++++ terminal/terminal-screen.c
+@@ -90,6 +90,7 @@ static gchar *terminal_screen_parse_title
(TerminalScreen
+ const
gchar *title);
+ static gchar **terminal_screen_get_child_environment
(TerminalScreen *screen);
+ static void terminal_screen_update_background
(TerminalScreen *screen);
++static void terminal_screen_update_background_fast
(TerminalScreen *screen);
+ static void terminal_screen_update_binding_backspace
(TerminalScreen *screen);
+ static void terminal_screen_update_binding_delete
(TerminalScreen *screen);
+ static void terminal_screen_update_colors
(TerminalScreen *screen);
+@@ -141,6 +142,8 @@ struct _TerminalScreen
+
+ guint session_id;
+
++ gulong background_signal_id;
++
+ GPid pid;
+ gchar *working_directory;
+
+@@ -243,7 +246,6 @@ terminal_screen_init (TerminalScreen *screen)
+ "signal::selection-changed", G_CALLBACK
(terminal_screen_vte_selection_changed), screen,
+ "signal::window-title-changed", G_CALLBACK
(terminal_screen_vte_window_title_changed), screen,
+ "signal::resize-window", G_CALLBACK
(terminal_screen_vte_resize_window), screen,
+- "swapped-signal::size-allocate", G_CALLBACK
(terminal_screen_timer_background), screen,
+ "swapped-signal::style-set", G_CALLBACK
(terminal_screen_update_colors), screen,
+ NULL);
+ gtk_box_pack_start (GTK_BOX (screen), screen->terminal, TRUE, TRUE, 0);
+@@ -712,6 +714,18 @@ terminal_screen_get_child_environment (TerminalScreen
*screen)
+
+
+ static void
++terminal_screen_update_background_fast (TerminalScreen *screen)
++{
++ if (G_UNLIKELY (screen->background_timer_id == 0))
++ {
++ screen->background_timer_id = g_idle_add_full (G_PRIORITY_LOW,
terminal_screen_timer_background,
++ screen,
terminal_screen_timer_background_destroy);
++ }
++}
++
++
++
++static void
+ terminal_screen_update_background (TerminalScreen *screen)
+ {
+ if (G_UNLIKELY (screen->background_timer_id != 0))
+@@ -1222,9 +1236,25 @@ terminal_screen_timer_background (gpointer user_data)
+ if (G_LIKELY (image != NULL))
+ g_object_unref (G_OBJECT (image));
+ g_object_unref (G_OBJECT (loader));
++
++ /* refresh background on size changes */
++ if (screen->background_signal_id == 0)
++ {
++ screen->background_signal_id =
++ g_signal_connect_swapped (G_OBJECT (screen->terminal),
"size-allocate",
++ G_CALLBACK
(terminal_screen_update_background_fast), screen);
++ }
+ }
+ else
+ {
++ /* stop updating on size changes */
++ if (screen->background_signal_id != 0)
++ {
++ g_signal_handler_disconnect (G_OBJECT (screen->terminal),
screen->background_signal_id);
++ screen->background_signal_id = 0;
++ }
++
++ /* WARNING: the causes a resize too! */
+ vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal),
NULL);
+ }
+
+@@ -1365,7 +1395,7 @@ terminal_screen_launch_child (TerminalScreen *screen)
+
+ if (!vte_terminal_fork_command_full (VTE_TERMINAL (screen->terminal),
+ update ? VTE_PTY_DEFAULT :
VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
+- screen->working_directory,
argv2, env,
++ screen->working_directory,
argv2, env,
+ spawn_flags,
+ NULL, NULL,
+ &screen->pid, &error))

[SM-Commit] GIT changes to master grimoire by George Sherwood (138c354fdc0db3e7236d6a6c58355fc3cfe77ea6), George Sherwood, 01/30/2011