[pkgsrc/trunk]: pkgsrc/x11/gnome-terminal Update to gnome-terminal-2.22.3. A...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ba1bb504b47
branches:  trunk
changeset: 546601:1ba1bb504b47
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Sep 05 21:08:32 2008 +0000

description:
Update to gnome-terminal-2.22.3.  Added patch-ab, which fixes
annoying problems with window resizing and tabs.

Bug fixes:

        * src/encoding.c: (update_active_encodings_from_string_list): Use the
        correct allocator.

        * src/terminal-window.c: (notebook_page_added_callback): Fix menubar
        visibility in newly created windows from DND. Bug #528915, patch by
        Gábor Szeder.

        * src/terminal.c: (handle_new_terminal_event): Ignore unknown options
        when handling a new-terminal event from another instance. Don't call
        exit() when parsing the passed options fail; instead just ignore the
        request. Bug #531720.

diffstat:

 x11/gnome-terminal/Makefile         |   4 +-
 x11/gnome-terminal/distinfo         |   9 ++-
 x11/gnome-terminal/patches/patch-ab |  84 +++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 6 deletions(-)

diffs (118 lines):

diff -r cca4d5dc13e9 -r 1ba1bb504b47 x11/gnome-terminal/Makefile
--- a/x11/gnome-terminal/Makefile       Fri Sep 05 20:50:22 2008 +0000
+++ b/x11/gnome-terminal/Makefile       Fri Sep 05 21:08:32 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/05 21:08:32 bjs Exp $
 #
 
-DISTNAME=              gnome-terminal-2.22.1
+DISTNAME=              gnome-terminal-2.22.3
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.22/}
 EXTRACT_SUFX=          .tar.bz2
diff -r cca4d5dc13e9 -r 1ba1bb504b47 x11/gnome-terminal/distinfo
--- a/x11/gnome-terminal/distinfo       Fri Sep 05 20:50:22 2008 +0000
+++ b/x11/gnome-terminal/distinfo       Fri Sep 05 21:08:32 2008 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2008/04/26 00:36:04 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/09/05 21:08:32 bjs Exp $
 
-SHA1 (gnome-terminal-2.22.1.tar.bz2) = 87fca1f6bbb7dcbc5f9d6ad4397bacf0cca7e42a
-RMD160 (gnome-terminal-2.22.1.tar.bz2) = b101493bdf74c6ddfd7f08f0875f097c998b194e
-Size (gnome-terminal-2.22.1.tar.bz2) = 1801064 bytes
+SHA1 (gnome-terminal-2.22.3.tar.bz2) = 8aaf556134884d3f7430e7966ff2c87df5843e3e
+RMD160 (gnome-terminal-2.22.3.tar.bz2) = f90e99dbff067425b7bb7f373565485f7e60f04c
+Size (gnome-terminal-2.22.3.tar.bz2) = 1803177 bytes
 SHA1 (patch-aa) = 852623004e3aa680be4c090bb58fd23ac0055aa1
+SHA1 (patch-ab) = 6f5aaee3a31c6ec4b6dfe632e275bcdca075e4ab
 SHA1 (patch-ac) = 0f7f7f64abd8f614e44c068ac398afe92c5506aa
 SHA1 (patch-ad) = 2a44f790e3c839ffe1e7ae31972a4bb1de701484
diff -r cca4d5dc13e9 -r 1ba1bb504b47 x11/gnome-terminal/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-terminal/patches/patch-ab       Fri Sep 05 21:08:32 2008 +0000
@@ -0,0 +1,84 @@
+$NetBSD: patch-ab,v 1.3 2008/09/05 21:08:32 bjs Exp $
+
+--- src/terminal-screen.c.orig 2008-03-20 06:16:25.000000000 -0400
++++ src/terminal-screen.c
+@@ -232,6 +232,10 @@ terminal_screen_size_allocate (GtkWidget
+       GtkAllocation *allocation)
+ {
+   GtkWidget *child;
++  GtkAllocation old_allocation;
++
++  old_allocation.width = widget->allocation.width;
++  old_allocation.height = widget->allocation.height;
+ 
+   widget->allocation = *allocation;
+ 
+@@ -239,6 +243,13 @@ terminal_screen_size_allocate (GtkWidget
+   g_assert (child != NULL);
+ 
+   gtk_widget_size_allocate (child, allocation);
++
++  if (old_allocation.width != allocation->width ||
++      old_allocation.height != allocation->height)
++    {
++      GtkWidget *term = TERMINAL_SCREEN (widget)->priv->term;
++      gtk_widget_queue_resize_no_redraw (term);
++    }
+ }
+ 
+ static void
+@@ -316,22 +327,22 @@ terminal_screen_init (TerminalScreen *sc
+ #define URLPATH   "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
+ 
+   terminal_widget_match_add (screen->priv->term,
+-                           "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
+-                           "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS);
++                           "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
++                           "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS);
+ 
+   terminal_widget_match_add (screen->priv->term,
+-                           "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
+-                           "(:[0-9]+)?(" URLPATH ")?\\>/?",
++                           "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
++                           "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?",
+                            FLAVOR_DEFAULT_TO_HTTP);
+ 
+   terminal_widget_match_add (screen->priv->term,
+-                           "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
+-                           "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
++                           "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
++                           "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
+                            FLAVOR_EMAIL);
+ 
+   terminal_widget_match_add (screen->priv->term,
+-                           "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
+-                           "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
++                           "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
++                           "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
+ 
+   terminal_screen_setup_dnd (screen);
+ 
+@@ -622,7 +633,6 @@ terminal_screen_reread_profile (Terminal
+        */
+       terminal_screen_update_scrollbar (screen);
+       terminal_window_update_icon (screen->priv->window);
+-      terminal_window_update_geometry (screen->priv->window);
+     }
+   
+   if (GTK_WIDGET_REALIZED (screen->priv->term))
+@@ -898,7 +908,6 @@ terminal_screen_update_on_realize (GtkWi
+   
+   terminal_widget_set_allow_bold (term,
+                                   terminal_profile_get_allow_bold (profile));
+-  terminal_window_set_size (screen->priv->window, screen, TRUE);
+ }
+ 
+ static void
+@@ -1008,6 +1017,7 @@ terminal_screen_get_override_command (Te
+ GtkWidget*
+ terminal_screen_get_widget (TerminalScreen *screen)
+ {
++  if (screen == NULL) return NULL;
+   return screen->priv->term;
+ }
+