[arch-commits] Commit in consolekit/repos (3 files)

[Jan de Groot]

    Date: Wednesday, October 21, 2009 @ 14:38:10
  Author: jgc
Revision: 56365

Merged revisions 56200 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/consolekit/trunk

........
  r56200 | jgc | 2009-10-20 10:59:30 +0200 (Tue, 20 Oct 2009) | 2 lines
  
  upgpkg: consolekit 0.4.1-1
      Update to 0.4.1
........

Modified:
  consolekit/repos/extra-i686/	(properties)
  consolekit/repos/extra-i686/PKGBUILD
Deleted:
  consolekit/repos/extra-i686/small-fixes.patch

-------------------+
 PKGBUILD          |   13 +++++--------
 small-fixes.patch |   47 -----------------------------------------------
 2 files changed, 5 insertions(+), 55 deletions(-)


Property changes on: consolekit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /consolekit/trunk:1-54721
   + /consolekit/trunk:1-56364

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-21 18:37:00 UTC (rev 56364)
+++ extra-i686/PKGBUILD	2009-10-21 18:38:10 UTC (rev 56365)
@@ -3,25 +3,22 @@
 # Contributor: onestep_ua <onestep at ukr.net>
 
 pkgname=consolekit
-pkgver=0.3.1
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license=('GPL')
-depends=('polkit>=0.93' 'zlib' 'libx11>=1.2.2')
+depends=('polkit>=0.94' 'zlib' 'libx11>=1.2.2')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck
-        small-fixes.patch)
-md5sums=('3ee89345f610c462806aaaae9a997683'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '2ebf16e49fa4c954e89561147219dfdb')
+        pam-foreground-compat.ck)
+md5sums=('48eda4483cc97841d5f88e8e003eb6d7'
+         'a8a4de71d9b0549b8143e5f6c2a36fc7')
 
 build() {
   cd "${srcdir}/ConsoleKit-${pkgver}"
-  patch -Np1 -i "${srcdir}/small-fixes.patch" || return 1
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var \

Deleted: extra-i686/small-fixes.patch
===================================================================
--- extra-i686/small-fixes.patch	2009-10-21 18:37:00 UTC (rev 56364)
+++ extra-i686/small-fixes.patch	2009-10-21 18:38:10 UTC (rev 56365)
@@ -1,47 +0,0 @@
-diff -up ConsoleKit-0.3.1/src/ck-manager.c.small-fixes ConsoleKit-0.3.1/src/ck-manager.c
---- ConsoleKit-0.3.1/src/ck-manager.c.small-fixes	2009-07-31 22:32:32.382848777 -0400
-+++ ConsoleKit-0.3.1/src/ck-manager.c	2009-07-31 22:34:55.159597733 -0400
-@@ -810,12 +810,9 @@ check_polkit_permissions (CkManager     
-                           AuthorizedCallback     callback)
- {
-         const char    *sender;
--        GError        *error;
-         PolkitSubject *subject;
-         AuthorizedCallbackData *data;
- 
--        error = NULL;
--
-         g_debug ("constructing polkit data");
- 
-         /* Check that caller is privileged */
-@@ -837,6 +834,7 @@ check_polkit_permissions (CkManager     
-                                               NULL,
-                                               (GAsyncReadyCallback)auth_ready_callback,
-                                               data);
-+        g_object_unref (subject);
- }
- 
- static void
-@@ -873,14 +871,12 @@ get_polkit_permissions (CkManager   *man
- {
-         const char    *sender;
-         PolkitSubject *subject;
--        GError *error;
- 
-         g_debug ("get permissions for action %s", action);
- 
-         sender = dbus_g_method_get_sender (context);
-         subject = polkit_system_bus_name_new (sender);
- 
--        error = NULL;
-         polkit_authority_check_authorization (manager->priv->pol_ctx,
-                                               subject,
-                                               action,
-@@ -890,7 +886,6 @@ get_polkit_permissions (CkManager   *man
-                                               (GAsyncReadyCallback) ready_cb,
-                                               context);
-         g_object_unref (subject);
--
- }
- #endif
-