[csw-devel] SF.net SVN: gar:[20619] csw/mgar/pkg/xchat/trunk

[chninkel at users.sourceforge.net]

Revision: 20619
          http://gar.svn.sourceforge.net/gar/?rev=20619&view=rev
Author:   chninkel
Date:     2013-04-06 19:42:24 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
xchat/trunk: updated to 2.8.8 and rebuilt against libssl 1.0.0

Modified Paths:
--------------
    csw/mgar/pkg/xchat/trunk/Makefile
    csw/mgar/pkg/xchat/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff

Modified: csw/mgar/pkg/xchat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 19:40:23 UTC (rev 20618)
+++ csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 19:42:24 UTC (rev 20619)
@@ -1,5 +1,5 @@
 NAME = xchat
-VERSION = 2.8.6
+VERSION = 2.8.8
 CATEGORIES = gnome
 GARTYPE = v2
 
@@ -40,10 +40,13 @@
 # upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-# Official XChat patches
-PATCHFILES  = xc286-smallfixes.diff
-PATCHFILES += xchat26-compiletime.diff
+# Fix some compilation problem under Solaris
+PATCHFILES = xchat26-compiletime.diff
 
+# Patch taken http://trac.macports.org/ticket/33959 and updated
+# to be able to compile against a more recent version of glib
+PATCHFILES += patch-glib-2.32.diff
+
 LDFLAGS =
 NOISALIST = 1
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/xchat/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchat/trunk/checksums	2013-04-06 19:40:23 UTC (rev 20618)
+++ csw/mgar/pkg/xchat/trunk/checksums	2013-04-06 19:42:24 UTC (rev 20619)
@@ -1,4 +1 @@
-1f2670865d43a23a9abc596dde999aca  download/xchat-2.8.6.tar.bz2
-41ec540885de7c34625768aa1fb9682b  download/fixme.sh
-eb68b6261bf6740cb5f223627eb8f384  download/xc286-smallfixes.diff
-02f27ba7bcf10d36523618fb201d9634  download/xchat26-compiletime.diff
+6775c44f38e84d06c06c336b32c4a452  xchat-2.8.8.tar.bz2

Added: csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff	                        (rev 0)
+++ csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff	2013-04-06 19:42:24 UTC (rev 20619)
@@ -0,0 +1,63 @@
+diff -Naurp ./src/common/modes.c ./src/common/modes.c
+--- ./src/common/modes.c	2010-05-29 18:52:18.000000000 -0700
++++ ./src/common/modes.c	2012-04-09 14:02:12.000000000 -0700
+@@ -20,7 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ 
+ #include "xchat.h"
+ #include "xchatc.h"
+diff -Naurp ./src/common/servlist.c ./src/common/servlist.c
+--- ./src/common/servlist.c	2010-05-16 00:24:26.000000000 -0700
++++ ./src/common/servlist.c	2012-04-09 14:02:12.000000000 -0700
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+diff -Naurp ./src/common/text.c ./src/common/text.c
+--- ./src/common/text.c	2010-05-29 19:14:41.000000000 -0700
++++ ./src/common/text.c	2012-04-09 14:02:12.000000000 -0700
+@@ -28,7 +28,7 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
+diff -Naurp ./src/common/util.c ./src/common/util.c
+--- ./src/common/util.c	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/util.c	2012-04-09 14:02:12.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+diff -Naurp ./src/common/xchat.h ./src/common/xchat.h
+--- ./src/common/xchat.h	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/xchat.h	2012-04-09 14:01:05.000000000 -0700
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.