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

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 56 insertions, 37 deletions

diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
index 8f5e14815..dcaac0eee 100644
--- a/community/compiz/PKGBUILD
+++ b/community/compiz/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('compiz-core'
 	'compiz-decorator-kde'
 	'compiz-decorator-gtk')
 pkgver=0.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Composite manager for Aiglx and Xgl"
 url="http://www.compiz.org/"
 license=('GPL' 'LGPL' 'MIT')
@@ -20,13 +20,14 @@ makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
 options=(!libtool !emptydirs)
 conflicts=('compiz' 'compiz-core-git' 'compiz-git')
 replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e')
+source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch)
+sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
+          '148656352f8a20b3781ee185025c5c8d4b7d720f')
 
 build()
 {
-  cd $srcdir/compiz-$pkgver
-
+  cd "$srcdir/compiz-$pkgver"
+  patch -p1 -i ../compiz-build.patch
   ./configure   --prefix=/usr \
 	    --enable-gnome \
 	    --enable-gtk \
@@ -48,18 +49,18 @@ package_compiz-core()
   depends=('startup-notification' 'librsvg' \
          'libgl' 'dbus' 'mesa' 'libxslt' 'fuse')
 
-  cd $srcdir/compiz-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/compiz-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   # remove stuff which is in one of the decorations
-   rm -rf $pkgdir/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf ${pkgdir}/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf ${pkgdir}/etc
+   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
+   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
+   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
+   rm -rf "${pkgdir}"/etc
 
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-	$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT
+  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
+	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
 }
 
 package_compiz-decorator-gtk()
@@ -68,39 +69,39 @@ package_compiz-decorator-gtk()
   depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
   install=compiz-decorator-gtk.install
 
-  cd $srcdir/compiz-$pkgver
+  cd "$srcdir/compiz-$pkgver"
 
   pushd gtk
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
   install -Dm644 window-decorator/gwd.schemas \
-                $pkgdir/usr/share/gconf/schemas/gwd.schemas
+                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
   popd
 
   for i in dbus gconf ini inotify png regex svg glib kconfig
   do
-    rm $srcdir/compiz-$pkgver/metadata/compiz-$i.schemas
+    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
   done
 
   gconf-merge-schema \
-    ${pkgdir}/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        ${srcdir}/compiz-$pkgver/metadata/*.schemas
+    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
+        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # remove stuff which is in one of the other packages
-   rm -rf ${pkgdir}/etc
-   rm -rf $pkgdir/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf $pkgdir/usr/include
-   cd $pkgdir/usr/lib
+   rm -rf "${pkgdir}"/etc
+   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
+   rm -rf "$pkgdir"/usr/include
+   cd "$pkgdir"/usr/lib
    rm libdecoration*
    rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd ${pkgdir}/usr/lib/compiz
-   rm `ls --hide=*gconf*`
-   rm -rf ${pkgdir}/usr/share/{compiz,locale}
+   cd "${pkgdir}"/usr/lib/compiz
+   rm $(ls --hide=*gconf*)
+   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
    
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-        $pkgdir/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
 }
 
 package_compiz-decorator-kde()
@@ -108,17 +109,17 @@ package_compiz-decorator-kde()
   pkgdesc="Compiz decorator for KDE"
   depends=('kdebase-workspace' 'compiz-core')
 
-  cd $srcdir/compiz-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir"/compiz-$pkgver
+  make DESTDIR="$pkgdir" install
 
   # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf $pkgdir/usr/{include,lib}
-  rm -rf $pkgdir/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf ${pkgdir}/etc
-  rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
+  rm -rf "$pkgdir"/usr/{include,lib}
+  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
+  rm -rf "${pkgdir}"/etc
+  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
 
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-        $pkgdir/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
 }
 
diff --git a/community/compiz/compiz-build.patch b/community/compiz/compiz-build.patch
new file mode 100644
index 000000000..f22a3fa21
--- /dev/null
+++ b/community/compiz/compiz-build.patch
@@ -0,0 +1,18 @@
+diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
+--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
+@@ -986,10 +986,10 @@
+ {
+     Atom    atom = Atoms::compizWindowBlurDecor;
+     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
+-    Region  topRegion = NULL;
+-    Region  bottomRegion = NULL;
+-    Region  leftRegion = NULL;
+-    Region  rightRegion = NULL;
++    ::Region  topRegion = NULL;
++    ::Region  bottomRegion = NULL;
++    ::Region  leftRegion = NULL;
++    ::Region  rightRegion = NULL;
+     int     size = 0;
+     int     w, h;
+