[arch-commits] Commit in polkit/trunk (PKGBUILD polkit-git-fixes.patch)

[Jan de Groot]

    Date: Wednesday, September 15, 2010 @ 10:26:53
  Author: jgc
Revision: 90717

upgpkg: polkit 0.98-1
Update to 0.98 plus some patches from git

Added:
  polkit/trunk/polkit-git-fixes.patch
Modified:
  polkit/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   23 +++++++-----
 polkit-git-fixes.patch |   85 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-15 14:12:05 UTC (rev 90716)
+++ PKGBUILD	2010-09-15 14:26:53 UTC (rev 90717)
@@ -2,28 +2,33 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=polkit
-pkgver=0.96
-pkgrel=2
+pkgver=0.98
+pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('eggdbus>=0.6' 'pam')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
+depends=('glib2>=2.25.15' 'pam' 'expat>=2.0.1')
+makedepends=('intltool>=0.41.1' 'gtk-doc>=1.15' 'gobject-introspection>=0.9.5')
 replaces=('policykit')
 options=('!libtool')
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        polkit-git-fixes.patch
         polkit.pam)
-md5sums=('e0a06da501b04ed3bab986a9df5b5aa2'
+md5sums=('96e583a1177ba5436f034a2fee55f5fa'
+         'c5aaa13d6eeda5cec224b273acba9420'
          '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/polkit-git-fixes.patch"
+  libtoolize --force
+  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --disable-static --enable-gtk-doc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --disable-static --enable-gtk-doc
+  make
+  make DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1" || return 1
+  install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1"
 }

Added: polkit-git-fixes.patch
===================================================================
--- polkit-git-fixes.patch	                        (rev 0)
+++ polkit-git-fixes.patch	2010-09-15 14:26:53 UTC (rev 90717)
@@ -0,0 +1,85 @@
+diff --git a/src/polkit/polkitcheckauthorizationflags.h b/src/polkit/polkitcheckauthorizationflags.h
+index 94aa070..4baa0d1 100644
+--- a/src/polkit/polkitcheckauthorizationflags.h
++++ b/src/polkit/polkitcheckauthorizationflags.h
+@@ -30,10 +30,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-GType polkit_check_authorization_flags_get_type (void) G_GNUC_CONST;
+-
+-#define POLKIT_TYPE_CHECK_AUTHORIZATION_FLAGS (polkit_check_authorization_flags_get_type ())
+-
+ /**
+  * PolkitCheckAuthorizationFlags:
+  * @POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE: No flags set.
+diff --git a/src/polkit/polkiterror.h b/src/polkit/polkiterror.h
+index b31583d..e49cabf 100644
+--- a/src/polkit/polkiterror.h
++++ b/src/polkit/polkiterror.h
+@@ -40,10 +40,6 @@ G_BEGIN_DECLS
+ 
+ GQuark polkit_error_quark (void);
+ 
+-GType polkit_error_get_type (void) G_GNUC_CONST;
+-
+-#define POLKIT_TYPE_ERROR (polkit_error_get_type ())
+-
+ /**
+  * PolkitError:
+  * @POLKIT_ERROR_FAILED: The operation failed.
+diff --git a/src/polkit/polkitimplicitauthorization.h b/src/polkit/polkitimplicitauthorization.h
+index 9e5c51c..dee2611 100644
+--- a/src/polkit/polkitimplicitauthorization.h
++++ b/src/polkit/polkitimplicitauthorization.h
+@@ -30,10 +30,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-GType polkit_implicit_authorization_get_type (void) G_GNUC_CONST;
+-
+-#define POLKIT_TYPE_IMPLICIT_AUTHORIZATION (polkit_implicit_authorization_get_type ())
+-
+ /**
+  * PolkitImplicitAuthorization:
+  * @POLKIT_IMPLICIT_AUTHORIZATION_UNKNOWN: Unknown whether the subject is authorized, never returned in any public API.
+diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
+index d2fc9c8..96ffd7c 100644
+--- a/src/polkitagent/Makefile.am
++++ b/src/polkitagent/Makefile.am
+@@ -46,6 +46,7 @@ libpolkit_agent_1includedir=$(includedir)/polkit-1/polkitagent
+ 
+ libpolkit_agent_1include_HEADERS =                        				\
+ 	polkitagent.h									\
++	polkitagentenumtypes.h								\
+ 	polkitagenttypes.h								\
+ 	polkitagentsession.h								\
+ 	polkitagentlistener.h								\
+diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
+index d4495dd..8f0c878 100644
+--- a/src/polkitagent/polkitagenthelperprivate.c
++++ b/src/polkitagent/polkitagenthelperprivate.c
+@@ -48,8 +48,8 @@ _polkit_clearenv (void)
+ gboolean
+ send_dbus_message (const char *cookie, const char *user)
+ {
+-  PolkitAuthority *authority;
+-  PolkitIdentity *identity;
++  PolkitAuthority *authority = NULL;
++  PolkitIdentity *identity = NULL;
+   GError *error;
+   gboolean ret;
+ 
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
+index e91ad84..495f752 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor.c
+@@ -116,7 +116,7 @@ static gboolean
+ ensure_database (PolkitBackendSessionMonitor  *monitor,
+                  GError                      **error)
+ {
+-  gboolean ret;
++  gboolean ret = FALSE;
+ 
+   if (monitor->database != NULL)
+     {