Ticket #9864: xchat-2.6.4-p1.patch

Portfile

@@ -8 +8 @@
 description     GTK+2 IRC client
 homepage        http://www.xchat.org/
 platforms       darwin
 
-long_description XChat2 is a graphical IRC client based on GTK2 that has \
-                 many features and can be scripted with Perl and/or Python.
+long_description \
+                XChat2 is a graphical IRC client based on GTK2 that has \
+                many features and can be scripted with Perl and/or Python.
 
 master_sites    http://xchat.org/files/source/2.6/
 
 distname        xchat-${portversion}
@@ -20 +21 @@
                 rmd160 998069aa49e7b26dd98d53173e9dc67f947f95a2
 
 use_bzip2       yes
 
+patchfiles      xc264-fix-proxy.diff \
+                xc264-fix-cursor.diff
+
 depends_lib     lib:libgtk.2:gtk2
 
 configure.env   LDFLAGS="-L${prefix}/lib -L${x11prefix}/lib" \
                 CFLAGS="-I${prefix}/include" CPPFLAGS="-I${prefix}/include \

files/xc262-fix-ircurl.diff

@@ -1 @@
-#
-# Fixes opening a irc:// URL via "xchat -a --url=abc123" command while
-# "Skip serverlist on startup" is off. This fix is only relevant when
-# opening an initial instance of xchat (i.e not via dbus).
-#
---- src/common/xchat.c  2006-01-02 22:38:23.000000000 +1100
-+++ src/common/xchat.c  2006-03-27 23:08:18.000000000 +1100
-@@ -918,7 +918,8 @@
- 
-        servlist_init ();                                                       /* load server list */
- 
--       if (!prefs.slist_skip)
-+       /* if we got a URL, don't open the server list GUI */
-+       if (!prefs.slist_skip && !arg_url)
-                fe_serverlist_open (NULL);
- 
-        /* turned OFF via -a arg */
-@@ -937,7 +938,7 @@
-                }
-        } else
-        {
--               if (prefs.slist_skip)
-+               if (prefs.slist_skip || arg_url)
-                        new_ircwindow (NULL, NULL, SESS_SERVER, 0);
-        }
- }

files/xc264-fix-cursor.diff

@@ +1 @@
+#
+# Fixes the invisible cursor color when using GTKSpell and a black
+# input box (when "Use the text box font & colors" is ON).
+#
+diff -u -r1.66 fe-gtk.c
+--- src/fe-gtk/fe-gtk.c 7 Jun 2006 06:16:51 -0000       1.66
++++ src/fe-gtk/fe-gtk.c 12 Jun 2006 03:13:24 -0000
+@@ -225,7 +225,11 @@
+ const char cursor_color_rc[] =
+        "style \"xc-ib-st\""
+        "{"
++#ifdef USE_GTKSPELL
++               "GtkTextView::cursor-color=\"#%02x%02x%02x\""
++#else
+                "GtkEntry::cursor-color=\"#%02x%02x%02x\""
++#endif
+        "}"
+        "widget \"*.xchat-inputbox\" style : application \"xc-ib-st\"";
+ 

files/xc264-fix-proxy.diff

@@ +1 @@
+#
+# Fix proxy
+#
+diff -u -r1.71 server.c
+--- src/common/server.c 29 May 2006 06:53:25 -0000      1.71
++++ src/common/server.c 8 Jun 2006 15:22:07 -0000
+@@ -1534,7 +1534,10 @@
+        if (!serv->dont_use_proxy && (prefs.proxy_type == 5))
+                error = net_connect (ns_server, serv->proxy_sok4, serv->proxy_sok6, &psok);
+        else
++       {
+                error = net_connect (ns_server, serv->sok4, serv->sok6, &sok);
++               psok = sok;
++       }
+ 
+        if (error != 0)
+        {