Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 35 deletions

diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
deleted file mode 100644
index 06bce4a0f..000000000
--- a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Thu, 03 May 2012 19:04:20 +0000
-Subject: Bug 672582 - Fix selection behavior inside <iframe>
-
-Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow
-has had its own GdkWindow. This means we need to use the allocation
-of the GtkScrolledWindow rather than its child GtkHTML widget when we
-want to translate pointer coordinates relative to the iframe, because
-a widget's GtkAllocation is relative to the parent GdkWindow.
-
-(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345)
----
-diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
-index 697b16e..6284855 100644
---- a/gtkhtml/gtkhtml.c
-+++ b/gtkhtml/gtkhtml.c
-@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget,
-                         gint *y)
- {
- 	while (GTK_HTML (widget)->iframe_parent) {
-+		GtkWidget *scrolled_window;
- 		GtkAllocation allocation;
- 
--		gtk_widget_get_allocation (widget, &allocation);
-+		scrolled_window = gtk_widget_get_parent (widget);
-+
-+		g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
-+
-+		gtk_widget_get_allocation (scrolled_window, &allocation);
- 
- 		if (x)
- 			*x += allocation.x - GTK_HTML (widget)->engine->x_offset;
---
-cgit v0.9.0.2