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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 85 insertions, 0 deletions

diff --git a/community/kmess/giflib-5.0.patch b/community/kmess/giflib-5.0.patch
new file mode 100644
index 000000000..9b959b175
--- /dev/null
+++ b/community/kmess/giflib-5.0.patch
@@ -0,0 +1,85 @@
+diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp
+--- a/contrib/isf-qt/src/isfqt.cpp	2012-02-18 16:28:01.000000000 +0000
++++ b/contrib/isf-qt/src/isfqt.cpp	2013-07-30 20:51:06.705394145 +0000
+@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+   int             width     = isfImage.width();
+   int             numColors = 0;
+   bool            gifError  = true;
++  int             gifErrCode;
+ 
+   // Convert the image to GIF using libgif
+ 
+   // Open the gif file
+   gifData.open( QIODevice::WriteOnly );
+-  gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray );
++  gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode );
+   if( gifImage == 0 )
+   {
+     qWarning() << "Couldn't initialize gif library!";
+@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw
+     numColors = 256;
+   }
+ 
+-  cmap = MakeMapObject( numColors, NULL );
++  cmap = GifMakeMapObject( numColors, NULL );
+   if( cmap == 0 && isfImage.numColors() > 1 )
+   {
+     qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
+@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw
+   else
+   {
+     // Write the extension
+-    if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR )
++    if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR )
+     {
+       qWarning() << "EGifPutExtensionFirst failed!";
+       goto writeError;
+@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw
+     // Write all the full data blocks
+     while( length >= MAX_GIF_BYTE )
+     {
+-      if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
++      if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
+       {
+-        qWarning() << "EGifPutExtensionNext failed!";
++        qWarning() << "EGifPutExtensionBlock failed!";
+         goto writeError;
+       }
+ 
+@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw
+     // Write the last block
+     if( length > 0 )
+     {
+-      if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
++      if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
+       {
+-        qWarning() << "EGifPutExtensionLast (n) failed!";
++        qWarning() << "EGifPutExtensionTrailer (n) failed!";
+         goto writeError;
+       }
+     }
+     else
+     {
+-      if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR )
++      if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
+       {
+-        qWarning() << "EGifPutExtensionLast (0) failed!";
++        qWarning() << "EGifPutExtensionTrailer (0) failed!";
+         goto writeError;
+       }
+     }
+@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw
+ writeError:
+   // Clean up the GIF converter etc
+   EGifCloseFile( gifImage );
+-  FreeMapObject( cmap );
++  GifFreeMapObject( cmap );
+   gifData.close();
+ 
+   if( gifError )
+   {
+-    qWarning() << "GIF error code:" << GifLastError();
++    qWarning() << "GIF error code:" << GifErrorString(gifErrCode);
+   }
+   else
+   {