Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

3 files changed, 99 insertions, 5 deletions

diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch
new file mode 100644
index 000000000..5b65557c1
--- /dev/null
+++ b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch
@@ -0,0 +1,32 @@
+From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org>
+Date: Mon, 6 Aug 2012 17:42:14 -0400
+Subject: [PATCH] Fix compilation under threaded bleadperl
+
+ Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 >
+
+CopSTASHPV is no longer an lvalue under threads.  (It never was under non-threaded builds.)
+---
+ tkGlue.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/tkGlue.c b/tkGlue.c
+index 1b7c025..9079302 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -4154,11 +4154,7 @@ int type;
+    SV *x = NULL;
+    int prefix = '?';
+    name = SvPV(sv,na);
+-#ifdef USE_ITHREADS
+-   CopSTASHPV(PL_curcop) = NULL;
+-#else
+-   CopSTASH(PL_curcop) = NULL;
+-#endif
++   CopSTASH_set(PL_curcop, NULL);
+    switch (type)
+     {
+      case TK_CONFIG_SCALARVAR:
+-- 
+1.8.2.3
+
diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
new file mode 100644
index 000000000..95067501f
--- /dev/null
+++ b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
@@ -0,0 +1,47 @@
+From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <slaven@rezic.de>
+Date: Sat, 23 Mar 2013 14:00:58 +0100
+Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an
+ expression
+
+---
+ IO/IO.xs | 6 +-----
+ tkGlue.c | 5 +----
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/IO/IO.xs b/IO/IO.xs
+index 8ae2a57..42f7515 100644
+--- a/IO/IO.xs
++++ b/IO/IO.xs
+@@ -207,11 +207,7 @@ int	offset
+      info.count  = 0;
+      info.error  = 0;
+      info.eof    = 0;
+-     if (!SvUPGRADE(buf, SVt_PV))
+-      {
+-       RETVAL = &PL_sv_undef;
+-       return;
+-      }
++     (void)SvUPGRADE(buf, SVt_PV);
+      SvPOK_only(buf);		/* validate pointer */
+      Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info);
+      do
+diff --git a/tkGlue.c b/tkGlue.c
+index dd3d283..cdc53ad 100644
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -3830,10 +3830,7 @@ ClientData clientData;
+      return EXPIRE((interp, "Cannot trace readonly variable"));
+     }
+   }
+- if (!SvUPGRADE(sv, SVt_PVMG))
+-  {
+-   return EXPIRE((interp, "Trace SvUPGRADE failed"));
+-  }
++ (void)SvUPGRADE(sv, SVt_PVMG);
+ 
+  if (SvTYPE(sv) == SVt_PVAV)
+   {
+-- 
+1.8.2.3
+
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 7fabe3a9c..41ac2a372 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
+# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $
+# Maintainer:
+# Contributor: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Jason Chu <jchu@xentac.net>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=perl-tk
 _cpanname=Tk
 pkgver=804.030
-pkgrel=4
+pkgrel=5
 pkgdesc="A graphical user interface toolkit for Perl"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/${_cpanname}"
@@ -15,8 +16,22 @@ depends=('libpng' 'libjpeg' 'tk' 'perl')
 options=('!emptydirs')
 replaces=('perltk')
 provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('13275e85f99ee467a86d9598a437abff')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz
+        0001-Fix-compilation-under-threaded-bleadperl.patch
+        0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
+md5sums=('13275e85f99ee467a86d9598a437abff'
+         '361c34978746310e5c31b7a47c016b22'
+         '46448cdac9d7159f15f2d4b2719d171b')
+
+prepare() {
+  cd "$srcdir/${_cpanname}-$pkgver"
+
+  # https://rt.cpan.org/Public/Bug/Display.html?id=78824
+  patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch"
+
+  # https://rt.cpan.org/Public/Bug/Display.html?id=82677
+  patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch"
+}
 
 build() {
   cd "$srcdir/${_cpanname}-$pkgver"