Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce6809d4f6c136cacbc3c9562715f8d44284314e
commit ce6809d4f6c136cacbc3c9562715f8d44284314e Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Jun 4 19:19:02 2010 +0200 xchat-2.8.8-1-x86_64 *version bump *xchat is not dead :p diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild index 2e61441..fe07183 100644 --- a/source/xapps/xchat/FrugalBuild +++ b/source/xapps/xchat/FrugalBuild @@ -4,8 +4,8 @@ # Contributor: VMiklos <vmik...@frugalware.org> pkgname=xchat -pkgver=2.8.6 -pkgrel=5 +pkgver=2.8.8 +pkgrel=1 pkgdesc="A GTK+2 based IRC client" url="http://www.xchat.org/"; depends=('gtk+2>=2.20.0-2' 'openssl' 'glib2>=2.14.1-5' 'libsexy>=0.1.11-4' 'dbus-glib') @@ -16,8 +16,7 @@ archs=('i686' 'x86_64' 'ppc') 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 \ README.Frugalware \ - xchat-2.6.1-fw.diff xchat-2.8.6-gtk+.patch \ - fix_deprecated_widgets.diff) + xchat-2.6.1-fw.diff) #_F_gnome_schemas=('etc/gconf/schemas/apps_xchat_url_handler.schemas') _F_gnome_desktop="y" options=('scriptlet') @@ -48,10 +47,8 @@ build() Fsplit xchat-plugins usr/lib/xchat/plugins/* } -sha1sums=('7a7463e65cb26c680ed70dd96cec98bcc05435a4' \ +sha1sums=('a4ac161e4e40f4bbabc492675a1ff4380dba8d68' \ 'd3042890e443739f4637ccd289d4a04b7d5b879b' \ - 'f05f3ffc59e0dc9241d31d4786a4cca893592e99' \ - 'd709e48a60a3fdefd88612a8dc4ea43684256488' \ - '58dd62827a81eed161fb2f6ff21dc42eda7ace2a') + 'f05f3ffc59e0dc9241d31d4786a4cca893592e99') # optimization OK diff --git a/source/xapps/xchat/fix_deprecated_widgets.diff b/source/xapps/xchat/fix_deprecated_widgets.diff deleted file mode 100644 index a1a70cb..0000000 --- a/source/xapps/xchat/fix_deprecated_widgets.diff +++ /dev/null @@ -1,50 +0,0 @@ -## Description: Fix FTBFS errors due to new GTK 2.20 widgets names. - -...@dpatch@ -diff -Naur xchat-2.8.6foo/src/fe-gtk/fe-gtk.c xchat-2.8.6/src/fe-gtk/fe-gtk.c ---- xchat-2.8.6foo/src/fe-gtk/fe-gtk.c 2010-04-06 21:48:19.000000000 +0200 -+++ xchat-2.8.6/src/fe-gtk/fe-gtk.c 2010-04-06 21:49:27.000000000 +0200 -@@ -819,7 +819,7 @@ - switch (info_type) - { - case 0: /* window status */ -- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window))) -+ if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) - return 2; /* hidden (iconified or systray) */ - #if GTK_CHECK_VERSION(2,4,0) - if (gtk_window_is_active (GTK_WINDOW (sess->gui->window))) -diff -Naur xchat-2.8.6foo/src/fe-gtk/maingui.c xchat-2.8.6/src/fe-gtk/maingui.c ---- xchat-2.8.6foo/src/fe-gtk/maingui.c 2008-04-01 10:53:41.000000000 +0200 -+++ xchat-2.8.6/src/fe-gtk/maingui.c 2010-04-06 21:50:45.000000000 +0200 -@@ -599,7 +599,7 @@ - int num; - GtkWidget *f = NULL; - -- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box)) -+ if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) - f = current_sess->gui->input_box; - - num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box); -@@ -809,8 +809,8 @@ - static void - mg_hide_empty_pane (GtkPaned *pane) - { -- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) && -- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2))) -+ if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && -+ (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) - { - gtk_widget_hide (GTK_WIDGET (pane)); - return; -diff -Naur xchat-2.8.6foo/src/fe-gtk/menu.c xchat-2.8.6/src/fe-gtk/menu.c ---- xchat-2.8.6foo/src/fe-gtk/menu.c 2008-06-08 09:59:37.000000000 +0200 -+++ xchat-2.8.6/src/fe-gtk/menu.c 2010-04-06 21:49:54.000000000 +0200 -@@ -1670,7 +1670,7 @@ - menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) - { - /* GTK2.2 behaviour */ -- return GTK_WIDGET_IS_SENSITIVE (widget); -+ return gtk_widget_is_sensitive (widget); - } - - #endif diff --git a/source/xapps/xchat/xchat-2.8.6-gtk+.patch b/source/xapps/xchat/xchat-2.8.6-gtk+.patch deleted file mode 100644 index 5013918..0000000 --- a/source/xapps/xchat/xchat-2.8.6-gtk+.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
