Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=3e81699159aa31a06fe9ccb8fc47a8a0b46e3ca7
commit 3e81699159aa31a06fe9ccb8fc47a8a0b46e3ca7 Author: Devil505 <devil505li...@gmail.com> Date: Thu Sep 9 10:14:52 2010 +0200 xchat-gnome-0.26.1-1-i686 * version bump * added patch for gtk+2 diff --git a/source/gnome-extra/xchat-gnome/FrugalBuild b/source/gnome-extra/xchat-gnome/FrugalBuild index b25635f..a7cc519 100644 --- a/source/gnome-extra/xchat-gnome/FrugalBuild +++ b/source/gnome-extra/xchat-gnome/FrugalBuild @@ -2,17 +2,15 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=xchat-gnome -pkgver=0.18 -pkgrel=2 +pkgver=0.26.1 +pkgrel=1 pkgdesc="GNOME frontend to the popular X-Chat IRC client." url="http://xchat-gnome.navi.cx/"; -depends=('libgnomeui>=2.24.3-3' 'libsexy=0.1.11' 'libnotify' 'notification-daemon' 'libbonobo' 'dbus-glib>=0.71') +depends=('libgnomeui>=2.24.3-3' 'libsexy=0.1.11' 'libnotify' 'notification-daemon' 'libbonobo' 'dbus-glib>=0.71' 'libcanberra-gtk') makedepends=('perl' 'tcl' 'gettext' 'python' 'intltool' 'gnome-doc-utils') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="Flasttar $url/?page_id=15" -source=(http://releases.navi.cx/xchat-gnome/$pkgname-$pkgver.tar.bz2) _F_gnome_schemas=('/etc/gconf/schemas/apps_xchat.schemas' '/etc/gconf/schemas/notification.schemas' '/etc/gconf/schemas/urlscraper.schemas' @@ -20,9 +18,11 @@ _F_gnome_schemas=('/etc/gconf/schemas/apps_xchat.schemas' _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" -Finclude gnome-scriptlet +Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-ipv6 --disable-gtkfe --enable-shm" -sha1sums=('0391bfeaac53697cc080478c74c5e0de0423c636') +source=($source gtk2-2.20.patch) +sha1sums=('85d205baeca5f10be9245c582ae53fbb40a4ef17' \ + 'f1bfc5af50be7c10a9db96be20185325636d8da9') build() { diff --git a/source/gnome-extra/xchat-gnome/gtk2-2.20.patch b/source/gnome-extra/xchat-gnome/gtk2-2.20.patch new file mode 100644 index 0000000..7a5dced --- /dev/null +++ b/source/gnome-extra/xchat-gnome/gtk2-2.20.patch @@ -0,0 +1,137 @@ +diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c +--- xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c 2008-09-07 09:18:45.000000000 -0400 ++++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c 2010-03-28 16:16:52.181405173 -0400 +@@ -753,7 +753,7 @@ fe_gui_info (session * sess, int info_ty + { + switch (info_type) { + case 0: +- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (gui.main_window))) { ++ if (!gtk_widget_get_visible (GTK_WIDGET (gui.main_window))) { + return 2; + } + if (gtk_window_is_active (GTK_WINDOW (gui.main_window))) { +diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c xchat-gnome-0.26.1/src/fe-gnome/find-bar.c +--- xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c 2007-03-09 10:42:57.000000000 -0500 ++++ xchat-gnome-0.26.1/src/fe-gnome/find-bar.c 2010-03-28 16:26:24.300405158 -0400 +@@ -247,7 +247,7 @@ find_bar_close (FindBar *bar) + { + gint position; + +- if (!GTK_WIDGET_VISIBLE (bar)) { ++ if (!gtk_widget_get_visible (GTK_WIDGET (bar))) { + return; + } + +diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c xchat-gnome-0.26.1/src/fe-gnome/text-entry.c +--- xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c 2008-09-07 10:02:45.000000000 -0400 ++++ xchat-gnome-0.26.1/src/fe-gnome/text-entry.c 2010-03-28 16:39:48.755153605 -0400 +@@ -667,7 +667,7 @@ text_entry_set_current (TextEntry *entry + char *selection = NULL, *text = NULL; + int start, end; + +- g_return_if_fail (GTK_WIDGET_REALIZED (widget)); ++ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (widget))); + + if (sess == priv->current) { + return; +diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c +--- xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c 2008-10-13 17:02:16.000000000 -0400 ++++ xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c 2010-03-28 16:47:55.703154452 -0400 +@@ -261,12 +261,12 @@ userlist_gui_show (void) + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui.userlist_toggle), TRUE); + +- if (!GTK_WIDGET_REALIZED (gui.userlist_window)) { ++ if (!gtk_widget_get_realized (GTK_WIDGET (gui.userlist_window))) { + gtk_widget_realize (gui.userlist_window); + } + gtk_widget_size_request (gui.userlist, &request); + +- if (GTK_WIDGET_REALIZED (gui.userlist_toggle)) ++ if (gtk_widget_get_realized (GTK_WIDGET (gui.userlist_toggle))) + anchor_widget = gui.userlist_toggle; + else + anchor_widget = gui.main_window; +diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c xchat-gnome-0.26.1/src/fe-gnome/xtext.c +--- xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c 2009-01-16 08:17:31.000000000 -0500 ++++ xchat-gnome-0.26.1/src/fe-gnome/xtext.c 2010-03-28 16:57:17.441402617 -0400 +@@ -1086,7 +1086,7 @@ gtk_xtext_size_allocate (GtkWidget * wid + xtext->avoid_trans = FALSE; + + widget->allocation = *allocation; +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (GTK_WIDGET (widget))) + { + xtext->buffer->window_width = allocation->width; + xtext->buffer->window_height = allocation->height; +@@ -4113,7 +4113,7 @@ gtk_xtext_set_palette (GtkXText * xtext, + xtext->palette[i] = palette[i].pixel; + } + +- if (GTK_WIDGET_REALIZED (xtext)) ++ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + { + xtext_set_fg (xtext, xtext->fgc, XTEXT_FG); + xtext_set_bg (xtext, xtext->fgc, XTEXT_BG); +@@ -4211,7 +4211,7 @@ gtk_xtext_set_font (GtkXText *xtext, cha + + gtk_xtext_fix_indent (xtext->buffer); + +- if (GTK_WIDGET_REALIZED (xtext)) ++ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + gtk_xtext_recalc_widths (xtext->buffer, TRUE); + + return TRUE; +@@ -4248,7 +4248,7 @@ gtk_xtext_set_background (GtkXText * xte + if (trans) + { + xtext->shaded = shaded; +- if (GTK_WIDGET_REALIZED (xtext)) ++ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + gtk_xtext_load_trans (xtext); + return; + } +@@ -4260,14 +4260,14 @@ gtk_xtext_set_background (GtkXText * xte + if (pixmap != 0) + { + g_object_ref (pixmap); +- if (GTK_WIDGET_REALIZED (xtext)) ++ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + { + gdk_gc_set_tile (xtext->bgc, pixmap); + gdk_gc_set_ts_origin (xtext->bgc, 0, 0); + xtext->ts_x = xtext->ts_y = 0; + gdk_gc_set_fill (xtext->bgc, GDK_TILED); + } +- } else if (GTK_WIDGET_REALIZED (xtext)) ++ } else if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + { + g_object_unref (xtext->bgc); + val.subwindow_mode = GDK_INCLUDE_INFERIORS; +@@ -4516,7 +4516,7 @@ gtk_xtext_render_page (GtkXText * xtext) + int subline; + int startline = xtext->adj->value; + +- if(!GTK_WIDGET_REALIZED(xtext)) ++ if(!gtk_widget_get_realized (GTK_WIDGET (xtext))) + return; + + if (xtext->buffer->indent < MARGIN) +@@ -4636,7 +4636,7 @@ gtk_xtext_render_page (GtkXText * xtext) + void + gtk_xtext_refresh (GtkXText * xtext, int do_trans) + { +- if (GTK_WIDGET_REALIZED (GTK_WIDGET (xtext))) ++ if (gtk_widget_get_realized (GTK_WIDGET (xtext))) + { + #if defined(USE_XLIB) || defined(WIN32) + if (xtext->transparent && do_trans) +@@ -5204,7 +5204,7 @@ gtk_xtext_buffer_show (GtkXText *xtext, + xtext->io_tag = 0; + } + +- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (xtext))) ++ if (!gtk_widget_get_realized (GTK_WIDGET (xtext))) + gtk_widget_realize (GTK_WIDGET (xtext)); + + gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
