[arch-commits] Commit in gnome-power-manager/repos (3 files)

Jan de Groot jgc at archlinux.org
Sat Jun 13 09:19:34 EDT 2009


    Date: Saturday, June 13, 2009 @ 09:19:34
  Author: jgc
Revision: 42381

Merged revisions 42380 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-power-manager/trunk

........
  r42380 | jgc | 2009-06-13 15:19:18 +0200 (Sat, 13 Jun 2009) | 1 line
  
  upgpkg: gnome-power-manager 2.26.2-1
........

Modified:
  gnome-power-manager/repos/extra-x86_64/	(properties)
  gnome-power-manager/repos/extra-x86_64/PKGBUILD
Deleted:
  gnome-power-manager/repos/extra-x86_64/gpm-fix-nongnome.patch

------------------------+
 PKGBUILD               |   13 +++++--------
 gpm-fix-nongnome.patch |   11 -----------
 2 files changed, 5 insertions(+), 19 deletions(-)


Property changes on: gnome-power-manager/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-power-manager/trunk:1-38498
   + /gnome-power-manager/trunk:1-42380

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-13 13:19:18 UTC (rev 42380)
+++ extra-x86_64/PKGBUILD	2009-06-13 13:19:34 UTC (rev 42381)
@@ -2,26 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=2.26.1
-pkgrel=2
+pkgver=2.26.2
+pkgrel=1
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
 arch=(i686 x86_64)
 url="http://www.gnome.org/projects/gnome-power-manager/"
 license=('GPL')
-depends=('libnotify>=0.4.5' 'libunique>=1.0.8' 'libcanberra>=0.11' 'policykit-gnome>=0.9.2' 'hicolor-icon-theme' 'devicekit-power' 'libglade>=2.6.4' 'gnome-keyring>=2.26.1')
+depends=('libnotify>=0.4.5' 'libunique>=1.0.8' 'libcanberra>=0.11' 'policykit-gnome>=0.9.2' 'hicolor-icon-theme' 'devicekit-power>=008' 'libglade>=2.6.4' 'gnome-keyring>=2.26.1')
 makedepends=('gettext' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0' 'gnome-panel>=2.26.0')
 optdepends=('gnome-panel')
 options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.26/${pkgname}-${pkgver}.tar.bz2
-	gpm-fix-nongnome.patch)
-md5sums=('8b0130316601c972683797935646982f'
-	 '35c555735374bf61989f9bf485d4eee5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fa1e3f7c9075542ca383072187d54bcc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gpm-fix-nongnome.patch" || return 1
   export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var \

Deleted: extra-x86_64/gpm-fix-nongnome.patch
===================================================================
--- extra-x86_64/gpm-fix-nongnome.patch	2009-06-13 13:19:18 UTC (rev 42380)
+++ extra-x86_64/gpm-fix-nongnome.patch	2009-06-13 13:19:34 UTC (rev 42381)
@@ -1,11 +0,0 @@
---- gnome-power-manager-2.26.1/src/gpm-session.c	2009-04-21 12:43:38.000000000 +0200
-+++ gnome-power-manager-2.26.1/src/gpm-session.c	2009-05-08 21:45:43.000000000 +0200
-@@ -254,6 +254,8 @@
- 	DBusGConnection *connection;
- 
- 	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
-+	if (session->priv->proxy == NULL)
-+		return FALSE;
- 
- 	/* find out if this change altered the inhibited state */
- 	ret = dbus_g_proxy_call (session->priv->proxy, "RegisterClient", &error,



More information about the arch-commits mailing list