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

Conflicts:
	community/epdfview/PKGBUILD
	community/gpa/PKGBUILD
	community/gtk2hs-cairo/PKGBUILD
	community/gtk2hs-glib/PKGBUILD
	community/gtk2hs-gtk/PKGBUILD
	community/gtk2hs-pango/PKGBUILD
	community/lmctl/PKGBUILD
	community/mediatomb/PKGBUILD
	community/ruby-atk/PKGBUILD
	community/ruby-gdkpixbuf2/PKGBUILD
	community/ruby-gio2/PKGBUILD
	community/ruby-glib2/PKGBUILD
	community/ruby-pango/PKGBUILD
	core/eglibc/glibc-2.10-bz4781.patch
	core/eglibc/glibc-2.10-dont-build-timezone.patch
	core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
	core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	core/eglibc/glibc-2.13-futex.patch
	core/eglibc/glibc-__i686.patch
	extra/silc-toolkit/PKGBUILD

1 files changed, 0 insertions, 27 deletions

diff --git a/community/clamz/unencrypted-amz.patch b/community/clamz/unencrypted-amz.patch
deleted file mode 100644
index 49b03ba8a..000000000
--- a/community/clamz/unencrypted-amz.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- playlist.c	2010-04-19 16:01:59.000000000 -0700
-+++ clamz-0.4/playlist.c	2011-10-18 20:35:39.850146353 -0700
-@@ -499,12 +499,21 @@
- {
-   struct parseinfo pi;
-   unsigned char *decrypted, *xml;
--  unsigned long decrypted_len;
-+  unsigned long decrypted_len, i;
-   int xerr;
- 
-   decrypted = decrypt_amz_file(b64data, b64len, fname);
--  if (!decrypted)
--    return 1;
-+  if (!decrypted){
-+    // XXX Perhaps the code file is unencrypted already.
-+    decrypted = malloc((b64len + 1) * sizeof(char));
-+    if (!decrypted) {
-+      print_error("Out of memory");
-+      return 1;
-+    }
-+    for (i = 0; i < b64len; i++) {
-+      decrypted[i] = b64data[i]; 
-+    }
-+  }
-   decrypted_len = strlen((char*) decrypted);
- 
-   pi.parser = XML_ParserCreate(NULL);