Tue Mar 13 00:01:30 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-03-13 00:01:30 +0000
committer: root <root@rshg054.dnsready.net> 2012-03-13 00:01:30 +0000
commit: 217a7715291ceb935900b71bde082023bc441290 (patch)
tree: 6cbfcf7d11f0bd1e412f542080ec995fc26daffd /gnome-unstable
parent: 7e61bbcf6b3c8ffe6c076268044d83b446fceeab (diff)
46 files changed, 1176 insertions, 158 deletions
diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD
new file mode 100644
index 000000000..ccd56a06c
--- /dev/null
+++ b/gnome-unstable/brasero/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 153024 2012-03-11 09:52:34Z ibiru $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=brasero
+pkgver=3.3.91
+pkgrel=1
+pkgdesc="A disc burning application for Gnome"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/projects/brasero"
+license=('GPL')
+options=('!libtool' '!emptydirs')
+depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
+makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf')
+optdepends=('libburn: alternative back-end'
+            'libisofs: libburn back-end'
+            'dvdauthor: video project'
+            'gstreamer0.10-bad-plugins: video project'
+            'vcdimager: video project')
+replaces=('nautilus-cd-burner')
+install=brasero.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a6caa775bdd6b7f1bda51fabd8d580d9416402da80b65351ab2de8fbd38dc7a4')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-caches \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR=$pkgdir install
+}
+
diff --git a/gnome-unstable/brasero/brasero.install b/gnome-unstable/brasero/brasero.install
new file mode 100644
index 000000000..b6c57055e
--- /dev/null
+++ b/gnome-unstable/brasero/brasero.install
@@ -0,0 +1,14 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/gnome-unstable/devhelp/PKGBUILD b/gnome-unstable/devhelp/PKGBUILD
new file mode 100644
index 000000000..b29242094
--- /dev/null
+++ b/gnome-unstable/devhelp/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 153002 2012-03-11 07:13:25Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+
+pkgname=devhelp
+pkgver=3.3.3
+pkgrel=1
+pkgdesc="API documentation browser for GNOME"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://live.gnome.org/devhelp/"
+depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool' 'python2')
+options=('!libtool' '!emptydirs')
+install=devhelp.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('58d0482d63fec858b044c92c7af2367c275fa4d834bdf157a0ba0d249353461d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/gnome-unstable/devhelp/devhelp.install b/gnome-unstable/devhelp/devhelp.install
new file mode 100644
index 000000000..4db5f6e5c
--- /dev/null
+++ b/gnome-unstable/devhelp/devhelp.install
@@ -0,0 +1,22 @@
+pkgname=devhelp
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD
new file mode 100644
index 000000000..653eac82a
--- /dev/null
+++ b/gnome-unstable/eog-plugins/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 152985 2012-03-11 06:01:12Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=eog-plugins
+pkgver=3.3.91
+pkgrel=1
+pkgdesc="Plugins for Eye of Gnome"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/"
+license=('GPL2')
+depends=('eog' 'libchamplain' 'libgdata')
+makedepends=('intltool')
+install=eog-plugins.install
+options=('!libtool')
+groups=(gnome-extra)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f4aa246497d2f65ffac09de9958cfa1737f8e1ae53ed11d800998bc7c616dfcf')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/gnome-unstable/eog-plugins/eog-plugins.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD
new file mode 100644
index 000000000..fd764cafd
--- /dev/null
+++ b/gnome-unstable/evolution/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 153016 2012-03-11 08:30:04Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution
+pkgver=3.3.90
+pkgrel=1
+pkgdesc="Manage your email, contacts and schedule"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst'
+         'libytnef' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
+optdepends=('bogofilter: possible junk filter plugin'
+            'spamassassin: possible junk filter plugin')
+groups=('gnome-extra')
+options=('!libtool' '!emptydirs')
+install=evolution.install
+url=http://www.gnome.org/projects/evolution/
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2eb34a1e01f69047bd89d073faeafd35653a1af89780038f10fd7a4cec4f7b50')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib \
+      --enable-nss=yes \
+      --with-openldap=yes \
+      --enable-smime=yes \
+      --with-krb5=/usr \
+      --disable-image-inline
+  
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+  make -C plugins/tnef-attachments
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
diff --git a/gnome-unstable/evolution/evolution.install b/gnome-unstable/evolution/evolution.install
new file mode 100644
index 000000000..805b877ca
--- /dev/null
+++ b/gnome-unstable/evolution/evolution.install
@@ -0,0 +1,24 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gconfpkg --install evolution
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  gconfpkg --uninstall evolution
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD
new file mode 100644
index 000000000..3b9f30d3d
--- /dev/null
+++ b/gnome-unstable/gedit/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 153014 2012-03-11 07:54:23Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gedit
+pkgver=3.3.4
+pkgrel=1
+pkgdesc="A text editor for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
+makedepends=('yelp-tools' 'intltool')
+groups=('gnome-extra')
+options=('!libtool' '!emptydirs')
+url="http://www.gnome.org"
+install=gedit.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('dddd7f2028fa1241ea5d842653fbad299ac9bb31de1ffcf5a1b8912f4e315149')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
+      --enable-python
+  make
+}
+
+package(){
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gedit/gedit.install b/gnome-unstable/gedit/gedit.install
new file mode 100644
index 000000000..9d88a1341
--- /dev/null
+++ b/gnome-unstable/gedit/gedit.install
@@ -0,0 +1,18 @@
+post_install() {
+    glib-compile-schemas usr/share/glib-2.0/schemas
+    update-desktop-database -q
+}
+
+pre_upgrade() {
+    if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
+        usr/sbin/gconfpkg --uninstall gedit
+    fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD
new file mode 100644
index 000000000..83a2819fa
--- /dev/null
+++ b/gnome-unstable/gnome-color-manager/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 152977 2012-03-11 05:08:49Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-color-manager
+pkgver=3.3.5
+pkgrel=1
+pkgdesc="Color profile manager for the GNOME desktop"
+arch=(i686 x86_64)
+url="http://projects.gnome.org/gnome-color-manager/"
+license=(GPL2)
+depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
+         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop')
+makedepends=('intltool' 'gtk-doc')
+install=gnome-color-manager.install
+options=('!libtool' '!emptydirs')
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6d3151a073cf8706a241c305851d1b776628efc76bd4d5433fce819b32547596')
+
+build(){
+  cd $pkgname-$pkgver
+
+  # man pages need docbook-sgml, which we don't have
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gnome-color-manager/gnome-color-manager.install b/gnome-unstable/gnome-color-manager/gnome-color-manager.install
new file mode 100644
index 000000000..04fda0ddc
--- /dev/null
+++ b/gnome-unstable/gnome-color-manager/gnome-color-manager.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-color-manager
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD
new file mode 100644
index 000000000..8036c11b8
--- /dev/null
+++ b/gnome-unstable/gnome-contacts/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 152998 2012-03-11 06:38:54Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gnome-contacts
+pkgver=3.3.90
+pkgrel=1
+pkgdesc="Contacts Manager for GNOME"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL2')
+groups=(gnome-extra)
+depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
+makedepends=('intltool' 'vala')
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bc1450a0e4df81a7d88df0827a674c0c203f0a3e57703c053def6529a50be0f6')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-contacts/gnome-contacts.install b/gnome-unstable/gnome-contacts/gnome-contacts.install
new file mode 100644
index 000000000..326aa98a2
--- /dev/null
+++ b/gnome-unstable/gnome-contacts/gnome-contacts.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD
index 89466a93f..2bbf95763 100644
--- a/gnome-unstable/gnome-control-center/PKGBUILD
+++ b/gnome-unstable/gnome-control-center/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 152916 2012-03-10 16:46:55Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 153046 2012-03-12 00:28:07Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.3.91
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
 depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon'
@@ -22,7 +23,7 @@ options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         systemd-fallback.patch)
 sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
-            '8c9647c3bd1a69d9ce4d3716c235463f1cd33527cd8a241a2e88829f14da0494')
+            '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch
index a83629db6..709e54019 100644
--- a/gnome-unstable/gnome-control-center/systemd-fallback.patch
+++ b/gnome-unstable/gnome-control-center/systemd-fallback.patch
@@ -1,7 +1,18 @@
-diff -u -Nr gnome-control-center-3.3.91/configure.ac gnome-control-center-3.3.91-systemd-fallback/configure.ac
---- gnome-control-center-3.3.91/configure.ac	2012-03-05 20:30:32.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/configure.ac	2012-03-07 00:06:01.752988448 +0100
-@@ -56,7 +56,7 @@
+commit 9873a7536844f5c38c2a123be58175c2774e5dcc
+Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+Date:   Mon Mar 12 01:12:11 2012 +0100
+
+    Fallback to CK if systemd is not available
+    
+    Be nice to distributions where systemd is optional. This will select
+    the code path at runtime depending on whether the system was booted
+    using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index aee97ac..867f061 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
                [with_systemd=$enableval],
                [with_systemd=no])
  if test "$with_systemd" = "yes" ; then
@@ -10,9 +21,10 @@ diff -u -Nr gnome-control-center-3.3.91/configure.ac gnome-control-center-3.3.91
    AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
  else
    SYSTEMD=
-diff -u -Nr gnome-control-center-3.3.91/panels/user-accounts/um-user.c gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c
---- gnome-control-center-3.3.91/panels/user-accounts/um-user.c	2012-03-05 15:04:55.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c	2012-03-07 00:13:13.002755560 +0100
+diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
+index f027754..5ebbe29 100644
+--- a/panels/user-accounts/um-user.c
++++ b/panels/user-accounts/um-user.c
 @@ -37,6 +37,11 @@
  
  #include <gio/gunixoutputstream.h>
@@ -25,7 +37,7 @@ diff -u -Nr gnome-control-center-3.3.91/panels/user-accounts/um-user.c gnome-con
  #include "um-user.h"
  #include "um-account-type.h"
  #include "um-utils.h"
-@@ -1003,57 +1008,50 @@
+@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
          }
  }
  
@@ -47,70 +59,19 @@ diff -u -Nr gnome-control-center-3.3.91/panels/user-accounts/um-user.c gnome-con
 +                int n_sessions;
  
 -#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
++                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
  
 -gboolean
 -um_user_is_logged_in (UmUser *user)
 -{
--        GVariant *result;
--        GVariantIter *iter;
--        gint n_sessions;
--        GError *error = NULL;
 +                return n_sessions > 0;
-+        } else
++        }
 +#endif
-+        {
-+                GVariant *result;
-+                GVariantIter *iter;
-+                gint n_sessions;
-+                GError *error = NULL;
-+
-+                result = g_dbus_connection_call_sync (user->bus,
-+                                                      "org.freedesktop.ConsoleKit",
-+                                                      "/org/freedesktop/ConsoleKit/Manager",
-+                                                      "org.freedesktop.ConsoleKit.Manager",
-+                                                      "GetSessionsForUnixUser",
-+                                                      g_variant_new ("(u)", um_user_get_uid (user)),
-+                                                      G_VARIANT_TYPE ("(ao)"),
-+                                                      G_DBUS_CALL_FLAGS_NONE,
-+                                                      -1,
-+                                                      NULL,
-+                                                      &error);
-+                if (!result) {
-+                        g_warning ("GetSessionsForUnixUser failed: %s", error->message);
-+                        g_error_free (error);
-+                        return FALSE;
-+                }
-+          
-+                g_variant_get (result, "(ao)", &iter);
-+                n_sessions = g_variant_iter_n_children (iter);
-+                g_variant_iter_free (iter);
-+                g_variant_unref (result);
- 
--        result = g_dbus_connection_call_sync (user->bus,
--                                              "org.freedesktop.ConsoleKit",
--                                              "/org/freedesktop/ConsoleKit/Manager",
--                                              "org.freedesktop.ConsoleKit.Manager",
--                                              "GetSessionsForUnixUser",
--                                              g_variant_new ("(u)", um_user_get_uid (user)),
--                                              G_VARIANT_TYPE ("(ao)"),
--                                              G_DBUS_CALL_FLAGS_NONE,
--                                              -1,
--                                              NULL,
--                                              &error);
--        if (!result) {
--                g_warning ("GetSessionsForUnixUser failed: %s", error->message);
--                g_error_free (error);
--                return FALSE;
-+                return n_sessions > 0;
-         }
--  
--        g_variant_get (result, "(ao)", &iter);
--        n_sessions = g_variant_iter_n_children (iter);
--        g_variant_iter_free (iter);
--        g_variant_unref (result);
--
--        return n_sessions > 0;
+         GVariant *result;
+         GVariantIter *iter;
+         gint n_sessions;
+@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
+         return n_sessions > 0;
  }
  
 -#endif
diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD
index af1597c00..6f29a546a 100644
--- a/gnome-unstable/gnome-desktop/PKGBUILD
+++ b/gnome-unstable/gnome-desktop/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 152841 2012-03-09 20:15:28Z ibiru $
+# $Id: PKGBUILD 153042 2012-03-11 16:06:27Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.3.91
-pkgrel=1
+pkgver=3.3.92
+pkgrel=0
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('gsettings-desktop-schemas' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'gtk-doc' 'gnome-common')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('62816d00d5a0d47df75b560785427635954d45d933f196c41992b9e308b0f3e3')
+sha256sums=('5d5ac1574fc5d05dbc1f4fa8308d6efa8a6a2dc0eaa81cfe320916882c3b42c8')
 
 build() {
   cd "$pkgname-$pkgver"
-
+  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --with-gnome-distributor="Arch Linux" \
diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD
new file mode 100644
index 000000000..f6ec74785
--- /dev/null
+++ b/gnome-unstable/gnome-documents/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 153008 2012-03-11 07:34:58Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-documents
+pkgver=0.3.90
+pkgrel=1
+pkgdesc="Documents Manager for GNOME"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL')
+groups=('gnome-extra')
+depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
+makedepends=('intltool')
+optdepends=('unoconv: Support for Libreoffice document types')
+options=('!libtool')
+install=gnome-documents.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0f7b103337a005bd7ed3134459a9163bf171ded67c6e96ba9e729ed6022f585d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/gnome-documents
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install
new file mode 100644
index 000000000..95114273e
--- /dev/null
+++ b/gnome-unstable/gnome-documents/gnome-documents.install
@@ -0,0 +1,13 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD
new file mode 100644
index 000000000..3e7cfe2ff
--- /dev/null
+++ b/gnome-unstable/gnome-games/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 153012 2012-03-11 07:51:23Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-games
+pkgver=3.3.5
+pkgrel=1
+pkgdesc="Some Games for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
+makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
+options=('!emptydirs' '!libtool')
+install=gnome-games.install
+url="http://www.gnome.org"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('fb7040584396bc8e9afdf0330d44ed94eb01f957391bcebe2d8518f271c5d810')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games \
+      --enable-introspection=yes
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
+}
diff --git a/gnome-unstable/gnome-games/gnome-games.install b/gnome-unstable/gnome-games/gnome-games.install
new file mode 100644
index 000000000..e22e358a4
--- /dev/null
+++ b/gnome-unstable/gnome-games/gnome-games.install
@@ -0,0 +1,121 @@
+_scores=(glines.Large.scores
+	glines.Medium.scores
+	glines.Small.scores
+	gnibbles.1.0.scores
+	gnibbles.1.1.scores
+	gnibbles.2.0.scores
+	gnibbles.2.1.scores
+	gnibbles.3.0.scores
+	gnibbles.3.1.scores
+	gnibbles.4.0.scores
+	gnibbles.4.1.scores
+	gnobots2.classic_robots-safe.scores
+	gnobots2.classic_robots-super-safe.scores
+	gnobots2.classic_robots.scores
+	gnobots2.nightmare-safe.scores
+	gnobots2.nightmare-super-safe.scores
+	gnobots2.nightmare.scores
+	gnobots2.robots2-safe.scores
+	gnobots2.robots2-super-safe.scores
+	gnobots2.robots2.scores
+	gnobots2.robots2_easy-safe.scores
+	gnobots2.robots2_easy-super-safe.scores
+	gnobots2.robots2_easy.scores
+	gnobots2.robots_with_safe_teleport-safe.scores
+	gnobots2.robots_with_safe_teleport-super-safe.scores
+	gnobots2.robots_with_safe_teleport.scores
+	gnomine.Custom.scores
+	gnomine.Large.scores
+	gnomine.Medium.scores
+	gnomine.Small.scores
+	gnotravex.2x2.scores
+	gnotravex.3x3.scores
+	gnotravex.4x4.scores
+	gnotravex.5x5.scores
+	gnotravex.6x6.scores
+	gnotski.1.scores
+	gnotski.10.scores
+	gnotski.11.scores
+	gnotski.12.scores
+	gnotski.13.scores
+	gnotski.14.scores
+	gnotski.15.scores
+	gnotski.16.scores
+	gnotski.17.scores
+	gnotski.18.scores
+	gnotski.19.scores
+	gnotski.2.scores
+	gnotski.20.scores
+	gnotski.21.scores
+	gnotski.22.scores
+	gnotski.23.scores
+	gnotski.24.scores
+	gnotski.25.scores
+	gnotski.26.scores
+	gnotski.27.scores
+	gnotski.28.scores
+	gnotski.29.scores
+	gnotski.3.scores
+	gnotski.30.scores
+	gnotski.31.scores
+	gnotski.32.scores
+	gnotski.33.scores
+	gnotski.34.scores
+	gnotski.35.scores
+	gnotski.36.scores
+	gnotski.37.scores
+	gnotski.4.scores
+	gnotski.5.scores
+	gnotski.6.scores
+	gnotski.7.scores
+	gnotski.8.scores
+	gnotski.9.scores
+	gtali.Colors.scores
+	gtali.Regular.scores
+	mahjongg.bridges.scores
+	mahjongg.cloud.scores
+	mahjongg.confounding.scores
+	mahjongg.difficult.scores
+	mahjongg.dragon.scores
+	mahjongg.easy.scores
+	mahjongg.pyramid.scores
+	mahjongg.tictactoe.scores
+	mahjongg.ziggurat.scores
+	swell-foop.Large.scores
+	swell-foop.Medium.scores
+	swell-foop.Small.scores
+	quadrapassel.scores)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+pre_upgrade() {
+  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/gnome-unstable/gnome-nettool/PKGBUILD b/gnome-unstable/gnome-nettool/PKGBUILD
new file mode 100644
index 000000000..714cc0e7a
--- /dev/null
+++ b/gnome-unstable/gnome-nettool/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153013 2012-03-11 07:52:22Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Kritoke <kritoke@nospam.gmail.com>
+
+pkgname=gnome-nettool
+pkgver=3.1.1
+pkgrel=1
+pkgdesc="A Collection of GNOME3 Networking Tools."
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
+makedepends=('gnome-doc-utils' 'intltool')
+groups=('gnome-extra')
+url="http://www.gnome.org"
+install=gnome-nettool.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gnome-nettool/gnome-nettool.install b/gnome-unstable/gnome-nettool/gnome-nettool.install
new file mode 100644
index 000000000..e5dfaf4a5
--- /dev/null
+++ b/gnome-unstable/gnome-nettool/gnome-nettool.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD
new file mode 100644
index 000000000..dd33ec50e
--- /dev/null
+++ b/gnome-unstable/gnome-power-manager/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 152997 2012-03-11 06:37:38Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-power-manager
+pkgver=3.3.3
+pkgrel=1
+pkgdesc="Power management tools."
+arch=(i686 x86_64)
+url="http://www.gnome.org/projects/gnome-power-manager/"
+license=('GPL')
+depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=(!emptydirs)
+install=gnome-power-manager.install
+groups=(gnome-extra)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('4f3d1ac121730c492803ac91bd751f625e1d2a6507232eb086e74c22781e1685')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-power-manager \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gnome-power-manager/gnome-power-manager.install b/gnome-unstable/gnome-power-manager/gnome-power-manager.install
new file mode 100644
index 000000000..6dc2e8bd5
--- /dev/null
+++ b/gnome-unstable/gnome-power-manager/gnome-power-manager.install
@@ -0,0 +1,12 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD
index 05ae4d711..6e6eb4d79 100644
--- a/gnome-unstable/gnome-settings-daemon/PKGBUILD
+++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152887 2012-03-10 15:33:04Z heftig $
+# $Id: PKGBUILD 153049 2012-03-12 01:03:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.3.91
-pkgrel=1
+pkgver=3.3.92
+pkgrel=0.1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,8 +19,8 @@ replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         systemd-fallback.patch)
-sha256sums=('78310aa753f9ed9e3440c8f98d63639adcf9ba18a11724ff72f78adb827a8fd4'
-            '29387c8176ec2f8c56060ea08865201ca9c7a27cb8ae5d93bdc4c3afe8e5516b')
+sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch b/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch
index 80f3ac4d3..da0496623 100644
--- a/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch
+++ b/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch
@@ -1,7 +1,18 @@
-diff -u -Nr gnome-settings-daemon-3.3.91/configure.ac gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac
---- gnome-settings-daemon-3.3.91/configure.ac	2012-03-05 19:13:16.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac	2012-03-10 16:20:31.417634553 +0100
-@@ -298,7 +298,7 @@
+commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
+Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+Date:   Mon Mar 12 01:52:54 2012 +0100
+
+    Fallback to CK if systemd is not available
+    
+    Be nice to distributions where systemd is optional. This will select
+    the code path at runtime depending on whether the system was booted
+    using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index 3b4789f..d522852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
                [with_systemd=$enableval],
                [with_systemd=no])
  if test "$with_systemd" = "yes" ; then
@@ -10,9 +21,10 @@ diff -u -Nr gnome-settings-daemon-3.3.91/configure.ac gnome-settings-daemon-3.3.
    AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
    SESSION_TRACKING=systemd
  else
-diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c
---- gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c	2012-02-01 20:33:14.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c	2012-03-10 16:21:35.930442794 +0100
+diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
+index 5786300..83fe21e 100644
+--- a/gnome-settings-daemon/gnome-settings-session.c
++++ b/gnome-settings-daemon/gnome-settings-session.c
 @@ -30,6 +30,7 @@
  #include "gnome-settings-session.h"
  
@@ -21,7 +33,7 @@ diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-se
  #include <systemd/sd-login.h>
  
  typedef struct
-@@ -130,10 +131,9 @@
+@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
  {
  #ifdef HAVE_SYSTEMD
          GSource                   *sd_source;
@@ -33,7 +45,7 @@ diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-se
  	gchar			*session_id;
  	GnomeSettingsSessionState state;
  };
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
          return TRUE;
  }
  
@@ -42,7 +54,7 @@ diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-se
  
  static void
  gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,35 +371,38 @@
+@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
  	g_object_unref (proxy_manager);
  }
  
@@ -56,77 +68,59 @@ diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-se
  #ifdef HAVE_SYSTEMD
 -        sd_pid_get_session (getpid(), &session->priv->session_id);
 +        session->priv->sd_source = NULL;
++
++        if (sd_booted () > 0) {
++                sd_pid_get_session (getpid(), &session->priv->session_id);
  
 -        session->priv->sd_source = sd_source_new ();
 -        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
 -        g_source_attach (session->priv->sd_source, NULL);
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
- 
--        sessions_changed (session);
--#else
--	session->priv->cancellable = g_cancellable_new ();
 +                session->priv->sd_source = sd_source_new ();
 +                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
 +                g_source_attach (session->priv->sd_source, NULL);
  
--	/* connect to ConsoleKit */
--	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--				  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--				  NULL,
--				  CONSOLEKIT_NAME,
--				  CONSOLEKIT_MANAGER_PATH,
--				  CONSOLEKIT_MANAGER_INTERFACE,
--				  session->priv->cancellable,
--				  got_manager_proxy_cb,
--				  session);
+-        sessions_changed (session);
+-#else
 +                sessions_changed (session);
-+        } else
- #endif
-+        {
-+                session->priv->cancellable = g_cancellable_new ();
-+
-+                /* connect to ConsoleKit */
-+                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+                                          NULL,
-+                                          CONSOLEKIT_NAME,
-+                                          CONSOLEKIT_MANAGER_PATH,
-+                                          CONSOLEKIT_MANAGER_INTERFACE,
-+                                          session->priv->cancellable,
-+                                          got_manager_proxy_cb,
-+                                          session);
++                return;
 +        }
++#endif
+ 	session->priv->cancellable = g_cancellable_new ();
+ 
+ 	/* connect to ConsoleKit */
+@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
+ 				  session->priv->cancellable,
+ 				  got_manager_proxy_cb,
+ 				  session);
+-#endif
  }
  
  static void
-@@ -415,14 +418,15 @@
+@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
          if (session->priv->sd_source != NULL) {
                  g_source_destroy (session->priv->sd_source);
                  g_source_unref (session->priv->sd_source);
--        }
++                goto out;
+         }
 -#else
--	g_cancellable_cancel (session->priv->cancellable);
--
--	if (session->priv->proxy_session != NULL)
--		g_object_unref (session->priv->proxy_session);
--	g_object_unref (session->priv->cancellable);
-+        } else
- #endif
-+        {
-+                g_cancellable_cancel (session->priv->cancellable);
++#endif
 +
-+                if (session->priv->proxy_session != NULL)
-+                        g_object_unref (session->priv->proxy_session);
-+                g_object_unref (session->priv->cancellable);
-+        }
+ 	g_cancellable_cancel (session->priv->cancellable);
  
+ 	if (session->priv->proxy_session != NULL)
+ 		g_object_unref (session->priv->proxy_session);
+ 	g_object_unref (session->priv->cancellable);
+-#endif
+ 
++out:
  	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
  }
-diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c
---- gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c	2012-03-05 18:27:43.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c	2012-03-10 16:20:31.417634553 +0100
-@@ -2031,7 +2031,7 @@
+ 
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 8db04e5..9883d76 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2031,7 +2031,7 @@ systemd_stop (void)
          g_object_unref (bus);
  }
  
@@ -135,7 +129,7 @@ diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome
  
  static void
  consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@
+@@ -2081,7 +2081,6 @@ consolekit_stop (void)
                             consolekit_stop_cb, NULL);
          g_object_unref (proxy);
  }
@@ -143,7 +137,7 @@ diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome
  
  static void
  upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@
+@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
                   * hibernate is not available and is marginally better
                   * than just powering down the computer mid-write */
  #ifdef HAVE_SYSTEMD
diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD
index a1667e9d5..ebd49c9ae 100644
--- a/gnome-unstable/gnome-shell/PKGBUILD
+++ b/gnome-unstable/gnome-shell/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 152964 2012-03-10 21:15:52Z ibiru $
+# $Id: PKGBUILD 153020 2012-03-11 08:53:19Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.3.90
-pkgrel=1
+pkgver=3.3.91
+pkgrel=0
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
 license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
+depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
+makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc' 'gnome-common')
 optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8411932ee860415e37ef2da55536538430dc168dbc55fe7790d6f3bc15884532')
+sha256sums=('566f78596dfd665f399c835f288dc4f42e161adc0f0a9d88f09dc72772299d2a')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  ./autogen.sh
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/gnome-unstable/gnome-system-monitor/PKGBUILD b/gnome-unstable/gnome-system-monitor/PKGBUILD
new file mode 100644
index 000000000..3cc679c9d
--- /dev/null
+++ b/gnome-unstable/gnome-system-monitor/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153000 2012-03-11 06:59:53Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-system-monitor
+pkgver=3.3.91
+pkgrel=1
+pkgdesc="A system monitor for GNOME"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
+makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
+options=(!emptydirs)
+url="http://www.gnome.org"
+groups=('gnome-extra')
+install=gnome-system-monitor.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('00d1c4bead6fc172f5a55d6f0f0606458cc7ed3df7d2eed155f285d791b71867')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
new file mode 100644
index 000000000..e2957a570
--- /dev/null
+++ b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
@@ -0,0 +1,19 @@
+pkgname=gnome-system-monitor
+
+post_install() {
+    glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/gnome-unstable/gtk-vnc/PKGBUILD b/gnome-unstable/gtk-vnc/PKGBUILD
new file mode 100644
index 000000000..84b722449
--- /dev/null
+++ b/gnome-unstable/gtk-vnc/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 152991 2012-03-11 06:25:12Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Allan McRae <mcrae_allan@hotmail.com>
+# Contributor: lp76 <l.peduto@gmail.com>
+
+pkgname=gtk-vnc
+pkgver=0.5.0
+pkgrel=1
+pkgdesc="A VNC viewer widget for GTK"
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/gtk-vnc"
+license=('LGPL')
+depends=('libgcrypt' 'gtk3')
+optdepends=('gtk2: GTK2 widget')
+makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81')
+
+build() {
+  rm -rf gtk2-build gtk3-build
+  cp -a $pkgname-$pkgver gtk2-build
+  mv $pkgname-$pkgver gtk3-build
+
+  ( cd gtk2-build
+    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --with-python --disable-static --with-gtk=2.0
+    make )
+
+  ( cd gtk3-build
+    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --with-python --with-examples --disable-static --with-gtk=3.0
+    make )
+}
+
+package() {
+  make -C gtk2-build -j1 DESTDIR="${pkgdir}" install
+  make -C gtk3-build -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/libchamplain/PKGBUILD b/gnome-unstable/libchamplain/PKGBUILD
new file mode 100644
index 000000000..408eabd91
--- /dev/null
+++ b/gnome-unstable/libchamplain/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 153051 2012-03-12 01:40:43Z heftig $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Michael Kanis <mkanis@gmx.de>
+
+pkgname=libchamplain
+pkgver=0.12.2
+pkgrel=1
+pkgdesc="Gtk3 widget for displaying rasterized maps"
+url="http://projects.gnome.org/libchamplain/"
+license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool')
+depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
+makedepends=('gobject-introspection' 'gtk-doc' 'vala')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e')
+
+build() {
+    cd $pkgname-$pkgver
+    ./configure --prefix=/usr --disable-static --disable-debug --enable-vala
+    make
+}
+
+package() {
+    cd $pkgname-$pkgver
+    make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD
new file mode 100644
index 000000000..b103b1202
--- /dev/null
+++ b/gnome-unstable/libpeas/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 152981 2012-03-11 05:54:13Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libpeas
+pkgver=1.3.0
+pkgrel=1
+pkgdesc="A GObject-based plugins engine"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('GPL2')
+depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
+makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade')
+optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
+            'seed: gobject-based plugin engine - seed runtime loader')
+options=('!libtool')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('aefff05cdd39d7a88986af54f2980034857482605e777ce5345ba3b5653fe79d')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var --enable-vala
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/libpeas/libpeas.install b/gnome-unstable/libpeas/libpeas.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/gnome-unstable/libpeas/libpeas.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/mousetweaks/PKGBUILD b/gnome-unstable/mousetweaks/PKGBUILD
new file mode 100644
index 000000000..0380f6171
--- /dev/null
+++ b/gnome-unstable/mousetweaks/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> 
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=mousetweaks
+pkgver=3.3.90
+pkgrel=1
+pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
+arch=(i686 x86_64)
+license=('GPL3' 'FDL')
+depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'intltool')
+groups=('gnome-extra')
+options=('!libtool' '!emptydirs')
+url="http://www.gnome.org"
+install=mousetweaks.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('671be293d39ce778c366d0ecda3bd8fc6123cb5655d1b2a9b688cc6c1b389706')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/mousetweaks/mousetweaks.install b/gnome-unstable/mousetweaks/mousetweaks.install
new file mode 100644
index 000000000..1ae919322
--- /dev/null
+++ b/gnome-unstable/mousetweaks/mousetweaks.install
@@ -0,0 +1,17 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall mousetweaks
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD
index 7830c5e84..20db3cd51 100644
--- a/gnome-unstable/mutter/PKGBUILD
+++ b/gnome-unstable/mutter/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 152865 2012-03-10 12:50:31Z ibiru $
+# $Id: PKGBUILD 153019 2012-03-11 08:52:45Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.3.90
-pkgrel=1
+pkgver=3.3.91
+pkgrel=0
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'gnome-doc-utils' 'gtk-doc' 'gnome-common')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4f883cdb55620c445c137540fc1991a38f4f472e18060b4c3eb1fa32827c1c44')
+sha256sums=('6a5dfa56d0f2eba5c7adefb2bc55dcb26d5915e95619499276c4b6ac6587e0d9')
 
 build() {
   cd "$pkgname-$pkgver"
+  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static \
diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD
new file mode 100644
index 000000000..3e32c0a2d
--- /dev/null
+++ b/gnome-unstable/rhythmbox/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 153026 2012-03-11 10:35:34Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=rhythmbox
+pkgver=2.96
+pkgrel=1
+pkgdesc="An iTunes-like music playback and management application"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.rhythmbox.org"
+depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3'
+         'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser')
+makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection')
+optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'brasero: cd burning')
+options=('!libtool' '!emptydirs')
+install=rhythmbox.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6')
+
+build() {
+  cd "$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/rhythmbox \
+      --localstatedir=/var --disable-static \
+      --enable-daap --enable-python \
+      --with-mdns=avahi --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/rhythmbox/rhythmbox.install b/gnome-unstable/rhythmbox/rhythmbox.install
new file mode 100644
index 000000000..e02ee2c16
--- /dev/null
+++ b/gnome-unstable/rhythmbox/rhythmbox.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/gnome-unstable/totem-plparser/PKGBUILD b/gnome-unstable/totem-plparser/PKGBUILD
new file mode 100644
index 000000000..8de853c4f
--- /dev/null
+++ b/gnome-unstable/totem-plparser/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 153038 2012-03-11 15:46:23Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=totem-plparser
+pkgver=3.2.0
+pkgrel=1
+url="http://www.gnome.org"
+pkgdesc="Totem playlist parser library"
+license=('LGPL')
+arch=(i686 x86_64)
+depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
+sha256sums=('0142ec5ee8fcc0553e8c67f4c35e0a25fc610434cde918db70cb8311899f4c7d')
+
+build() {
+  cd totem-pl-parser-$pkgver
+  ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --localstatedir=/var \
+      --disable-static
+  make
+}
+
+package(){
+  cd totem-pl-parser-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD
index 5d37acdce..10d4e0407 100644
--- a/gnome-unstable/totem/PKGBUILD
+++ b/gnome-unstable/totem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152969 2012-03-10 21:36:34Z ibiru $
+# $Id: PKGBUILD 153040 2012-03-11 16:04:17Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.3.90
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
@@ -16,8 +16,10 @@ depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plpars
 makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils'
              'libepc' 'bluez' 'vala' 'grilo')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('13e779d69a937d4c2b3087a1c90aed6cc906a4bf87c3649b498b5fda22c8d308')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        browser-plugins.ini)
+sha256sums=('13e779d69a937d4c2b3087a1c90aed6cc906a4bf87c3649b498b5fda22c8d308'
+            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -59,12 +61,15 @@ package_totem() {
 package_totem-plugin() {
   pkgdesc="Totem plugin for web browsers"
   depends=("totem=$pkgver")
+  backup=(etc/totem/browser-plugins.ini)
 
   cd "$pkgbase-$pkgver"
   make -C browser-plugin \
     plugindir=/usr/lib/mozilla/plugins \
     xptdir=/usr/lib/mozilla/plugins \
     DESTDIR="$pkgdir" install
+  
+  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
 }
diff --git a/gnome-unstable/totem/browser-plugins.ini b/gnome-unstable/totem/browser-plugins.ini
new file mode 100644
index 000000000..cf3014997
--- /dev/null
+++ b/gnome-unstable/totem/browser-plugins.ini
@@ -0,0 +1,2 @@
+[Plugins]
+application/x-shockwave-flash.disabled=true
diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD
new file mode 100644
index 000000000..7a94777c9
--- /dev/null
+++ b/gnome-unstable/vinagre/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 152993 2012-03-11 06:28:26Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Allan McRae <mcrae_allan@hotmail.com>
+# Contributor: lp76 <l.peduto@gmail.com>
+
+pkgname=vinagre
+pkgver=3.3.4
+pkgrel=1
+pkgdesc="A VNC Client for the GNOME Desktop"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/vinagre/"
+install=vinagre.install
+depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
+optdepends=('openssh: SSH plugin'
+            'rdesktop: RDP plugin')
+makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
+groups=('gnome-extra')
+options=('!emptydirs' '!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1af93ad015858531426c581caa95b76cfec5ebdd36eef2ac1128e1e9b755318e')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install
new file mode 100644
index 000000000..68158ac80
--- /dev/null
+++ b/gnome-unstable/vinagre/vinagre.install
@@ -0,0 +1,20 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.91-2) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vinagre
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD
new file mode 100644
index 000000000..c72145680
--- /dev/null
+++ b/gnome-unstable/vino/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 152989 2012-03-11 06:09:53Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=vino
+pkgver=3.3.3
+pkgrel=1
+pkgdesc="a VNC server for the GNOME desktop"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
+makedepends=('intltool' 'networkmanager')
+groups=('gnome-extra')
+url="http://www.gnome.org"
+options=(!emptydirs)
+install=vino.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ed17bbe5720e7c463d7ba648a48d860a39f9de464088cae486ed20b69576ab1c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/vino \
+      --localstatedir=/var \
+      --enable-gnome-keyring \
+      --enable-avahi \
+      --disable-http-server
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/vino/vino.install b/gnome-unstable/vino/vino.install
new file mode 100644
index 000000000..469266843
--- /dev/null
+++ b/gnome-unstable/vino/vino.install
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vino
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
author	root <root@rshg054.dnsready.net>	2012-03-13 00:01:30 +0000
committer	root <root@rshg054.dnsready.net>	2012-03-13 00:01:30 +0000
commit	217a7715291ceb935900b71bde082023bc441290 (patch)
tree	6cbfcf7d11f0bd1e412f542080ec995fc26daffd /gnome-unstable
parent	7e61bbcf6b3c8ffe6c076268044d83b446fceeab (diff)