Merged upstream, mesa needs revision

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

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

1 files changed, 20 insertions, 0 deletions

diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch
new file mode 100644
index 000000000..f32280de9
--- /dev/null
+++ b/community/ubuntuone-client/fix-notify-hint.patch
@@ -0,0 +1,20 @@
+diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
+--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py	2012-06-19 15:51:01.000000000 +0200
++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py	2012-10-15 01:14:01.019476818 +0200
+@@ -40,7 +40,7 @@
+ 
+ if 'gi' in sys.modules and sys.modules['gi'] is not None:
+     try:
+-        from gi.repository import Notify
++        from gi.repository import GLib, Notify
+         Notify  # pyflakes
+         NOTIFY_MODULE = 'gi'
+     except ImportError:
+@@ -85,5 +85,6 @@
+         if append:
+             self.notification.set_hint_string('x-canonical-append', '')
+ 
+-        self.notification.set_hint_int32('transient', int(True))
++        if NOTIFY_MODULE == 'gi':
++            self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
+         self.notification.show()