Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d8726a308cf7c124cddee912952e10c9b120502
commit 1d8726a308cf7c124cddee912952e10c9b120502 Author: Miklos Vajna <[email protected]> Date: Sun Apr 21 12:36:47 2013 +0200 xchat-2.8.8-7-x86_64 - fix build with newer glib diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild index 3574b89..5dee4e2 100644 --- a/source/xapps/xchat/FrugalBuild +++ b/source/xapps/xchat/FrugalBuild @@ -4,7 +4,7 @@ pkgname=xchat pkgver=2.8.8 -pkgrel=6 +pkgrel=7 pkgdesc="A GTK+2 based IRC client" url="http://www.xchat.org/"; depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'openssl>=1.0.0' 'glib2>=2.14.1-5' 'libsexy>=0.1.11-4' 'dbus-glib' 'libnotify>=0.7') @@ -14,7 +14,7 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep Source: | sed 's/.* \([0-9\.]*\)$/\1/'" source=(http://www.xchat.org/files/source/`echo $pkgver|sed 's/\([0-9].[0-9]\).[0-9]/\1/'`/$pkgname-$pkgver.tar.bz2 \ - xchat-2.6.1-fw.diff libnotify07.diff) + xchat-2.6.1-fw.diff libnotify07.diff xchat-2.8.8-glib.patch) #_F_gnome_schemas=('etc/gconf/schemas/apps_xchat_url_handler.schemas') _F_gnome_desktop="y" options=('scriptlet') @@ -24,7 +24,7 @@ Finclude gnome-scriptlet subpkgs=('xchat-plugins') subdescs=('X-chat TCL/Python/Perl plugin modules') -subdepends=('xchat python perl tcl') +subdepends=('xchat python>=>=2.7.4-1 perl tcl') subgroups=('xapps') subarchs=('i686 x86_64') @@ -46,6 +46,7 @@ build() sha1sums=('a4ac161e4e40f4bbabc492675a1ff4380dba8d68' \ 'f05f3ffc59e0dc9241d31d4786a4cca893592e99' \ - 'd4c1fe610e44b9b1add2c7081761a31852e0263c') + 'd4c1fe610e44b9b1add2c7081761a31852e0263c' \ + '7b7b12637145833b9da36960d795d22523942267') # optimization OK diff --git a/source/xapps/xchat/xchat-2.8.8-glib.patch b/source/xapps/xchat/xchat-2.8.8-glib.patch new file mode 100644 index 0000000..0012ce5 --- /dev/null +++ b/source/xapps/xchat/xchat-2.8.8-glib.patch @@ -0,0 +1,61 @@ +--- src/common/text.c.orig 2012-02-25 11:05:23.890274334 -0600 ++++ src/common/text.c 2012-02-25 11:05:39.006195489 -0600 +@@ -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" +--- src/common/servlist.c.orig 2012-02-25 11:04:30.601501605 -0600 ++++ src/common/servlist.c 2012-02-25 11:04:42.964072823 -0600 +@@ -24,7 +24,7 @@ + #include <unistd.h> + + #include "xchat.h" +-#include <glib/ghash.h> ++#include <glib.h> + + #include "cfgfiles.h" + #include "fe.h" +--- src/common/dbus/dbus-client.c.orig 2012-02-25 10:59:23.948527589 -0600 ++++ src/common/dbus/dbus-client.c 2012-02-25 11:00:40.082203787 -0600 +@@ -53,11 +53,6 @@ + GError *error = NULL; + char *command = NULL; + +- /* GnomeVFS >=2.15 uses D-Bus and threads, so threads should be +- * initialised before opening for the first time a D-Bus connection */ +- if (!g_thread_supported ()) { +- g_thread_init (NULL); +- } + dbus_g_thread_init (); + + /* if there is nothing to do, return now. */ +--- src/common/xchat.h.orig 2012-02-25 11:29:33.400499630 -0600 ++++ src/common/xchat.h 2012-02-25 11:29:51.774834912 -0600 +@@ -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 +--- src/common/util.c.orig 2012-02-25 11:38:29.404622998 -0600 ++++ src/common/util.c 2012-02-25 11:38:51.904482615 -0600 +@@ -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" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
