[arch-commits] Commit in xchat/repos (4 files)

[Giovanni Scafora]

    Date: Saturday, November 8, 2008 @ 19:54:23
  Author: giovanni
Revision: 18776

Merged revisions 18703 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/xchat/trunk

........
  r18703 | allan | 2008-11-08 12:11:54 -0800 (sab, 08 nov 2008) | 1 line
  
  upgpkg: xchat 2.8.6-3
........

Added:
  xchat/repos/extra-x86_64/xchat-gtk2.patch
    (from rev 18703, xchat/trunk/xchat-gtk2.patch)
Modified:
  xchat/repos/extra-x86_64/	(properties)
  xchat/repos/extra-x86_64/ChangeLog
  xchat/repos/extra-x86_64/PKGBUILD

------------------+
 ChangeLog        |    6 ++++++
 PKGBUILD         |   14 ++++++++++----
 xchat-gtk2.patch |   12 ++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)


Property changes on: xchat/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xchat/trunk:1-11891
   + /xchat/trunk:1-18775

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-11-09 00:39:38 UTC (rev 18775)
+++ extra-x86_64/ChangeLog	2008-11-09 00:54:23 UTC (rev 18776)
@@ -1,3 +1,9 @@
+2008-11-08  Eric Belanger  <eric at archlinux.org>
+
+	* xchat 2.8.6-3
+	* Rebuild for python-2.6 (close FS#11998)
+	* Applied gtk2 patch
+
 2008-09-05  Eric Belanger  <eric at archlinux.org>
 
 	* xchat 2.8.6-2

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-09 00:39:38 UTC (rev 18775)
+++ extra-x86_64/PKGBUILD	2008-11-09 00:54:23 UTC (rev 18776)
@@ -3,7 +3,7 @@
 
 pkgname=xchat
 pkgver=2.8.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK+ based IRC client"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -13,13 +13,19 @@
 optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin')
 options=('!libtool')
 source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \
-        http://www.xchat.org/files/source/2.8/patches/xc286-smallfixes.diff)
-md5sums=('1f2670865d43a23a9abc596dde999aca' 'eb68b6261bf6740cb5f223627eb8f384')
-sha1sums=('7a7463e65cb26c680ed70dd96cec98bcc05435a4' 'b13eb421f6d72fca195b398c606d9413aec57fc4')
+        http://www.xchat.org/files/source/2.8/patches/xc286-smallfixes.diff
+        xchat-gtk2.patch)
+md5sums=('1f2670865d43a23a9abc596dde999aca' 
+         'eb68b6261bf6740cb5f223627eb8f384'
+         'f3fe00982c0bec93152ed0b32438ef87')
+sha1sums=('7a7463e65cb26c680ed70dd96cec98bcc05435a4'
+          'b13eb421f6d72fca195b398c606d9413aec57fc4'
+          'cf9c5d93af262474e0855f2965210a4a3600acc7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p1 < ../xc286-smallfixes.diff || return 1
+  patch -p1 < ../xchat-gtk2.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --enable-openssl --enable-dbus \
               --disable-gnome --disable-textfe \

Copied: xchat/repos/extra-x86_64/xchat-gtk2.patch (from rev 18703, xchat/trunk/xchat-gtk2.patch)
===================================================================
--- extra-x86_64/xchat-gtk2.patch	                        (rev 0)
+++ extra-x86_64/xchat-gtk2.patch	2008-11-09 00:54:23 UTC (rev 18776)
@@ -0,0 +1,12 @@
+--- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 
+05:48:02.000000000 +0100
++++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 
+02:18:39.000000000 +0200
+@@ -270,6 +270,6 @@
+ xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
+ void gtk_xtext_buffer_free (xtext_buffer *buf);
+ void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
+-GtkType gtk_xtext_get_type (void);
++GType gtk_xtext_get_type (void);
+
+ #endif