Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/libtextcat/PKGBUILD
	extra/glsof/PKGBUILD
	extra/orca/PKGBUILD
	extra/python-qt/PKGBUILD
	extra/python-sip/PKGBUILD
	extra/python2-qt/PKGBUILD
	extra/python2-sip/PKGBUILD
	extra/swfdec-mozilla/PKGBUILD
	extra/swfdec/PKGBUILD
	extra/trayer/PKGBUILD
	extra/xbill/PKGBUILD
	extra/xfce4-xfapplet-plugin/PKGBUILD

4 files changed, 233 insertions, 0 deletions

diff --git a/libre/xchat-gnome-libre/PKGBUILD b/libre/xchat-gnome-libre/PKGBUILD
new file mode 100644
index 000000000..94c6b5c40
--- /dev/null
+++ b/libre/xchat-gnome-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 112861 2011-03-07 10:29:01Z eric $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xchat-gnome
+pkgver=0.26.1
+pkgrel=5
+pkgdesc="GNOME frontend to the popular X-Chat IRC client."
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://xchat-gnome.navi.cx/"
+depends=('libgnomeui>=2.18.1-2' 'libsexy>=0.1.11' 'gconf>=2.18.0.1-4'
+         'hicolor-icon-theme' 'desktop-file-utils' 'libcanberra' 'libsm')
+makedepends=('gettext' 'perlxml' 'python2' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3'
+             'intltool' 'pkg-config')
+optdepends=('libnotify: notifications'
+            'python2: plugin'
+            'tcl: plugin')
+options=('!libtool')
+install=xchat-gnome.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.26/${pkgname}-${pkgver}.tar.gz
+        gtk2-2.20.patch xchat-gnome-0.26.1-deprecated-symbol.patch)
+md5sums=('e355d71d76cd97a0764e37bfacf09101' 'dafc2536a0c5ee3f8015af81fce69656'\
+         'f82417277f0b5e83334147c4bf63d531')
+sha1sums=('303bfbf2f1bda83fbc4edab148df4764cb4b8998' 'f1bfc5af50be7c10a9db96be20185325636d8da9'\
+         '9aa0abc4b7999e09cafdeb8da1ad4641552a421b')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  patch -Np1 -i "$srcdir/gtk2-2.20.patch"
+  patch -Np1 -i "$srcdir/xchat-gnome-0.26.1-deprecated-symbol.patch"
+  sed -i 's/notify_notification_new (summary, escaped, NULL, NULL);/notify_notification_new (summary, escaped, NULL);/' plugins/notify-osd/notify-osd.c
+  sed -i -e "s/       /\t/" src/common/dbus/Makefile.in
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --enable-ipv6 --enable-shm \
+	      --disable-gtkfe --disable-scrollkeeper
+  make
+}
+
+package() {  
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  
+  install -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/${pkgname}.schemas" \
+    "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
diff --git a/libre/xchat-gnome-libre/gtk2-2.20.patch b/libre/xchat-gnome-libre/gtk2-2.20.patch
new file mode 100644
index 000000000..7a5dcedf2
--- /dev/null
+++ b/libre/xchat-gnome-libre/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);
diff --git a/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch b/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
new file mode 100644
index 000000000..5bf1e4ef5
--- /dev/null
+++ b/libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
@@ -0,0 +1,22 @@
+From 8d35b36baa8204b68c9520ec92327e34c1d7c580 Mon Sep 17 00:00:00 2001
+From: Ritesh Khadgaray <khadgaray@gmail.com>
+Date: Sun, 04 Jul 2010 09:52:07 +0000
+Subject: remove deprecated GTK+ symbols, GTK_WIDGET_SET_FLAGS.
+
+---
+diff --git a/src/fe-gnome/xtext.c b/src/fe-gnome/xtext.c
+index 92562a3..51503f8 100644
+--- a/src/fe-gnome/xtext.c
++++ b/src/fe-gnome/xtext.c
+@@ -963,7 +963,7 @@ gtk_xtext_realize (GtkWidget * widget)
+ 	GdkColor col;
+ 	GdkColormap *cmap;
+ 
+-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
++	gtk_widget_set_realized (widget, TRUE);
+ 	xtext = GTK_XTEXT (widget);
+ 
+ 	attributes.x = widget->allocation.x;
+--
+cgit v0.8.3.1
+
diff --git a/libre/xchat-gnome-libre/xchat-gnome.install b/libre/xchat-gnome-libre/xchat-gnome.install
new file mode 100644
index 000000000..b0816ece3
--- /dev/null
+++ b/libre/xchat-gnome-libre/xchat-gnome.install
@@ -0,0 +1,24 @@
+pkgname=xchat-gnome
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}