Date: Sunday, May 30, 2010 @ 23:17:14 Author: eric Revision: 81476 upgpkg: xchat 2.8.8-1 Upstream update, Added python optdepends, Removed old patches
Modified: xchat/trunk/ChangeLog xchat/trunk/PKGBUILD Deleted: xchat/trunk/depreciated-macros.patch xchat/trunk/xchat-2.8.4-shm-pixmaps.patch xchat/trunk/xchat-2.8.6-connect-mnemonic.patch xchat/trunk/xchat-gtk2.patch ------------------------------------+ ChangeLog | 7 ++ PKGBUILD | 34 ++++------- depreciated-macros.patch | 57 ------------------ xchat-2.8.4-shm-pixmaps.patch | 106 ----------------------------------- xchat-2.8.6-connect-mnemonic.patch | 11 --- xchat-gtk2.patch | 12 --- 6 files changed, 20 insertions(+), 207 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-05-30 23:02:28 UTC (rev 81475) +++ ChangeLog 2010-05-31 03:17:14 UTC (rev 81476) @@ -1,3 +1,10 @@ +2010-05-30 Eric Belanger <[email protected]> + + * xchat 2.8.8-1 + * Upstream update + * Added python optdepends + * Removed old patches + 2010-03-29 Eric Belanger <[email protected]> * Fixed buttons hotkey (close FS#17076) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-30 23:02:28 UTC (rev 81475) +++ PKGBUILD 2010-05-31 03:17:14 UTC (rev 81476) @@ -2,37 +2,29 @@ # Maintainer: Eric Belanger <[email protected]> pkgname=xchat -pkgver=2.8.6 -pkgrel=6 +pkgver=2.8.8 +pkgrel=1 pkgdesc="A GTK+ based IRC client" arch=('i686' 'x86_64') url="http://www.xchat.org/"; license=('GPL') -depends=('gtk2>=2.20.0' 'openssl>=1.0.0' 'dbus-glib>=0.82') +depends=('gtk2' 'openssl' 'dbus-glib') makedepends=('tcl' 'perl' 'python') -optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin') +optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \ + 'python: for python 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 - xchat-gtk2.patch xchat-2.8.4-shm-pixmaps.patch xchat-2.8.6-connect-mnemonic.patch - depreciated-macros.patch) -md5sums=('1f2670865d43a23a9abc596dde999aca' - 'eb68b6261bf6740cb5f223627eb8f384' - 'f3fe00982c0bec93152ed0b32438ef87' - 'a0b3889d160ddf21eebd25b645bd1e48' - '591b8e6186be8849be3aa615e3a335fb' - 'a7a22d234d0419fe178204495f9e3246') +source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +md5sums=('9a11f13121ff0af787bba3b014378e58') +sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../xc286-smallfixes.diff || return 1 - patch -p1 < ../xchat-gtk2.patch || return 1 - patch -p1 < ../xchat-2.8.4-shm-pixmaps.patch || return 1 - patch -p1 < ../xchat-2.8.6-connect-mnemonic.patch || return 1 - patch -Np0 -i ${srcdir}/depreciated-macros.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \ - --disable-gnome --disable-textfe --enable-ipv6 --enable-shm \ - --enable-spell=static || return 1 + --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static || return 1 make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install || return 1 } Deleted: depreciated-macros.patch =================================================================== --- depreciated-macros.patch 2010-05-30 23:02:28 UTC (rev 81475) +++ depreciated-macros.patch 2010-05-31 03:17:14 UTC (rev 81476) @@ -1,57 +0,0 @@ ---- src/fe-gtk/fe-gtk.c 2008-02-24 08:39:44.000000000 +0000 -+++ src/fe-gtk/fe-gtk.c.new 2010-04-01 18:10:31.840778707 +0000 -@@ -819,7 +819,8 @@ - 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))) ---- src/fe-gtk/menu.c 2008-06-08 07:59:37.000000000 +0000 -+++ src/fe-gtk/menu.c.new 2010-04-01 18:15:54.527573869 +0000 -@@ -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 ---- src/fe-gtk/maingui.c 2008-04-01 08:53:41.000000000 +0000 -+++ src/fe-gtk/maingui.c.new 2010-04-01 18:21:56.400181435 +0000 -@@ -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; -@@ -2563,9 +2563,9 @@ - { - int handle_size; - --/* if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1))) -+/* if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1))) - return; -- if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2))) -+ if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2))) - return;*/ - - gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL); Deleted: xchat-2.8.4-shm-pixmaps.patch =================================================================== --- xchat-2.8.4-shm-pixmaps.patch 2010-05-30 23:02:28 UTC (rev 81475) +++ xchat-2.8.4-shm-pixmaps.patch 2010-05-31 03:17:14 UTC (rev 81476) @@ -1,106 +0,0 @@ -diff -ur xchat-2.8.4/src/fe-gtk/xtext.c xchat-2.8.4-shm-pixmaps/src/fe-gtk/xtext.c ---- xchat-2.8.4/src/fe-gtk/xtext.c 2007-06-08 11:57:07.000000000 +0200 -+++ xchat-2.8.4-shm-pixmaps/src/fe-gtk/xtext.c 2008-05-23 00:56:52.000000000 +0200 -@@ -1347,6 +1347,22 @@ - } - } - -+#ifdef USE_SHM -+static int -+have_shm_pixmaps(Display *dpy) -+{ -+ static int checked = 0, major, minor; -+ static Bool have = FALSE; -+ -+ if (!checked) { -+ XShmQueryVersion(dpy, &major, &minor, &have); -+ checked = 1; -+ } -+ -+ return have; -+} -+#endif -+ - static void - gtk_xtext_paint (GtkWidget *widget, GdkRectangle *area) - { -@@ -1363,8 +1379,12 @@ - { - xtext->last_win_x = x; - xtext->last_win_y = y; --#if !defined(USE_SHM) && !defined(WIN32) -+#ifndef WIN32 -+#ifdef USE_SHM -+ if (xtext->shaded && !have_shm_pixmaps(GDK_WINDOW_XDISPLAY (xtext->draw_buf))) -+#else - if (xtext->shaded) -+#endif - { - xtext->recycle = TRUE; - gtk_xtext_load_trans (xtext); -@@ -3549,6 +3569,11 @@ - GC tgc; - Display *xdisplay = GDK_WINDOW_XDISPLAY (xtext->draw_buf); - -+#ifdef USE_SHM -+ int shm_pixmaps; -+ shm_pixmaps = have_shm_pixmaps(xdisplay); -+#endif -+ - XGetGeometry (xdisplay, p, &root, &dummy, &dummy, &width, &height, - &dummy, &depth); - -@@ -3566,18 +3591,20 @@ - XFreeGC (xdisplay, tgc); - - #ifdef USE_SHM -- ximg = get_image (xtext, xdisplay, &xtext->shminfo, 0, 0, w, h, depth, tmp); --#else -- ximg = XGetImage (xdisplay, tmp, 0, 0, w, h, -1, ZPixmap); -+ if (shm_pixmaps) -+ ximg = get_image (xtext, xdisplay, &xtext->shminfo, 0, 0, w, h, depth, tmp); -+ else - #endif -+ ximg = XGetImage (xdisplay, tmp, 0, 0, w, h, -1, ZPixmap); - XFreePixmap (xdisplay, tmp); - } else - { - #ifdef USE_SHM -- ximg = get_image (xtext, xdisplay, &xtext->shminfo, x, y, w, h, depth, p); --#else -- ximg = XGetImage (xdisplay, p, x, y, w, h, -1, ZPixmap); -+ if (shm_pixmaps) -+ ximg = get_image (xtext, xdisplay, &xtext->shminfo, x, y, w, h, depth, p); -+ else - #endif -+ ximg = XGetImage (xdisplay, p, x, y, w, h, -1, ZPixmap); - } - - if (!ximg) -@@ -3602,7 +3629,7 @@ - else - { - #ifdef USE_SHM -- if (xtext->shm) -+ if (xtext->shm && shm_pixmaps) - { - #if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION == 0) - shaded_pix = gdk_pixmap_foreign_new ( -@@ -3620,7 +3647,7 @@ - } - - #ifdef USE_SHM -- if (!xtext->shm) -+ if (!xtext->shm || !shm_pixmaps) - #endif - XPutImage (xdisplay, GDK_WINDOW_XWINDOW (shaded_pix), - GDK_GC_XGC (xtext->fgc), ximg, 0, 0, 0, 0, w, h); -@@ -3640,7 +3667,7 @@ - if (xtext->pixmap) - { - #ifdef USE_SHM -- if (xtext->shm) -+ if (xtext->shm && have_shm_pixmaps(GDK_WINDOW_XDISPLAY (xtext->draw_buf))) - { - XFreePixmap (GDK_WINDOW_XDISPLAY (xtext->pixmap), - GDK_WINDOW_XWINDOW (xtext->pixmap)); Deleted: xchat-2.8.6-connect-mnemonic.patch =================================================================== --- xchat-2.8.6-connect-mnemonic.patch 2010-05-30 23:02:28 UTC (rev 81475) +++ xchat-2.8.6-connect-mnemonic.patch 2010-05-31 03:17:14 UTC (rev 81476) @@ -1,11 +0,0 @@ -diff -urp xchat-2.8.6.orig/src/fe-gtk/gtkutil.c xchat-2.8.6/src/fe-gtk/gtkutil.c ---- xchat-2.8.6.orig/src/fe-gtk/gtkutil.c 2009-07-18 11:25:02.000000000 +0100 -+++ xchat-2.8.6/src/fe-gtk/gtkutil.c 2009-07-18 11:27:01.000000000 +0100 -@@ -376,6 +376,7 @@ gtkutil_button (GtkWidget *box, char *st - { - gtk_button_set_label (GTK_BUTTON (wid), labeltext); - gtk_button_set_image (GTK_BUTTON (wid), gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU)); -+ gtk_button_set_use_underline (GTK_BUTTON (wid), TRUE); - if (box) - gtk_container_add (GTK_CONTAINER (box), wid); - } Deleted: xchat-gtk2.patch =================================================================== --- xchat-gtk2.patch 2010-05-30 23:02:28 UTC (rev 81475) +++ xchat-gtk2.patch 2010-05-31 03:17:14 UTC (rev 81476) @@ -1,12 +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
