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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

1 files changed, 0 insertions, 98 deletions

diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch
deleted file mode 100644
index 8a72c9262..000000000
--- a/community/gnome-panel/18_fix_force_quit_applet.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Fix Force-Quit panel applet
- This patch implements handling of XInput2 extension events in the applet.
- Without this patch, the applet fails to recognize such events (either mouse
- click for killing application, or escape key for exiting), hence freezing the
- desktop.
- .
- Also fix the event mask in call of gdk_device_grab() for keyboard.
-Author: Sébastien Villemot <sebastien@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740
-Forwarded: no
-Last-Update: 2013-01-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/gnome-panel/panel-force-quit.c
-+++ b/gnome-panel/panel-force-quit.c
-@@ -32,6 +32,8 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- 
-+#include <X11/extensions/XInput2.h>
-+
- #include "panel-icon-names.h"
- #include "panel-stock-icons.h"
- 
-@@ -246,22 +248,23 @@
- 
- static void 
- handle_button_press_event (GtkWidget *popup,
--			   XKeyEvent *event)
-+			   Display *display,
-+			   Window subwindow)
- {
- 	Window window;
- 
- 	remove_popup (popup);
- 
--	if (event->subwindow == None)
-+	if (subwindow == None)
- 		return;
- 
- 	if (wm_state_atom == None)
--		wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE);
-+		wm_state_atom = XInternAtom (display, "WM_STATE", FALSE);
- 
--	window = find_managed_window (event->display, event->subwindow);
-+	window = find_managed_window (display, subwindow);
- 
- 	if (window != None) {
--		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window))
-+		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window))
- 			kill_window_question ((gpointer) window);
- 	}
- }
-@@ -272,10 +275,12 @@
- 	      GtkWidget *popup)
- {
- 	XEvent *xevent = (XEvent *) gdk_xevent;
-+	XIEvent *xiev;
-+	XIDeviceEvent *xidev;
- 
- 	switch (xevent->type) {
- 	case ButtonPress:
--		handle_button_press_event (popup, &xevent->xkey);
-+		handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow);
- 		return GDK_FILTER_REMOVE;
- 	case KeyPress:
- 		if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
-@@ -283,6 +288,21 @@
- 			return GDK_FILTER_REMOVE;
- 		}
- 		break;
-+	case GenericEvent:
-+		xiev = (XIEvent *) xevent->xcookie.data;
-+		xidev = (XIDeviceEvent *) xiev;
-+		switch (xiev->evtype) {
-+		case XI_KeyPress:
-+			if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
-+				remove_popup (popup);
-+				return GDK_FILTER_REMOVE;
-+			}
-+			break;
-+		case XI_ButtonPress:
-+			handle_button_press_event (popup, xidev->display, xidev->child);
-+			return GDK_FILTER_REMOVE;
-+		}
-+		break;
- 	default:
- 		break;
- 	}
-@@ -331,7 +351,7 @@
- 
- 	status = gdk_device_grab (keyboard, root,
- 				  GDK_OWNERSHIP_NONE, FALSE,
--				  GDK_KEY_PRESS | GDK_KEY_RELEASE,
-+				  GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
- 				  NULL, time);
- 	if (status != GDK_GRAB_SUCCESS) {
- 		g_warning ("Keyboard grab failed\n");