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

Allan McRae allan at archlinux.org
Mon Apr 13 01:10:02 EDT 2009


    Date: Monday, April 13, 2009 @ 01:10:01
  Author: allan
Revision: 35392

fix svn conflict

Modified:
  xchat-gnome/repos/extra-i686/	(properties)
  xchat-gnome/repos/extra-i686/PKGBUILD
Deleted:
  xchat-gnome/repos/extra-i686/tcl-plugin.patch

------------------+
 PKGBUILD         |    5 ++---
 tcl-plugin.patch |   13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)


Property changes on: xchat-gnome/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xchat-gnome/trunk:1-33081
   + /xchat-gnome/trunk:1-35391

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-13 05:08:09 UTC (rev 35391)
+++ extra-i686/PKGBUILD	2009-04-13 05:10:01 UTC (rev 35392)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xchat-gnome
-pkgver=0.26.0
+pkgver=0.26.1
 pkgrel=1
 pkgdesc="GNOME frontend to the popular X-Chat IRC client."
 arch=('i686' 'x86_64')
@@ -18,12 +18,11 @@
             'tcl: plugin')
 install=xchat-gnome.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.26/${pkgname}-${pkgver}.tar.gz)
-md5sums=('379475b71dcdd03a97588e8f230614ff')
+md5sums=('e355d71d76cd97a0764e37bfacf09101')
 options=('!libtool')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
-  #patch -Np1 -i ../tcl-plugin.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \

Deleted: extra-i686/tcl-plugin.patch
===================================================================
--- extra-i686/tcl-plugin.patch	2009-04-13 05:08:09 UTC (rev 35391)
+++ extra-i686/tcl-plugin.patch	2009-04-13 05:10:01 UTC (rev 35392)
@@ -1,13 +0,0 @@
---- xchat-gnome-0.17.old/plugins/tcl/tclplugin.c	2007-03-06 17:47:26.000000000 -0500
-+++ xchat-gnome-0.17/plugins/tcl/tclplugin.c	2007-06-24 17:53:04.000000000 -0400
-@@ -2215,8 +2215,8 @@
- void xchat_plugin_get_info(char **name, char **desc, char **version, void **reserved)
- {
-    strncpy(PVERSION, &RCSID[19], 5);
--   *name = _("tclplugin");
--   *desc = _("Tcl plugin for XChat");
-+   *name = "tclplugin";
-+   *desc = "Tcl plugin for XChat";
-    *version = PVERSION;
-    if (reserved)
-       *reserved = NULL;



More information about the arch-commits mailing list