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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 0 insertions, 90 deletions

diff --git a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch
deleted file mode 100644
index c26f422aa..000000000
--- a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Fri, 16 Sep 2011 15:29:29 +0000
-Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0
-
-gnutls 3.0 has a new error code for "peer closed connection without
-sending a Close packet", so add some #ifdefs to do the right thing
-with either 2.x or 3.x.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659233
----
-diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
-index c1ede79..0f792bb 100644
---- a/tls/gnutls/gtlsconnection-gnutls.c
-+++ b/tls/gnutls/gtlsconnection-gnutls.c
-@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate
- 
-   GError *error;
-   GCancellable *cancellable;
--  gboolean blocking, eof;
-+  gboolean blocking;
-+#ifndef GNUTLS_E_PREMATURE_TERMINATION
-+  gboolean eof;
-+#endif
-   GIOCondition internal_direction;
- };
- 
-@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls  *gnutls,
-       gnutls->priv->need_handshake = TRUE;
-       return status;
-     }
--  else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH)
-+  else if (
-+#ifdef GNUTLS_E_PREMATURE_TERMINATION
-+	   status == GNUTLS_E_PREMATURE_TERMINATION
-+#else
-+	   status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof
-+#endif
-+	   )
-     {
--      if (gnutls->priv->eof)
-+      if (gnutls->priv->require_close_notify)
- 	{
--	  if (gnutls->priv->require_close_notify)
--	    {
--	      g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF,
--				   _("TLS connection closed unexpectedly"));
--	      return status;
--	    }
--	  else
--	    return 0;
-+	  g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF,
-+			       _("TLS connection closed unexpectedly"));
-+	  return status;
- 	}
-+      else
-+	return 0;
-     }
- 
-   return status;
-@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t  transport_data,
- 
-   if (ret < 0)
-     set_gnutls_error (gnutls, G_IO_IN);
-+#ifndef GNUTLS_E_PREMATURE_TERMINATION
-   else if (ret == 0)
-     gnutls->priv->eof = TRUE;
-+#endif
- 
-   return ret;
- }
---
-cgit v0.9.0.2
diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
deleted file mode 100644
index 19a168638..000000000
--- a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: tls/gnutls/gtlsconnection-gnutls.c
-===================================================================
---- tls/gnutls/gtlsconnection-gnutls.c
-+++ tls/gnutls/gtlsconnection-gnutls.c	2011-08-04 00:40:33.194189789 +0200
-@@ -860,9 +860,10 @@
- 
-   if (peer_certificate)
-     {
--      int status;
-+      int verify_ret;
-+      unsigned int status;
- 
--      status = gnutls_certificate_verify_peers (gnutls->priv->session);
-+      verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); 
-       peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status);
-       if (peer_certificate_errors)
- 	{