[arch-commits] Commit in xchat/trunk (PKGBUILD depreciated-macros.patch)

[andyrtr at archlinux.org]

    Date: Thursday, April 1, 2010 @ 14:46:11
  Author: andyrtr
Revision: 75516

upgpkg: xchat 2.8.6-6
rebuild for openssl

Added:
  xchat/trunk/depreciated-macros.patch
Modified:
  xchat/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   20 ++++++++-------
 depreciated-macros.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-01 18:39:23 UTC (rev 75515)
+++ PKGBUILD	2010-04-01 18:46:11 UTC (rev 75516)
@@ -3,24 +3,25 @@
 
 pkgname=xchat
 pkgver=2.8.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A GTK+ based IRC client"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
 license=('GPL')
-depends=('gtk2>=2.10.9' 'openssl>=0.9.8b' 'dbus-glib>=0.7.2')
+depends=('gtk2>=2.20.0' 'openssl>=1.0.0' 'dbus-glib>=0.82')
 makedepends=('tcl' 'perl' 'python')
 optdepends=('enchant: for spell checking support' 'tcl: for tcl 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)
-md5sums=('1f2670865d43a23a9abc596dde999aca' 'eb68b6261bf6740cb5f223627eb8f384'\
-         'f3fe00982c0bec93152ed0b32438ef87' 'a0b3889d160ddf21eebd25b645bd1e48'\
-         '591b8e6186be8849be3aa615e3a335fb')
-sha1sums=('7a7463e65cb26c680ed70dd96cec98bcc05435a4' 'b13eb421f6d72fca195b398c606d9413aec57fc4'\
-         'cf9c5d93af262474e0855f2965210a4a3600acc7' '7647815270fac1a58109cb3b4000bc9187871399'\
-         'c9891bf1461f2b08f5caf311af072b2d3be141f6')
+        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')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,6 +29,7 @@
   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

Added: depreciated-macros.patch
===================================================================
--- depreciated-macros.patch	                        (rev 0)
+++ depreciated-macros.patch	2010-04-01 18:46:11 UTC (rev 75516)
@@ -0,0 +1,57 @@
+--- 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);