summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-20 06:30:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-20 06:30:23 +0000
commit18cebf3338f941fe3235933395610035d855c7ae (patch)
treec33e563298288f8f7cc5fc0c85e8d18e2f3ff47e /main
parentd91daf05b6af2c1c885295395132428c20816a21 (diff)
downloadaports-18cebf3338f941fe3235933395610035d855c7ae.tar.bz2
aports-18cebf3338f941fe3235933395610035d855c7ae.tar.xz
main/xchat: build fix for gtk+-2.20
Diffstat (limited to 'main')
-rw-r--r--main/xchat/APKBUILD5
-rw-r--r--main/xchat/depreciated-macros.patch57
2 files changed, 61 insertions, 1 deletions
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD
index 96486e27c..cb4bdbef6 100644
--- a/main/xchat/APKBUILD
+++ b/main/xchat/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xchat
pkgver=2.8.6
-pkgrel=1
+pkgrel=2
pkgdesc="A GTK+ based IRC client"
url="http://www.xchat.org/"
license="GPL"
@@ -9,12 +9,14 @@ 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
}
@@ -42,4 +44,5 @@ package() {
md5sums="1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2
eb68b6261bf6740cb5f223627eb8f384 xc286-smallfixes.diff
+daee42354f95ca54a84248c3cb690fee depreciated-macros.patch
f3fe00982c0bec93152ed0b32438ef87 xchat-gtk2.patch"
diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch
new file mode 100644
index 000000000..1b86be2f1
--- /dev/null
+++ b/main/xchat/depreciated-macros.patch
@@ -0,0 +1,57 @@
+--- 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);