From: Kacper Kornet Date: Sun, 13 Jun 2010 00:16:14 +0000 (+0000) Subject: - up to 2.8.8 X-Git-Tag: auto/th/xchat-2_8_8-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=560d0966bad5b1c7d1a2942ee59d59f1221f1e39;p=packages%2Fxchat.git - up to 2.8.8 - remove smallfixes.patch (applied upstream) - update desktop.patch and gtk_2_14.patch Changed files: xchat-desktop.patch -> 1.5 xchat-gtk_2_14.patch -> 1.2 xchat-smallfixes.patch -> 1.2 xchat.spec -> 1.189 --- diff --git a/xchat-desktop.patch b/xchat-desktop.patch index a4cdd63..aeb4ddb 100644 --- a/xchat-desktop.patch +++ b/xchat-desktop.patch @@ -16,10 +16,9 @@ diff -uNr xchat-2.8.4.orig/xchat.desktop xchat-2.8.4/xchat.desktop Comment[zh_TW]=X-Chat 聊天程式 Comment=Chat with other people using Internet Relay Chat Exec=xchat --Icon=xchat.png -+Icon=xchat + Icon=xchat Terminal=false Type=Application --Categories=Application;Network; +-Categories=Network; +Categories=GTK;Network;IRCClient; StartupNotify=true diff --git a/xchat-gtk_2_14.patch b/xchat-gtk_2_14.patch index f0a42a1..e28e75d 100644 --- a/xchat-gtk_2_14.patch +++ b/xchat-gtk_2_14.patch @@ -1,183 +1,3 @@ -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include -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 - #include 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 diff --git a/xchat-smallfixes.patch b/xchat-smallfixes.patch deleted file mode 100644 index da90015..0000000 --- a/xchat-smallfixes.patch +++ /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/xchat.spec b/xchat.spec index 5c20906..b6a4bcc 100644 --- a/xchat.spec +++ b/xchat.spec @@ -20,20 +20,19 @@ Summary(sv.UTF-8): En GTK+-IRC- (chatt-)klient Summary(uk.UTF-8): GTK+ IRC клієнт Summary(zh_CN.UTF-8): GTK+ IRC (聊天) 客户。 Name: xchat -Version: 2.8.6 -Release: 7 +Version: 2.8.8 +Release: 0.01 Epoch: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://xchat.org/files/source/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 1f2670865d43a23a9abc596dde999aca +# Source0-md5: 6775c44f38e84d06c06c336b32c4a452 Source1: %{name}-pl.po Patch0: %{name}-desktop.patch Patch1: %{name}-locale_names.patch Patch2: %{name}-long-delimiter.patch Patch3: %{name}-domains.patch -Patch4: %{name}-smallfixes.patch -Patch5: %{name}-gtk_2_14.patch +Patch4: %{name}-gtk_2_14.patch URL: http://www.xchat.org/ BuildRequires: GConf2-devel BuildRequires: autoconf @@ -141,7 +140,6 @@ X-Chat - ще один IRC клієнт для X Window System, який вик %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 cp %{SOURCE1} po/pl.po