From 74cd63fbfe608c487c4514e66b481559db9f7c61 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 2 Apr 2006 22:45:26 +0000 Subject: Restore URL pattern matching. Reported by: Thomas git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6002 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-terminal/Makefile | 3 +- .../files/patch-src_terminal-screen.c | 33 ++++++++++++++++++++++ x11/gnometerminal/Makefile | 3 +- .../files/patch-src_terminal-screen.c | 33 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 x11/gnome-terminal/files/patch-src_terminal-screen.c create mode 100644 x11/gnometerminal/files/patch-src_terminal-screen.c (limited to 'x11') diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 3c01a36ff..de55b5db3 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnometerminal/Makefile,v 1.65 2006/03/13 07:23:15 mezz Exp $ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.66 2006/03/13 19:31:47 mezz Exp $ # PORTNAME= gnometerminal PORTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c new file mode 100644 index 000000000..0f5c397cb --- /dev/null +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -0,0 +1,33 @@ +--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006 ++++ src/terminal-screen.c Sun Apr 2 18:42:41 2006 +@@ -278,22 +278,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, +- "\\", FLAVOR_AS_IS); ++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" ++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); + + terminal_screen_setup_dnd (screen); + diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index 3c01a36ff..de55b5db3 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnometerminal/Makefile,v 1.65 2006/03/13 07:23:15 mezz Exp $ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.66 2006/03/13 19:31:47 mezz Exp $ # PORTNAME= gnometerminal PORTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} diff --git a/x11/gnometerminal/files/patch-src_terminal-screen.c b/x11/gnometerminal/files/patch-src_terminal-screen.c new file mode 100644 index 000000000..0f5c397cb --- /dev/null +++ b/x11/gnometerminal/files/patch-src_terminal-screen.c @@ -0,0 +1,33 @@ +--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006 ++++ src/terminal-screen.c Sun Apr 2 18:42:41 2006 +@@ -278,22 +278,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, +- "\\", FLAVOR_AS_IS); ++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" ++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); + + terminal_screen_setup_dnd (screen); + -- cgit v1.2.3