Sat Sep 10 23:14:36 UTC 2011

3 files changed, 46 insertions, 21 deletions

diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
index d151c85c7..8b1ff95ad 100644
--- a/gnome-unstable/gdm/PKGBUILD
+++ b/gnome-unstable/gdm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 137518 2011-09-08 14:13:16Z ibiru $
+# $Id: PKGBUILD 137581 2011-09-09 22:14:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
-pkgver=3.1.90
-pkgrel=4
+pkgver=3.1.91
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,22 +17,20 @@ install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         fix_external_program_directories.patch
         gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam
-        fix-consolekit-registration.patch)
-sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
-            'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb'
+        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+sha256sums=('a9163b711f9cdd005b872575226dd97e06b3eb5e34369aae905e96677e682ef2'
+            '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
             'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
             '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
             'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
-            '405d82ad12ea6371ddc031e7d86e5d2ade6fe054bebbfaf24c89ac0a85fcef1c')
+            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
-  patch -Np1 -i "${srcdir}/fix-consolekit-registration.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm \
@@ -57,5 +55,6 @@ package() {
   install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
 
   chmod 1770 "${pkgdir}/var/log/gdm"
+  chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf"
   rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
 }
diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch
index ce55b1d20..b74530dd2 100644
--- a/gnome-unstable/gdm/fix_external_program_directories.patch
+++ b/gnome-unstable/gdm/fix_external_program_directories.patch
@@ -1,6 +1,6 @@
-diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
---- gdm-3.1.90.orig/daemon/gdm-server.c	2011-09-02 13:13:16.132989960 +0000
-+++ gdm-3.1.90/daemon/gdm-server.c	2011-09-03 08:00:30.007431483 +0000
+diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c
+--- gdm-3.1.91.orig/daemon/gdm-server.c	2011-09-09 21:58:06.586838200 +0000
++++ gdm-3.1.91/daemon/gdm-server.c	2011-09-09 21:58:14.583578916 +0000
 @@ -131,7 +131,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -10,19 +10,19 @@ diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.1.90.orig/data/gdm-shell.session.in gdm-3.1.90/data/gdm-shell.session.in
---- gdm-3.1.90.orig/data/gdm-shell.session.in	2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/data/gdm-shell.session.in	2011-09-03 08:01:06.721067234 +0000
+diff -Nur gdm-3.1.91.orig/data/gdm-shell.session.in gdm-3.1.91/data/gdm-shell.session.in
+--- gdm-3.1.91.orig/data/gdm-shell.session.in	2011-09-09 21:58:06.613505113 +0000
++++ gdm-3.1.91/data/gdm-shell.session.in	2011-09-09 21:59:00.300668930 +0000
 @@ -1,5 +1,5 @@
  [GNOME Session]
  Name=Display Manager
  RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && @libexecdir@/gnome-session-check-accelerated"
-+IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && /usr/lib/gnome-session/gnome-session-check-accelerated"
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated
  FallbackSession=gdm-fallback
-diff -Nur gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c	2011-09-03 08:00:30.010764843 +0000
+diff -Nur gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-09 21:58:06.613505113 +0000
++++ gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c	2011-09-09 21:58:14.583578916 +0000
 @@ -131,7 +131,7 @@
          ret = FALSE;
  
diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD
new file mode 100644
index 000000000..9d6ec4b39
--- /dev/null
+++ b/gnome-unstable/json-glib/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 137563 2011-09-09 14:19:59Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=json-glib
+pkgver=0.13.90
+pkgrel=1
+pkgdesc="JSON library built on GLib"
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/JsonGlib"
+license=('GPL')
+depends=('glib2')
+makedepends=('gobject-introspection')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9014919ed26da0765f8b784d9b604d963b77922db388d29bf08fb3beced8d7ff')
+
+build(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}