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

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 62 deletions

diff --git a/community/freeimage/gcc4.5_ln.patch b/community/freeimage/gcc4.5_ln.patch
deleted file mode 100644
index 317a48004..000000000
--- a/community/freeimage/gcc4.5_ln.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
---- FreeImage.orig//Makefile.fip	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Makefile.fip	2010-09-12 23:29:36.000000000 +0200
-@@ -15,9 +15,9 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

- CFLAGS += $(INCLUDE)

--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

- CXXFLAGS += $(INCLUDE)

- 

- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

-diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
---- FreeImage.orig//Makefile.gnu	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Makefile.gnu	2010-09-12 23:01:57.000000000 +0200
-@@ -15,9 +15,9 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

- CFLAGS += $(INCLUDE)

--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

- CXXFLAGS += $(INCLUDE)

- 

- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

-@@ -65,9 +65,6 @@
- 	install -m 644 -o root -g root $(HEADER) $(INCDIR)

- 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)

- 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)

--	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)

--	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	

--	ldconfig

- 

- clean:

- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

-diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
---- FreeImage.orig//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:16:12.000000000 +0200
-@@ -21,6 +21,7 @@
- 

- #include "FreeImage.h"

- #include "Utilities.h"

-+#include <limits.h>

- 

- /** @brief Determines, whether a palletized image is visually greyscale or not.

-  

-diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
---- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 21:43:26.000000000 +0200
-@@ -51,6 +51,7 @@
- 

- #include <iostream>

- #include <iomanip>

-+#include <cstring>

- 

- #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER

- // suppress exception specification warnings