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

Conflicts:
	community-staging/projectm/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/qtcreator/PKGBUILD
	community-testing/qtcreator/qtcreator.desktop
	community/galculator/PKGBUILD
	community/ristretto/PKGBUILD
	core/systemd/PKGBUILD
	extra/llvm/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/python-lxml/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/glew/PKGBUILD
	staging/xine-lib/PKGBUILD
	testing/calligra/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/fix_external_program_directories.patch
	testing/glib2/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/polkit/PKGBUILD
	testing/poppler/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-xdm/PKGBUILD

1 files changed, 0 insertions, 74 deletions

diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch
deleted file mode 100644
index fcc5604e7..000000000
--- a/community-testing/torcs/torcs-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
---- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
-@@ -10,8 +10,10 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <cmath>
- #include <cassert>
-+#include <ctime>
- #include <list>
- #include <vector>
- #include "Trajectory.h"
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- 
- #include <algorithm>
--#include <new.h>
-+#include <new>
- 
- class BBoxCompAxis {
- public:
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- #include "BBoxTree.h"
- 
--#include <new.h>
-+#include <new>
- 
- BBoxInternal *free_node;
- 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Object.h"
- #include "Encounter.h"
- 
--#include <new.h>
-+#include <new>
- 
- void addPair(ObjectPtr object1, ObjectPtr object2);
- void removePair(ObjectPtr object1, ObjectPtr object2);
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "Convex.h" 
- #include "Complex.h" 
- 
--#include <new.h>
-+#include <new>
- 
- Object::Object(DtObjectRef obj, ShapePtr shape) : 
-   ref(obj), 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
-@@ -37,7 +37,7 @@
- }
- 
- #include <vector>
--#include <new.h>  
-+#include <new>  
- 
- typedef vector<unsigned int> IndexBuf;
-