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

Conflicts:
	extra/libzip/PKGBUILD
	extra/qt/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-disk-utility/PKGBUILD
	gnome-unstable/gnome-documents/PKGBUILD
	gnome-unstable/gnome-font-viewer/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-system-log/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libimobiledevice/PKGBUILD
	gnome-unstable/libplist/PKGBUILD
	libre/grub2/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib-testing/lib32-glibc/glibc-__i686.patch
	multilib/lib32-qt/PKGBUILD
	testing/dhcpcd/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc-__i686.patch

2 files changed, 37 insertions, 22 deletions

diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index ee76a64b1..26fc428d1 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 152665 2012-03-08 10:07:57Z andrea $
+# $Id: PKGBUILD 154524 2012-03-29 20:18:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=6
+pkgver=4.8.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -18,35 +18,23 @@ _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
 source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
-        'fix-qgraphicsscene-regression.patch'
-        'improved-filter-event.patch'
-        'qurl-backward-compatibility.patch'
-	'declarative-fix-sigbus.patch'
-        'improve-cups-support.patch')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
+        'gcc47.patch'
+	'declarative-fix-sigbus.patch')
+md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'c2e91fc028250a590e76effe234468e2'
-         '444ebeb716d7c7379835efb8aa88e6c8'
-         '7bc255a36733d0fbc80c1902ade4beca'
-         'aac963d05a9d5733e2bfce9e26607f51'
-         'c439c7731c25387352d8453ca7574971')
+         'd8a0e81075b290ddc18ecd33b9b7ee22'
+         'aac963d05a9d5733e2bfce9e26607f51')
 
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
   # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
-  # (FS#28707)
-  patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
-  # (FS#27757) (KDEBUG#275469)
-  patch -p1 -i "${srcdir}"/improved-filter-event.patch
-  patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
-
-  # (FS#28381) (KDEBUG#180051)
-  patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+  patch -p1 -i "${srcdir}"/gcc47.patch
 
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
diff --git a/extra/qt/gcc47.patch b/extra/qt/gcc47.patch
new file mode 100644
index 000000000..62c436e6a
--- /dev/null
+++ b/extra/qt/gcc47.patch
@@ -0,0 +1,27 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me	2012-01-24 11:24:14.729942043 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h	2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+     
+     class JSGlobalObject : public JSVariableObject {
+     protected:
+-        using JSVariableObject::JSVariableObjectData;
+-
+-        struct JSGlobalObjectData : public JSVariableObjectData {
++        struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
+             // We use an explicit destructor function pointer instead of a
+             // virtual destructor because we want to avoid adding a vtable
+             // pointer to this struct. Adding a vtable pointer would force the
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me	2012-01-24 11:40:07.167856677 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h	2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+     
+     class JSStaticScopeObject : public JSVariableObject {
+     protected:
+-        using JSVariableObject::JSVariableObjectData;
+-        struct JSStaticScopeObjectData : public JSVariableObjectData {
++        struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
+             JSStaticScopeObjectData()
+                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
+             {