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

Conflicts:
	community-testing/shotwell/PKGBUILD
	community/recoll/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
	cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
	cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
	cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
	staging/nx-common/PKGBUILD
	staging/nx/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/empathy/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-ews/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcr/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-documents/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/librsvg/librsvg.install
	testing/mousetweaks/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/sushi/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/vte3/PKGBUILD

4 files changed, 14 insertions, 16 deletions

diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index f9c76e5d5..93d779d22 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=crosstool-ng
-pkgver=1.13.2
+pkgver=1.14.1
 pkgrel=1
 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,4 +26,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
-md5sums=('749cf70568ad07d1b13fdcd25b163553')
+md5sums=('1e8e723df67c643ebdd529990607d5bf')
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c813946c7..564ca267d 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-pkgver=0.8
-_pkgver=ed424ec77571
-pkgrel=7
+pkgver=1.0rc1
+_pkgver=396d39b06aa6
+pkgrel=1
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64')
@@ -17,14 +17,11 @@ replaces=('luxrays')
 conflicts=('luxrays')
 provides=("luxrays=$pkgver")
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+md5sums=('a96ac693ec2900d8d1b209f88edd7e94')
 
 build() {
   cd "$srcdir/luxrender-$_pkgname-$_pkgver"
 
-  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
-  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
-
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 38021313d..f4684ee7f 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 pkgname=luxrender-libre
-pkgver=0.8
-_pkgver=45d3e13eb94c
-pkgrel=13
+pkgver=1.0rc1
+_pkgver=08ae99830f8e
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
@@ -18,14 +18,12 @@ makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
 replaces=('luxrender')
 conflicts=('luxrender')
 provides=("luxrender=$pkgver")
-source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
-md5sums=('0f2d856385db72131f51e44a7ee527fa')
+source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2)
+md5sums=('738616b55ac58c98de431b98f90a05fb')
 
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
-  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
-
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=ON \
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 4d39c9116..0b66880dc 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -68,6 +68,9 @@ if [ $NOEXTRACT -eq 0 ]; then
 
   cp "$srcdir/mozconfig" .mozconfig
 
+  # Fails, claiming the page size to have changed.
+  [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
   patch -Np1 -i "$srcdir/gcc47.patch"