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

1 files changed, 79 insertions, 0 deletions

diff --git a/community/libmediainfo/gcc-4.7.patch b/community/libmediainfo/gcc-4.7.patch
new file mode 100644
index 000000000..5bdfc53e3
--- /dev/null
+++ b/community/libmediainfo/gcc-4.7.patch
@@ -0,0 +1,79 @@
+diff -aur MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp
+--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp	2012-04-08 20:25:35.000000000 +0200
++++ MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp	2012-04-13 05:14:46.924995168 +0200
+@@ -249,15 +249,15 @@
+             #else

+                 libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);

+                 if (!libcurl_Module)

+-                    libcurl_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);

++                    libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);

+                 if (!libcurl_Module)

+-                    libcurl_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);

++                    libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+                 if (!libcurl_Module)

+-                    libcurl_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);

++                    libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+                 if (!libcurl_Module)

+-                    libcurl_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);

++                    libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+                 if (!libcurl_Module)

+-                    libcurl_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);

++                    libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+             #endif

+             if (!libcurl_Module)

+             {

+diff -aur MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h
+--- MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h	2012-04-08 12:08:50.000000000 +0200
++++ MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h	2012-04-13 05:14:05.481020899 +0200
+@@ -248,24 +248,24 @@
+ 

+ #ifdef MEDIAINFO_GLIBC

+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \

+-    if (!g_module_symbol (MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \

++    if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \

+         Errors++;

+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \

+-    if (!g_module_symbol (MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \

++    if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \

+         Errors++;

+ #elif defined (_WIN32) || defined (WIN32)

+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \

+-    MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \

++    MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \

+     if (MediaInfo_##_Name==NULL) Errors++;

+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \

+-    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \

++    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \

+     if (MediaInfoList_##_Name==NULL) Errors++;

+ #else

+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \

+-    MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \

++    MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \

+     if (MediaInfo_##_Name==NULL) Errors++;

+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \

+-    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \

++    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \

+     if (MediaInfoList_##_Name==NULL) Errors++;

+ #endif

+ 

+@@ -317,15 +317,15 @@
+     #else

+         MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);

+         if (!MediaInfo_Module)

+-            MediaInfo_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);

++            MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);

+         if (!MediaInfo_Module)

+-            MediaInfo_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);

++            MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+         if (!MediaInfo_Module)

+-            MediaInfo_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);

++            MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+         if (!MediaInfo_Module)

+-            MediaInfo_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);

++            MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);

+         if (!MediaInfo_Module)

+-            MediaInfo_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);

++            MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);

+     #endif

+     if (!MediaInfo_Module)

+         return (size_t)-1;