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

diff --git a/core/glibc/glibc-2.16-glob-use-size_t.patch b/core/glibc/glibc-2.16-glob-use-size_t.patch
deleted file mode 100644
index 8c5df45be..000000000
--- a/core/glibc/glibc-2.16-glob-use-size_t.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/posix/glob.c b/posix/glob.c
-index 68ea205..87d4f1b 100644
---- a/posix/glob.c
-+++ b/posix/glob.c
-@@ -217,7 +217,7 @@ static int collated_compare (const void *, const void *) __THROW;
- static const char *
- next_brace_sub (const char *cp, int flags)
- {
--  unsigned int depth = 0;
-+  size_t depth = 0;
-   while (*cp != '\0')
-     if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
-       {
-@@ -960,7 +960,7 @@ glob (pattern, flags, errfunc, pglob)
- 		  && S_ISDIR (st.st_mode))
- 	       : (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode)))))
- 	{
--	  int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	  size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	  char **new_gl_pathv;
- 
- 	  if (newcount > UINTPTR_MAX - (1 + 1)
-@@ -1059,7 +1059,7 @@ glob (pattern, flags, errfunc, pglob)
- 	 appending the results to PGLOB.  */
-       for (i = 0; i < dirs.gl_pathc; ++i)
- 	{
--	  int old_pathc;
-+	  size_t old_pathc;
- 
- #ifdef	SHELL
- 	  {
-@@ -1114,7 +1114,7 @@ glob (pattern, flags, errfunc, pglob)
- 	  /* No matches.  */
- 	  if (flags & GLOB_NOCHECK)
- 	    {
--	      int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	      size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	      char **new_gl_pathv;
- 
- 	      if (newcount > UINTPTR_MAX - 2
-@@ -1158,7 +1158,7 @@ glob (pattern, flags, errfunc, pglob)
-     }
-   else
-     {
--      int old_pathc = pglob->gl_pathc;
-+      size_t old_pathc = pglob->gl_pathc;
-       int orig_flags = flags;
- 
-       if (meta & 2)
--- 
-1.7.3.4
-