aboutsummaryrefslogtreecommitdiffstats
path: root/main/xchat
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-31 12:49:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-31 12:52:22 +0000
commit1d97e4ca8da481cc993af05020ee794d21eb0cbf (patch)
tree2c89e6d260942152ef61d8ddb3c655e17b135d17 /main/xchat
parent5bfbc398e72f7453bd5b2265afcad11b20be4bdf (diff)
downloadaports-1d97e4ca8da481cc993af05020ee794d21eb0cbf.tar.bz2
aports-1d97e4ca8da481cc993af05020ee794d21eb0cbf.tar.xz
main/xchat: upgrade to 2.8.8
Diffstat (limited to 'main/xchat')
-rw-r--r--main/xchat/APKBUILD21
-rw-r--r--main/xchat/depreciated-macros.patch57
-rw-r--r--main/xchat/xchat-gtk2.patch12
3 files changed, 9 insertions, 81 deletions
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD
index 9fe4bbe2c3..c5c67a59d0 100644
--- a/main/xchat/APKBUILD
+++ b/main/xchat/APKBUILD
@@ -1,23 +1,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xchat
-pkgver=2.8.6
-pkgrel=4
+pkgver=2.8.8
+pkgrel=0
pkgdesc="A GTK+ based IRC client"
url="http://www.xchat.org/"
license="GPL"
makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev
libxext-dev"
source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2
- http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff
- depreciated-macros.patch
- $pkgname-gtk2.patch"
+ "
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -p1 < ../xc286-smallfixes.diff || return 1
- patch -p1 -i "$srcdir"/depreciated-macros.patch || return 1
- patch -p1 < ../xchat-gtk2.patch || return 1
+ for i in "$srcdir"/*.patch; do
+ [ -r "$i" ] || continue
+ msg "Applying $i"
+ patch -p1 -i "$i" || return 1
+ done
}
@@ -42,7 +42,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2
-eb68b6261bf6740cb5f223627eb8f384 xc286-smallfixes.diff
-daee42354f95ca54a84248c3cb690fee depreciated-macros.patch
-f3fe00982c0bec93152ed0b32438ef87 xchat-gtk2.patch"
+md5sums="6775c44f38e84d06c06c336b32c4a452 xchat-2.8.8.tar.bz2"
diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch
deleted file mode 100644
index 1b86be2f1b..0000000000
--- a/main/xchat/depreciated-macros.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/fe-gtk/fe-gtk.c 2008-02-24 08:39:44.000000000 +0000
-+++ b/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)))
---- a/src/fe-gtk/menu.c 2008-06-08 07:59:37.000000000 +0000
-+++ b/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
---- a/src/fe-gtk/maingui.c 2008-04-01 08:53:41.000000000 +0000
-+++ b/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);
diff --git a/main/xchat/xchat-gtk2.patch b/main/xchat/xchat-gtk2.patch
deleted file mode 100644
index 4e13a2cf5d..0000000000
--- a/main/xchat/xchat-gtk2.patch
+++ /dev/null
@@ -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