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, 5 insertions, 40 deletions

diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index 7425f8cfd..d29c44bf3 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,27 +1,22 @@
-# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $
+# $Id: PKGBUILD 191913 2013-08-01 06:53:46Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: SleepyDog
 
 pkgname=glew
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
 pkgdesc="The OpenGL Extension Wrangler Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
 depends=('libxmu' 'libxi' 'glu')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz
-        glxew_export_fix.diff)
-sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe'
-          'f389645a1400aebdadce596fec970cfe0be6c15b')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
+sha1sums=('f41b45ca4a630ad1d00b8b87c5f493781a380300')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   
-  # fix compilation for some 3rd party apps; FS#32835
-  patch -Np1 -i ${srcdir}/glxew_export_fix.diff
-  
   sed -i 's|lib64|lib|' config/Makefile.linux
   make
 }
diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff
deleted file mode 100644
index 8a179e0a7..000000000
--- a/extra/glew/glxew_export_fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-X-Git-Url: 
-http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220
-
-diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h
-index cfcd20d..e9a3391 100644
---- a/auto/src/glxew_mid.h
-+++ b/auto/src/glxew_mid.h
-@@ -1,7 +1,7 @@
- /* ------------------------------------------------------------------------- */
- 
- #ifdef GLEW_MX
--#define GLXEW_FUN_EXPORT
-+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
- #define GLXEW_VAR_EXPORT
- #else
- #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
-Index: glew-1.8.0/include/GL/glxew.h
-===================================================================
---- glew-1.8.0.orig/include/GL/glxew.h	2012-08-08 20:56:17.574088414 +0200
-+++ glew-1.8.0/include/GL/glxew.h	2012-08-08 20:57:34.350092129 +0200
-@@ -1360,7 +1360,7 @@
- /* ------------------------------------------------------------------------- */
- 
- #ifdef GLEW_MX
--#define GLXEW_FUN_EXPORT
-+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
- #define GLXEW_VAR_EXPORT
- #else
- #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
-