Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/camlp5/PKGBUILD
	community/coq/PKGBUILD
	community/ldns/PKGBUILD
	community/luxrays/PKGBUILD
	community/luxrender/PKGBUILD
	community/nut/PKGBUILD
	community/root/PKGBUILD
	community/swi-prolog/PKGBUILD
	community/vtk/PKGBUILD
	community/wings3d/wings3d.sh
	core/sqlite3/PKGBUILD
	core/tzdata/PKGBUILD
	extra/cmus/PKGBUILD
	extra/dcron/PKGBUILD
	extra/farsight2/PKGBUILD
	extra/foomatic/PKGBUILD
	extra/fwbuilder/PKGBUILD
	extra/gnome-utils/PKGBUILD
	extra/ivtv-utils/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libxfce4menu/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/telepathy-butterfly/PKGBUILD
	extra/telepathy-farsight/PKGBUILD
	extra/telepathy-kde-presence-dataengine/PKGBUILD
	extra/telepathy-qt4/PKGBUILD
	extra/xfce-utils/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib/lib32-zlib/PKGBUILD
	staging/gimp-devel/gimp-devel.install
	testing/gtk3/PKGBUILD
	testing/php/PKGBUILD
	~xihh/couchdb-git/couchdb.install
	~xihh/couchdb-git/rc-script.patch
	~xihh/gmime24/PKGBUILD

5 files changed, 0 insertions, 243 deletions

diff --git a/extra/libreoffice/buildfix_boost.diff b/extra/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/extra/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/extra/libreoffice/buildfix_ct2n.diff b/extra/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/extra/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/extra/libreoffice/gcc462_buildfix.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
-+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -0200
-@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
-     : ThreadHelpBase(&Application::GetSolarMutex())
- {
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
- }
- 
-@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
-     // SAFE -> ----------------------------------
-     WriteGuard aWriteLock(m_aLock);
-     
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
-     
-     aWriteLock.unlock();
---- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
-+++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -0200
-@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
-     // take over all new parameters.
-     m_xTargetFrame.clear();
-     m_xBaseFrame                    = xBaseFrame        ;
--    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    m_lMediaDescriptor              =  tmp;
-     m_sTarget                       = sTarget           ;
-     m_nSearchFlags                  = nSearchFlags      ;
-     m_eFeature                      = eFeature          ;
---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
-+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
-@@ -175,6 +175,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig	2011-12-19 11:10:56.000000000 +0000
-+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx	2011-12-19 11:12:06.000000000 +0000
-@@ -185,6 +185,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+		UIElementType& operator=(const UIElementType& rRight) {
-+			bModified = rRight.bModified;
-+			bLoaded = rRight.bLoaded;
-+			bDefaultLayer = rRight.bDefaultLayer;
-+			nElementType = rRight.nElementType;
-+			aElementsHashMap = rRight.aElementsHashMap;
-+			xStorage = rRight.xStorage;
-+			return *this;
-+		};
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig	2011-12-19 11:14:17.000000000 +0000
-+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx	2011-12-19 11:15:16.000000000 +0000
-@@ -171,6 +171,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
-
---- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
-+++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
-@@ -813,7 +813,7 @@ extern "C" {
- 
-         if( aDialog.Execute() )
-         {
--            rJobData = aDialog.getSetup();
-+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
-             nRet = 1;
-         }
- 
---- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
-+++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
-@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
-         if ( aFilterName.getLength() )
-             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
- 
--        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
-+        aFiltPropsHM <<  aFilterProps;
-         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
-     }
- 
---- ./framework/inc/classes/filtercachedata.hxx.orig	2011-12-17 13:14:22.102898902 +0000
-+++ ./framework/inc/classes/filtercachedata.hxx	2011-12-17 13:17:51.524424012 +0000
-@@ -230,7 +230,7 @@
-         {
-             bPreferred			= rCopy.bPreferred		;
-             sName				= rCopy.sName			;
--            lUINames			= rCopy.lUINames		;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sMediaType			= rCopy.sMediaType		;
-             sClipboardFormat	= rCopy.sClipboardFormat;
-             nDocumentIconID		= rCopy.nDocumentIconID	;
-@@ -298,7 +298,7 @@
-             nOrder              = rCopy.nOrder              ;
-             sName				= rCopy.sName				;
-             sType				= rCopy.sType				;
--            lUINames			= rCopy.lUINames			;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sDocumentService	= rCopy.sDocumentService	;
-             sFilterService		= rCopy.sFilterService		;
-             sUIComponent        = rCopy.sUIComponent        ;
-@@ -405,7 +405,7 @@
-         inline Loader& impl_copy( const Loader& rCopy )
-         {
-             sName       = rCopy.sName       ;
--            lUINames	= rCopy.lUINames	;
-+            lUINames	= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             lTypes		= rCopy.lTypes		;
-             return (*this);
-         }
diff --git a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/extra/libreoffice/vbahelper.visibility.patch b/extra/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/extra/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \