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, 18 insertions, 17 deletions

diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index fb5089c9a..627444421 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $
+# $Id: PKGBUILD 191918 2013-08-01 06:59:47Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 # Contributor: mightyjaym <jm.ambrosino@free.fr>
 
 pkgname=giflib
-pkgver=4.2.1
-pkgrel=3
+pkgver=5.0.4
+pkgrel=2
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,34 +18,24 @@ conflicts=('libungif')
 replaces=('libungif')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
-        giflib-4.2.1-quantize.patch)
-md5sums=('bbd3324af24156d5d7e66ab1cee8508d'
-         '26174405ba886a89b8a4db18fe653a99')
+        giflib-5.0.4-include-stddef.patch)
+md5sums=('da60935d07374de00a78c2f6f720c8f5'
+         'e39b98822334f2bd2009469e5dea65c5')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
-  patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch
-  autoreconf -fi
+  patch -Np1 -i ../giflib-5.0.4-include-stddef.patch
 }
 
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
-
-  # libungif compatibility - instructions taken from Redhat specfile
-  MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'`
-  gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver}
 }
 
 package() {
   cd ${pkgname}-${pkgver} 
   make DESTDIR="${pkgdir}" install
 
-  install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/"
-  ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4"
-  ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so"
-
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch
new file mode 100644
index 000000000..d3ea73854
--- /dev/null
+++ b/extra/giflib/giflib-5.0.4-include-stddef.patch
@@ -0,0 +1,11 @@
+diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h
+--- a/lib/gif_lib.h	2013-01-06 07:29:57.000000000 +0100
++++ b/lib/gif_lib.h	2013-07-30 10:52:47.611034000 +0200
+@@ -19,6 +19,7 @@ extern "C" {
+ #define GIF_OK      1
+ 
+ #include <stdbool.h>
++#include <stddef.h>
+ 
+ #define GIF_STAMP "GIFVER"          /* First chars in file - GIF stamp.  */
+ #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1