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, 61 deletions

diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
deleted file mode 100644
index a9edca3d7..000000000
--- a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 23 Dec 2012 00:09:34 +0200
-Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg
-
-This restores exo-open's .desktop file launching functionality.
----
- configure.ac.in | 1 +
- exo-open/main.c | 9 ---------
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/configure.ac.in b/configure.ac.in
-index 0c8b3a1..ec9be67 100644
---- a/configure.ac.in
-+++ b/configure.ac
-@@ -159,6 +159,7 @@ dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
-+XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-diff --git a/exo-open/main.c b/exo-open/main.c
-index 059fad4..da78f6a 100644
---- a/exo-open/main.c
-+++ b/exo-open/main.c
-@@ -32,9 +32,7 @@
- 
- #include <glib/gstdio.h>
- #include <gio/gio.h>
--#ifdef HAVE_GIO_UNIX
- #include <gio/gdesktopappinfo.h>
--#endif
- #include <exo/exo.h>
- 
- 
-@@ -143,7 +141,6 @@ usage (void)
- static gboolean
- exo_open_launch_desktop_file (const gchar *arg)
- {
--#ifdef HAVE_GIO_UNIX
-   GFile           *gfile;
-   gchar           *contents;
-   gsize            length;
-@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg)
- #endif
- 
-   return result;
--#else /* !HAVE_GIO_UNIX */
--  g_critical (_("Launching desktop files is not supported when %s is compiled "
--                "without GIO-Unix features."), g_get_prgname ());
--
--  return FALSE;
--#endif
- }
- 
- 
--- 
-1.8.0.2
-