[arch-commits] Commit in devicekit-power/repos (4 files)

Jan de Groot jgc at archlinux.org
Wed Oct 21 10:10:50 UTC 2009


    Date: Wednesday, October 21, 2009 @ 06:10:49
  Author: jgc
Revision: 56290

Merged revisions 56289 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/devicekit-power/trunk

........
  r56289 | jgc | 2009-10-21 12:10:35 +0200 (Wed, 21 Oct 2009) | 4 lines
  
  upgpkg: devicekit-power 012-2
      Fix hibernate
  Fix battery recall data for some laptops
  Add dependency on pm-utils
........

Added:
  devicekit-power/repos/extra-x86_64/fix-hibernate.patch
    (from rev 56289, devicekit-power/trunk/fix-hibernate.patch)
  devicekit-power/repos/extra-x86_64/fix-recall.patch
    (from rev 56289, devicekit-power/trunk/fix-recall.patch)
Modified:
  devicekit-power/repos/extra-x86_64/	(properties)
  devicekit-power/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   14 ++++++++++----
 fix-hibernate.patch |   21 +++++++++++++++++++++
 fix-recall.patch    |   26 ++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)


Property changes on: devicekit-power/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /devicekit-power/trunk:1-56105
   + /devicekit-power/trunk:1-56289

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-21 10:10:35 UTC (rev 56289)
+++ extra-x86_64/PKGBUILD	2009-10-21 10:10:49 UTC (rev 56290)
@@ -4,20 +4,26 @@
 
 pkgname=devicekit-power
 pkgver=012
-pkgrel=1
+pkgrel=2
 pkgdesc="DeviceKit-power is an abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/DeviceKit"
 license=('GPL')
-depends=('udev>=146' 'libusb>=0.1.12' 'polkit>=0.94')
+depends=('udev>=146' 'libusb>=0.1.12' 'polkit>=0.94' 'pm-utils')
 makedepends=('gtk-doc' 'pkgconfig' 'intltool' 'docbook-xsl')
 replaces=('devicekit')
 options=('!emptydirs' '!libtool')
-source=("http://hal.freedesktop.org/releases/DeviceKit-power-${pkgver}.tar.gz")
-md5sums=('34b8d698658cce77050443125fa9fab4')
+source=(http://hal.freedesktop.org/releases/DeviceKit-power-${pkgver}.tar.gz
+        fix-hibernate.patch
+        fix-recall.patch)
+md5sums=('34b8d698658cce77050443125fa9fab4'
+         'a519e25412404d472e1d48f23dccebed'
+         '4b43f53622f71ebe922bf3db3c881515')
 
 build() {
   cd "${srcdir}/DeviceKit-power-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-hibernate.patch" || return 1
+  patch -Np1 -i "${srcdir}/fix-recall.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/DeviceKit --disable-static || return 1
   make || return 1

Copied: devicekit-power/repos/extra-x86_64/fix-hibernate.patch (from rev 56289, devicekit-power/trunk/fix-hibernate.patch)
===================================================================
--- extra-x86_64/fix-hibernate.patch	                        (rev 0)
+++ extra-x86_64/fix-hibernate.patch	2009-10-21 10:10:49 UTC (rev 56290)
@@ -0,0 +1,21 @@
+From 390c5b3aeb3d07ff6de3594fd08370e43b43c652 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Wed, 21 Oct 2009 08:26:48 +0000
+Subject: Fix a trivial copy-paste error that broke hibernate for a lot of people
+
+---
+diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
+index 20e65f8..eb16a63 100644
+--- a/src/dkp-daemon.c
++++ b/src/dkp-daemon.c
+@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
+ 	}
+ 
+ 	/* encrypted swap? */
+-	if (!daemon->priv->hibernate_has_encrypted_swap) {
++	if (daemon->priv->hibernate_has_encrypted_swap) {
+ 		error = g_error_new (DKP_DAEMON_ERROR,
+ 				     DKP_DAEMON_ERROR_GENERAL,
+ 				     "Swap space is encrypted");
+--
+cgit v0.8.2

Copied: devicekit-power/repos/extra-x86_64/fix-recall.patch (from rev 56289, devicekit-power/trunk/fix-recall.patch)
===================================================================
--- extra-x86_64/fix-recall.patch	                        (rev 0)
+++ extra-x86_64/fix-recall.patch	2009-10-21 10:10:49 UTC (rev 56290)
@@ -0,0 +1,26 @@
+From 54f37398c06fa2573aa6e734dd65ea87751ec3b1 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Wed, 14 Oct 2009 11:20:58 +0000
+Subject: Bug 24262 – incorrect battery recall warning for Lenovo T61
+
+According to
+http://www-307.ibm.com/pc/support/site.wss/document.do?sitestyle=lenovo&lndocid=BATT-LENOVO
+
+the Sony batteris are only recalled on some particular models.
+---
+diff --git a/rules/95-devkit-power-battery-recall-ibm.rules b/rules/95-devkit-power-battery-recall-ibm.rules
+index ecff4fb..ad3800a 100644
+--- a/rules/95-devkit-power-battery-recall-ibm.rules
++++ b/rules/95-devkit-power-battery-recall-ibm.rules
+@@ -16,6 +16,9 @@ ATTR{type}!="Battery", GOTO="dkp_battery_recall_ibm_end"
+ # only match correct manufacturer
+ ATTR{manufacturer}!="SONY", GOTO="dkp_battery_recall_ibm_end"
+ 
++# only recalled on some particular models
++ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="dkp_battery_recall_ibm_end"
++
+ ATTR{model_name}=="92P1072", ENV{DKP_RECALL_NOTICE}="1"
+ ATTR{model_name}=="92P1073", ENV{DKP_RECALL_NOTICE}="1"
+ ATTR{model_name}=="92P1088", ENV{DKP_RECALL_NOTICE}="1"
+--
+cgit v0.8.2




More information about the arch-commits mailing list