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

2 files changed, 106 insertions, 7 deletions

diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index f462e760e..4c12a00a0 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $
+# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas
 pkgver=1.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa'
+depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
   'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
 options=('!libtool' '!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz
+        evas-1.7.5-giflib5.patch)
+sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af'
+          'ec40d3aff6240dc0e33e648c76393f62b985628a')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../evas-1.7.5-giflib5.patch
+}
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
   export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
@@ -56,7 +62,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # install license files
diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch
new file mode 100644
index 000000000..48d1834c5
--- /dev/null
+++ b/extra/evas/evas-1.7.5-giflib5.patch
@@ -0,0 +1,93 @@
+diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
+index 18a6e23..e8cc562 100644
+--- a/src/modules/loaders/gif/evas_image_load_gif.c
++++ b/src/modules/loaders/gif/evas_image_load_gif.c
+@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
+    int                 h;
+    int                 alpha;
+    int                 loop_count = -1;
+-
++#if GIFLIB_MAJOR >= 5
++   int                 err;
++#endif
+    w = 0;
+    h = 0;
+    alpha = -1;
+@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
+         return EINA_FALSE;
+      }
+ 
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, &err);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);
+@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
+    GifFileType       *gif;
+    Image_Entry_Frame *frame = NULL;
+    Gif_Frame         *gif_frame = NULL;
++#if GIFLIB_MAJOR >= 5
++   int                err;
++#endif
+ 
+ #ifndef __EMX__
+    fd = open(file, O_RDONLY);
+@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
+         return EINA_FALSE;
+      }
+ 
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, &err);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);
+@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
+           {
+              int           fd;
+              GifFileType  *gif;
++#if GIFLIB_MAJOR >= 5
++             int           err;
++#endif
+ 
+ #ifndef __EMX__
+              fd = open(file, O_RDONLY);
+@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
+                   return EINA_FALSE;
+                }
+ 
++#if GIFLIB_MAJOR >= 5
++             gif = DGifOpenFileHandle(fd, &err);
++#else
+              gif = DGifOpenFileHandle(fd);
++#endif
+              if (!gif)
+                {
+                   if (fd) close(fd);
+@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
+    int                 remain_frames = frame_num;
+    double              duration = 0;
+    int                 frame_count = 0;
++#if GIFLIB_MAJOR >= 5
++   int                 err;
++#endif
+ 
+    frame_count = ie->frame_count;
+ 
+@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
+ #endif
+    if (fd < 0) return -1;
+ 
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, &err);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         if (fd) close(fd);