summaryrefslogtreecommitdiffstats
path: root/source/xap/xchat
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/xchat')
-rw-r--r--source/xap/xchat/patches/patches.url1
-rw-r--r--source/xap/xchat/patches/xc286-smallfixes.diff68
-rw-r--r--source/xap/xchat/patches/xchat.gtk_2_14.diff191
-rwxr-xr-xsource/xap/xchat/xchat.SlackBuild6
4 files changed, 3 insertions, 263 deletions
diff --git a/source/xap/xchat/patches/patches.url b/source/xap/xchat/patches/patches.url
deleted file mode 100644
index 33531f7c9..000000000
--- a/source/xap/xchat/patches/patches.url
+++ /dev/null
@@ -1 +0,0 @@
-http://xchat.org/files/source/2.8/patches/
diff --git a/source/xap/xchat/patches/xc286-smallfixes.diff b/source/xap/xchat/patches/xc286-smallfixes.diff
deleted file mode 100644
index da9001522..000000000
--- a/source/xap/xchat/patches/xc286-smallfixes.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Various small fixes from CVS that are considered safe to apply to 2.8.6.
-#
---- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100
-+++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000 +1000
-@@ -886,7 +886,6 @@
- set_showval (session *sess, const struct prefs *var, char *tbuf)
- {
- int len, dots, j;
-- static const char *offon[] = { "OFF", "ON" };
-
- len = strlen (var->name);
- memcpy (tbuf, var->name, len);
-@@ -909,8 +908,10 @@
- *((int *) &prefs + var->offset));
- break;
- case TYPE_BOOL:
-- sprintf (tbuf + len, "\0033:\017 %s\n", offon[
-- *((int *) &prefs + var->offset)]);
-+ if (*((int *) &prefs + var->offset))
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
-+ else
-+ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
- break;
- }
- PrintText (sess, tbuf);
---- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000
-+++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000
-@@ -32,7 +32,7 @@
-
- #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
-
--channel_options chanopt[] =
-+static const channel_options chanopt[] =
- {
- {"alert_beep", "BEEP", S_F(alert_beep)},
- {"alert_taskbar", NULL, S_F(alert_taskbar)},
---- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100
-+++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000 +1000
-@@ -509,6 +509,8 @@
- list = g_slist_nth (net->servlist, net->selected);
- if (!list)
- list = net->servlist;
-+ if (!list)
-+ return;
- ircserv = list->data;
-
- /* incase a protocol switch is added to the servlist gui */
---- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100
-+++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000
-@@ -216,7 +216,7 @@
- static void
- scrollback_save (session *sess, char *text)
- {
-- char buf[1024];
-+ char buf[512 * 4];
- time_t stamp;
- int len;
-
-@@ -266,7 +266,7 @@
- scrollback_load (session *sess)
- {
- int fh;
-- char buf[1024];
-+ char buf[512 * 4];
- char *text;
- time_t stamp;
- int lines;
diff --git a/source/xap/xchat/patches/xchat.gtk_2_14.diff b/source/xap/xchat/patches/xchat.gtk_2_14.diff
deleted file mode 100644
index f0a42a1cc..000000000
--- a/source/xap/xchat/patches/xchat.gtk_2_14.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur xchat-2.8.6.orig/src/fe-gtk/about.c xchat-2.8.6/src/fe-gtk/about.c
---- xchat-2.8.6.orig/src/fe-gtk/about.c 2008-04-01 10:58:38.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/about.c 2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/ascii.c xchat-2.8.6/src/fe-gtk/ascii.c
---- xchat-2.8.6.orig/src/fe-gtk/ascii.c 2008-02-05 11:02:50.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/ascii.c 2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/banlist.c xchat-2.8.6/src/fe-gtk/banlist.c
---- xchat-2.8.6.orig/src/fe-gtk/banlist.c 2008-02-05 11:02:50.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/banlist.c 2008-10-12 14:12:59.329706289 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/fe-gtk.c xchat-2.8.6/src/fe-gtk/fe-gtk.c
---- xchat-2.8.6.orig/src/fe-gtk/fe-gtk.c 2008-02-24 09:39:44.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/fe-gtk.c 2008-10-12 14:12:59.339702951 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/ignoregui.c xchat-2.8.6/src/fe-gtk/ignoregui.c
---- xchat-2.8.6.orig/src/fe-gtk/ignoregui.c 2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/ignoregui.c 2008-10-12 14:12:59.343034799 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/maingui.c xchat-2.8.6/src/fe-gtk/maingui.c
---- xchat-2.8.6.orig/src/fe-gtk/maingui.c 2008-04-01 10:53:41.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/maingui.c 2008-10-12 14:12:59.349699891 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdlib.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/menu.c xchat-2.8.6/src/fe-gtk/menu.c
---- xchat-2.8.6.orig/src/fe-gtk/menu.c 2008-06-08 09:59:37.000000000 +0200
-+++ xchat-2.8.6/src/fe-gtk/menu.c 2008-10-12 14:12:59.349699891 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/notifygui.c xchat-2.8.6/src/fe-gtk/notifygui.c
---- xchat-2.8.6.orig/src/fe-gtk/notifygui.c 2008-02-05 11:03:34.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/notifygui.c 2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/palette.c xchat-2.8.6/src/fe-gtk/palette.c
---- xchat-2.8.6.orig/src/fe-gtk/palette.c 2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/palette.c 2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <stdlib.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/pixmaps.c xchat-2.8.6/src/fe-gtk/pixmaps.c
---- xchat-2.8.6.orig/src/fe-gtk/pixmaps.c 2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/pixmaps.c 2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/plugingui.c xchat-2.8.6/src/fe-gtk/plugingui.c
---- xchat-2.8.6.orig/src/fe-gtk/plugingui.c 2008-02-05 11:02:52.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/plugingui.c 2008-10-12 14:12:59.363033500 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <string.h>
- #include <stdio.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/rawlog.c xchat-2.8.6/src/fe-gtk/rawlog.c
---- xchat-2.8.6.orig/src/fe-gtk/rawlog.c 2008-02-24 05:49:37.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/rawlog.c 2008-10-12 14:12:59.366369608 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/search.c xchat-2.8.6/src/fe-gtk/search.c
---- xchat-2.8.6.orig/src/fe-gtk/search.c 2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/search.c 2008-10-12 14:12:59.369703062 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/urlgrab.c xchat-2.8.6/src/fe-gtk/urlgrab.c
---- xchat-2.8.6.orig/src/fe-gtk/urlgrab.c 2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/urlgrab.c 2008-10-12 14:12:59.376368714 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/userlistgui.c xchat-2.8.6/src/fe-gtk/userlistgui.c
---- xchat-2.8.6.orig/src/fe-gtk/userlistgui.c 2008-02-05 11:02:53.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/userlistgui.c 2008-10-12 14:12:59.379703216 +0200
-@@ -16,7 +16,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
--#define GTK_DISABLE_DEPRECATED
-+/* #define GTK_DISABLE_DEPRECATED */
-
- #include <stdio.h>
- #include <string.h>
-diff -ur xchat-2.8.6.orig/src/fe-gtk/xtext.h xchat-2.8.6/src/fe-gtk/xtext.h
---- xchat-2.8.6.orig/src/fe-gtk/xtext.h 2008-02-24 05:48:02.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-10-12 14:10:49.203049619 +0200
-@@ -1,6 +1,7 @@
- #ifndef __XTEXT_H__
- #define __XTEXT_H__
-
-+#include <gtk/gtktypeutils.h>
- #include <gtk/gtkadjustment.h>
- #ifdef USE_XFT
- #include <X11/Xft/Xft.h>
diff --git a/source/xap/xchat/xchat.SlackBuild b/source/xap/xchat/xchat.SlackBuild
index 8058f9043..cc7b5e1a8 100755
--- a/source/xap/xchat/xchat.SlackBuild
+++ b/source/xap/xchat/xchat.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=2.8.6
-BUILD=${BUILD:-5}
+VERSION=2.8.8
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-27 11:33:41 +0000