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

Conflicts:
	community-staging/cegui/PKGBUILD
	community-staging/darktable/PKGBUILD
	community-staging/freewrl/PKGBUILD
	community-staging/gource/PKGBUILD
	community-staging/openimageio/PKGBUILD
	community-staging/rss-glx/PKGBUILD
	community-staging/spring/PKGBUILD
	community-testing/virtualbox-modules/PKGBUILD
	community/astromenace/PKGBUILD
	extra/di/PKGBUILD
	staging/opencv/PKGBUILD
	testing/cairo/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install

5 files changed, 0 insertions, 153 deletions

diff --git a/community-staging/devil/PKGBUILD b/community-staging/devil/PKGBUILD
deleted file mode 100644
index f2ba5462d..000000000
--- a/community-staging/devil/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78557 2012-10-20 21:46:36Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.7.8
-pkgrel=14
-pkgdesc="Library for reading several different image formats"
-arch=('i686' 'x86_64')
-url="http://openil.sourceforge.net/"
-depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
-install=devil.install
-options=('!libtool' '!docs' '!emptydirs')
-license=('GPL')
-source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
-md5sums=('7918f215524589435e5ec2e8736d5e1d'
-         '0f839ccefd43b0ee8b4b3f99806147fc')
-
-build() {
-  cd ${srcdir}/devil-$pkgver
-
-  patch -Np1 -i ${srcdir}/libpng14.patch
-
-  if [[ $CARCH == x86_64 ]]; then
-    ./configure --prefix=/usr --enable-ILU
-  else
-    ./configure --prefix=/usr --enable-ILU --disable-sse3
-  fi
-
-  make
-}
-
-package() {
-  cd ${srcdir}/devil-$pkgver
-
-  make prefix=${pkgdir}/usr install
-}
diff --git a/community-staging/devil/devil.install b/community-staging/devil/devil.install
deleted file mode 100644
index 8336ac3d1..000000000
--- a/community-staging/devil/devil.install
+++ /dev/null
@@ -1,11 +0,0 @@
-infodir=usr/share/info
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/community-staging/devil/libpng14.patch b/community-staging/devil/libpng14.patch
deleted file mode 100644
index b8434692b..000000000
--- a/community-staging/devil/libpng14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
---- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
-diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
---- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
-@@ -105,7 +105,7 @@
- 	Read = iread(Signature, 1, 8);
- 	iseek(-Read, IL_SEEK_CUR);
- 
--	return png_check_sig(Signature, 8);
-+	return png_sig_cmp(Signature, 0, 8) == 0;
- }
- 
- 
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD
deleted file mode 100644
index a8e7d7245..000000000
--- a/community-staging/supertux/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 78608 2012-10-22 02:52:34Z ebelanger $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=7
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch
deleted file mode 100644
index 16781b610..000000000
--- a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
-@@ -136,8 +136,4 @@
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
-@@ -2,6 +2,8 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));