diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-06 06:53:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-06 08:08:15 +0000 |
| commit | 4a9c197f6cffb61ef36c7e92fa6422cb42ddd51b (patch) | |
| tree | 4ae1d3f769ce4178c597cd4ec6406cf07463d408 /main/xfce4-terminal | |
| parent | 10dc823f7c725fcf9a56a5e674ac9c9a5b0bfb66 (diff) | |
| download | aports-4a9c197f6cffb61ef36c7e92fa6422cb42ddd51b.tar.bz2 aports-4a9c197f6cffb61ef36c7e92fa6422cb42ddd51b.tar.xz | |
main/xfce4-terminal: remove unused patches
Diffstat (limited to 'main/xfce4-terminal')
| -rw-r--r-- | main/xfce4-terminal/Improve-URL-matching.patch | 52 | ||||
| -rw-r--r-- | main/xfce4-terminal/terminal-dont-die-on-dbus-kill.patch | 10 |
2 files changed, 0 insertions, 62 deletions
diff --git a/main/xfce4-terminal/Improve-URL-matching.patch b/main/xfce4-terminal/Improve-URL-matching.patch deleted file mode 100644 index 619fb2df8e..0000000000 --- a/main/xfce4-terminal/Improve-URL-matching.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 52fcc3e27927e7f730b836c9a9cc90791b792b8c Mon Sep 17 00:00:00 2001 -From: Jeff Shipley <jshipley@fastmail.fm> -Date: Tue, 23 Jul 2013 13:20:42 -0600 -Subject: [PATCH] Improve URL matching - -- Add support for matching IPv6 addresses -- Fix URL parsing (bug #7959 and bug #9800) -- Add some characters for email address parsing ---- - terminal/terminal-widget.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c -index d490994..5a7d266 100644 ---- a/terminal/terminal-widget.c -+++ b/terminal/terminal-widget.c -@@ -40,17 +40,19 @@ - - - --#define USERCHARS "-_+[:alnum:]" -+#define USERCHARS "-[:alnum:]\\Q_.+\\E" - #define USERCHARS_CLASS "[" USERCHARS "]" - #define PASSCHARS_CLASS "[-[:alnum:]\\Q,?;.:/!%$^*&~\"#'\\E]" - #define HOSTCHARS_CLASS "[-[:alnum:]]" --#define HOST HOSTCHARS_CLASS "+(\\." HOSTCHARS_CLASS "+)*" -+#define HOSTNAME HOSTCHARS_CLASS "+(?:\\." HOSTCHARS_CLASS "+)*" -+#define IPV6ADDRESS "\\[(?:[[:xdigit:]]{0,4}:){2,7}[[:xdigit:]]{0,4}\\]" -+#define HOST "(?:" HOSTNAME "|" IPV6ADDRESS ")" - #define PORT "(?:\\:[[:digit:]]{1,5})?" - #define PATHCHARS_CLASS "[-[:alnum:]\\Q_$.+!*,;@&=?/:~#'%\\E]" --#define PATHTERM_CLASS "[^\\Q]'.}>) \t\r\n,\"\\E]" -+#define PATHTERM_CLASS "[[:alnum:]\\Q_$+*@&=/~#%\\E]" - #define SCHEME "(?:news:|telnet:|nntp:|file:\\/|https?:|ftps?:|sftp:|webcal:|magnet:)" - #define USERPASS USERCHARS_CLASS "+(?:" PASSCHARS_CLASS "+)?" --#define URLPATH "(?:(/"PATHCHARS_CLASS"+(?:[(]"PATHCHARS_CLASS"*[)])*"PATHCHARS_CLASS"*)*"PATHTERM_CLASS")?" -+#define URLPATH "(?:(?:\\(" PATHCHARS_CLASS "*\\)|" PATHCHARS_CLASS ")*(?:\\(" PATHCHARS_CLASS "*\\)|" PATHTERM_CLASS "))?" - - - -@@ -78,7 +80,7 @@ TerminalRegexPattern; - static const TerminalRegexPattern regex_patterns[] = - { - { SCHEME "//(?:" USERPASS "\\@)?" HOST PORT URLPATH, PATTERN_TYPE_FULL_HTTP }, -- { "(?:www|ftp)" HOSTCHARS_CLASS "*\\." HOST PORT URLPATH, PATTERN_TYPE_HTTP }, -+ { "(?:www[[:digit:]]{0,3}|ftp)" HOSTCHARS_CLASS "*\\." HOST PORT URLPATH, PATTERN_TYPE_HTTP }, - { "(?:mailto:)?" USERCHARS_CLASS "[" USERCHARS ".]*\\@" HOSTCHARS_CLASS "+\\." HOST, PATTERN_TYPE_EMAIL }, - { "news:[[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+", PATTERN_TYPE_FULL_HTTP } - }; --- -1.8.1.2 - diff --git a/main/xfce4-terminal/terminal-dont-die-on-dbus-kill.patch b/main/xfce4-terminal/terminal-dont-die-on-dbus-kill.patch deleted file mode 100644 index 3b0da17098..0000000000 --- a/main/xfce4-terminal/terminal-dont-die-on-dbus-kill.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/terminal/terminal-dbus.c.orig 2007-01-23 22:25:12.000000000 +0000 -+++ b/terminal/terminal-dbus.c 2007-01-23 22:25:50.000000000 +0000 -@@ -191,6 +191,7 @@ terminal_dbus_register_service (Terminal - - /* register DBus connection with GLib main loop */ - dbus_connection_setup_with_g_main (connection, NULL); -+ dbus_connection_set_exit_on_disconnect (connection, FALSE); - - if (dbus_bus_request_name (connection, TERMINAL_DBUS_SERVICE, 0, &derror) < 0) - { |