Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5314a7b351cebf17923db0ad457972b58a0817e5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5314a7b351cebf17923db0ad457972b58a0817e5)
  • Date: Tue, 17 May 2011 00:25:13 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

xfce/terminal/DETAILS | 4 +-
xfce/terminal/HISTORY | 4 ++
xfce/terminal/PRE_BUILD | 4 --
xfce/terminal/terminal.patch | 81
-------------------------------------------
4 files changed, 7 insertions(+), 86 deletions(-)

New commits:
commit 5314a7b351cebf17923db0ad457972b58a0817e5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

terminal: update to 0.4.7

diff --git a/xfce/terminal/DETAILS b/xfce/terminal/DETAILS
index e431648..8ebfd82 100755
--- a/xfce/terminal/DETAILS
+++ b/xfce/terminal/DETAILS
@@ -1,10 +1,10 @@
SPELL=terminal
- VERSION=0.4.6
+ VERSION=0.4.7
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:d49e4eb958ab84c355b22077138baa45a48e2b31fe2fd7c4552d675f2470403ab2f383ba695a8399dd3948540a048f8e8d9d80663604fa73dc00af7fd49b9d6e
+
SOURCE_HASH=sha512:b6ca9f4e72add1b62c51842a06bcc6cea5d6a1af220d7a15b6ce63d97d6d44efc57ee426ecbca65c47dcd03f75fc7d95d6ed3565bd5fb974cab655b4866aebb5
WEB_SITE=http://terminal.os-cillation.com/
ENTERED=20050101
LICENSE=GPL
diff --git a/xfce/terminal/HISTORY b/xfce/terminal/HISTORY
index 9c41820..aca02a7 100644
--- a/xfce/terminal/HISTORY
+++ b/xfce/terminal/HISTORY
@@ -1,3 +1,7 @@
+2011-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.7
+ * PRE_BUILD, terminal.patch: patch removed, applied upstream
+
2011-01-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added gnome-doc-utils opt dep
* PRE_BUILD: fix network interaction while generation docs
diff --git a/xfce/terminal/PRE_BUILD b/xfce/terminal/PRE_BUILD
index 883fd7a..f6b41c8 100755
--- a/xfce/terminal/PRE_BUILD
+++ b/xfce/terminal/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-sed -i "s:--nonet::g" doc/Makefile.in &&
-
-patch -p0 < "$SPELL_DIRECTORY/terminal.patch"
+sed -i "s:--nonet::g" doc/Makefile.in
diff --git a/xfce/terminal/terminal.patch b/xfce/terminal/terminal.patch
deleted file mode 100644
index a992a90..0000000
--- a/xfce/terminal/terminal.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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 Ismael Luceno (5314a7b351cebf17923db0ad457972b58a0817e5), Ismael Luceno, 05/17/2011

Archive powered by MHonArc 2.6.24.

Top of Page