[SM-Commit] GIT changes to master grimoire by George Sherwood (00208e88115a68e7631a1c8e2f24ddd07594b798)

George Sherwood scm at mail.sourcemage.org
Mon Nov 6 12:32:06 EST 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 chat-irc/xchat/HISTORY                     |    4 +
 chat-irc/xchat/PRE_BUILD                   |    3 +
 chat-irc/xchat/text-fe.patch               |   64 -----------------------------
 chat-irc/xchat/xchat-2.6.8-fix_proto.patch |   34 +++++++++++++++
 4 files changed, 41 insertions(+), 64 deletions(-)

New commits:
commit 00208e88115a68e7631a1c8e2f24ddd07594b798
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    xchat: Added fix to build text front end. Bug #13245.  Not sure how much
    longer it will be possible.  text front end is not developed any more.

diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index 9bebfee..c66c39a 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,7 @@
+2006-11-06 George Sherwood <george at beernabeer.com>
+	* PRE_BUILD: Added to apply patch
+	* xchat-2.6.8-fix_proto.patch: Added fix for text front end (Bug #13245)
+
 2006-10-21 George Sherwood <george at beernabeer.com>
 	* DEPENDS: Added optional_depends libsexy
 
diff --git a/chat-irc/xchat/PRE_BUILD b/chat-irc/xchat/PRE_BUILD
new file mode 100755
index 0000000..833576e
--- /dev/null
+++ b/chat-irc/xchat/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xchat-2.6.8-fix_proto.patch
diff --git a/chat-irc/xchat/text-fe.patch b/chat-irc/xchat/text-fe.patch
deleted file mode 100644
index cff753a..0000000
--- a/chat-irc/xchat/text-fe.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/fe-text/fe-text.c.orig	2005-09-28 03:34:45.000000000 -0400
-+++ src/fe-text/fe-text.c	2005-11-16 16:48:13.000000000 -0500
-@@ -109,12 +109,6 @@
- 	fe_print_text (sess, buf);
- 
- 	fe_print_text (sess, "\n\nCompiled in Features\0032:\017 "
--#ifdef USE_PERL
--	"Perl "
--#endif
--#ifdef USE_PYTHON
--	"Python "
--#endif
- #ifdef USE_PLUGIN
- 	"Plugin "
- #endif
-@@ -124,9 +118,6 @@
- #ifdef USE_OPENSSL
- 	"OpenSSL "
- #endif
--#ifdef SOCKS
--	"Socks5 "
--#endif
- #ifdef USE_IPV6
- 	"IPv6"
- #endif
-@@ -406,7 +397,7 @@
- 			return 0;
- 		}
- 	}
--	return 1;
-+	return -1;
- }
- 
- void
-@@ -557,7 +548,7 @@
- }
- 
- void
--fe_message (char *msg, int wait)
-+fe_message (char *msg, int flags)
- {
- 	puts (msg);
- }
-@@ -565,7 +556,7 @@
- void
- fe_close_window (struct session *sess)
- {
--	kill_session_callback (sess);
-+	session_free (sess);
- 	done = TRUE;
- }
- 
-@@ -803,6 +794,11 @@
- {
- 	return -1;
- }
-+void *
-+fe_gui_info_ptr (session *sess, int info_type)
-+{
-+	return NULL;
-+}
- void fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *), void *ud)
- {
- }
diff --git a/chat-irc/xchat/xchat-2.6.8-fix_proto.patch b/chat-irc/xchat/xchat-2.6.8-fix_proto.patch
new file mode 100644
index 0000000..6ba4691
--- /dev/null
+++ b/chat-irc/xchat/xchat-2.6.8-fix_proto.patch
@@ -0,0 +1,34 @@
+diff -Nur xchat-2.6.8/src/fe-text/fe-text.c xchat-2.6.8-hacked/src/fe-text/fe-text.c
+--- src/fe-text/fe-text.c	2006-07-16 13:34:21.000000000 +0900
++++ src/fe-text/fe-text.c	2006-10-17 14:55:11.000000000 +0900
+@@ -584,7 +584,7 @@
+ {
+ }
+ void
+-fe_set_tab_color (struct session *sess, int col, int flash)
++fe_set_tab_color (struct session *sess, int col)
+ {
+ }
+ void
+@@ -759,7 +759,7 @@
+ {
+ }
+ void
+-fe_lastlog (session * sess, session * lastlog_sess, char *sstr)
++fe_lastlog (session * sess, session * lastlog_sess, char *sstr, gboolean regexp)
+ {
+ }
+ void
+@@ -845,3 +845,12 @@
+ fe_server_event (server *serv, int type, int arg)
+ {
+ }
++void
++fe_flash_window (struct session *sess)
++{
++}
++void fe_get_file (const char *title, char *initial,
++				 void (*callback) (void *userdata, char *file), void *userdata,
++				 int flags)
++{
++}



More information about the SM-Commit mailing list