Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/gnash/PKGBUILD
	community/libopenraw/PKGBUILD
	community/smalltalk/PKGBUILD
	core/coreutils/PKGBUILD
	core/libarchive/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/lirc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/sdl_net/PKGBUILD
	extra/sdl_ttf/PKGBUILD
	extra/spamassassin/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/tumbler/PKGBUILD
	extra/vim/PKGBUILD
	extra/wipe/PKGBUILD
	extra/xfce4-netload-plugin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	multilib/binutils-multilib/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/dev86/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/lib32-glibc.conf
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/lib32-sdl_ttf/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD
	multilib/q4wine/PKGBUILD
	multilib/wine/PKGBUILD
	staging/php/PKGBUILD
	staging/php/php-fpm.conf.in.patch
	staging/php/php.ini.patch

2 files changed, 58 insertions, 6 deletions

diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index cf68b044b..4c27cb953 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
 # $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.9
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64 mips64el)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
@@ -15,10 +15,11 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
              pkgconfig boost)
 options=(!libtool !emptydirs)
 source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        gentoo-ffmpeg-0.8.patch xul8.patch)
-md5sums=('5b2be6b04a1bcc5fb404cc377034499e'
-         '98dec9a5c1b1084245a3f46b4022a6e2'
-         '9b77325d0b8b9d4150c4097771482d26')
+        gentoo-ffmpeg-0.8.patch xul8.patch nodebug.patch)
+sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd'
+            '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca'
+            'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9'
+            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
 
 build() {
   cd "$srcdir/gnash-$pkgver"
@@ -30,6 +31,9 @@ build() {
   # Patch for compatibility with newer xulrunner headers
   patch -Np1 -i "$srcdir/xul8.patch"
 
+  # Disable very, very verbose debugging (gigabytes of logs)
+  patch -Np1 -i "$srcdir/nodebug.patch"
+
   ./autogen.sh
   ./configure \
     --prefix=/usr \
diff --git a/community/gnash/nodebug.patch b/community/gnash/nodebug.patch
new file mode 100644
index 000000000..ca160b898
--- /dev/null
+++ b/community/gnash/nodebug.patch
@@ -0,0 +1,48 @@
+diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
+--- gnash-0.8.9/libbase/log.h	2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-nodebug/libbase/log.h	2012-01-18 09:39:02.004103494 +0100
+@@ -331,27 +331,27 @@
+ 
+ // Define to 0 to completely remove parse debugging at compile-time
+ #ifndef VERBOSE_PARSE
+-#define VERBOSE_PARSE 1
++#define VERBOSE_PARSE 0
+ #endif
+ 
+ // Define to 0 to completely remove action debugging at compile-time
+ #ifndef VERBOSE_ACTION
+-#define VERBOSE_ACTION 1
++#define VERBOSE_ACTION 0
+ #endif
+ 
+ // Define to 0 to remove ActionScript errors verbosity at compile-time
+ #ifndef VERBOSE_ASCODING_ERRORS
+-#define VERBOSE_ASCODING_ERRORS  1
++#define VERBOSE_ASCODING_ERRORS  0
+ #endif
+ 
+ // Define to 0 this to remove invalid SWF verbosity at compile-time
+ #ifndef VERBOSE_MALFORMED_SWF
+-#define VERBOSE_MALFORMED_SWF 1
++#define VERBOSE_MALFORMED_SWF 0
+ #endif
+ 
+ // Define to 0 this to remove Networking verbosity at compile-time
+ #ifndef VERBOSE_NETWORKING
+-#define VERBOSE_NETWORKING 1
++#define VERBOSE_NETWORKING 0
+ #endif
+ 
+ #if VERBOSE_PARSE
+diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
+--- gnash-0.8.9/libcore/vm/ActionExec.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp	2012-01-18 09:40:25.653458508 +0100
+@@ -46,7 +46,7 @@
+ // too much information for my tastes. I really want just
+ // to see how stack changes while executing actions...
+ // --strk Fri Jun 30 02:28:46 CEST 2006
+-# define DEBUG_STACK 1
++//# define DEBUG_STACK 1
+ 
+ // Max number of stack item to dump. 0 for unlimited.
+ # define STACK_DUMP_LIMIT 32