[arch-commits] CVS update of extra/kde/kdeutils (3 files)

[Tobias Powalowski]

    Date: Monday, October 15, 2007 @ 08:06:17
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdeutils

   Added: fix-hibernate.patch (1.1)
Modified: PKGBUILD (1.43 -> 1.44) klaptopdaemon.patch (1.1 -> 1.2)

upgpkg: update to new version


---------------------+
 PKGBUILD            |   19 ++++++++++---------
 fix-hibernate.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 klaptopdaemon.patch |    4 ++--
 3 files changed, 55 insertions(+), 11 deletions(-)


Index: extra/kde/kdeutils/PKGBUILD
diff -u extra/kde/kdeutils/PKGBUILD:1.43 extra/kde/kdeutils/PKGBUILD:1.44
--- extra/kde/kdeutils/PKGBUILD:1.43	Tue Jul 31 20:56:38 2007
+++ extra/kde/kdeutils/PKGBUILD	Mon Oct 15 08:06:14 2007
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD,v 1.43 2007/08/01 00:56:38 travis Exp $
+# $Id: PKGBUILD,v 1.44 2007/10/15 12:06:14 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdeutils
-pkgver=3.5.7
-kdever=3.5.7 # if minor 0, then without .0
-pkgrel=2
+pkgver=3.5.8
+kdever=3.5.8 # if minor 0, then without .0
+pkgrel=1
 pkgdesc="KDE General Utilities."
 arch=(i686 x86_64)
 url="http://www.kde.org"
 license=('GPL')
 groups=('kde')
-depends=('kdelibs>=3.5.7' 'libxss' 'libxtst' 'python>=2.5' 'gmp' 'net-snmp>=5.4' 'mtools' 'dosfstools' 'tpctl' 'zip' 'unzip' 'unrar')
+depends=('kdelibs>=3.5.8' 'libxss' 'libxtst' 'python>=2.5' 'gmp' 'net-snmp>=5.4' 'mtools' 'dosfstools' 'tpctl' 'zip' 'unzip' 'unrar')
 
 # for easier build, just uncomment the mirror you want to use
   mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
 # mirror="ftp.kde.org/pub/kde/"             # main server
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
 
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2 xmms-dynamic.patch klaptopdaemon.patch)
+source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2 xmms-dynamic.patch klaptopdaemon.patch fix-hibernate.patch)
 
 build() {
   # Source the QT and KDE profile
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt.sh 
   [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
-  # remove static xmms depend
   cd $startdir/src/$pkgname-$pkgver/superkaramba/src
   patch -Np0 -i ../../../xmms-dynamic.patch || return 1
   # start building
   cd $startdir/src/$pkgname-$pkgver
   patch -Np1 -i ../klaptopdaemon.patch || return 1
+  patch -Np0 -i ../fix-hibernate.patch || return 1
   make -f admin/Makefile.common
   ./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking \
   --enable-gcc-hidden-visibility --enable-final DO_NOT_COMPILE="ksim"
@@ -36,6 +36,7 @@
   make || return 1
   make DESTDIR=$startdir/pkg install || return 1
 }
-md5sums=('5f167f53bdbf0b8c71c2d0f0ff7593fd'
+md5sums=('d1a0fcc83f35428a76cf7523a04ba19c'
          'b076e916c251d26384d53cffafa10afa'
-         '565e1cd0d669b4ba1f92260cbf9908a7')
+         'a4bb82591964e74c2e7c754e70ffa998'
+         '4071a9d553ac1ff2c7b5f64652b49cf0')
Index: extra/kde/kdeutils/fix-hibernate.patch
diff -u /dev/null extra/kde/kdeutils/fix-hibernate.patch:1.1
--- /dev/null	Mon Oct 15 08:06:16 2007
+++ extra/kde/kdeutils/fix-hibernate.patch	Mon Oct 15 08:06:16 2007
@@ -0,0 +1,43 @@
+--- ./klaptopdaemon/portable.cpp.old	2007-05-14 11:40:45.000000000 +0400
++++ ./klaptopdaemon/portable.cpp	2007-08-14 01:52:30.775790879 +0400
+@@ -690,15 +690,16 @@ has_acpi_sleep(int state) 
+ 		mask = 0;
+ 
+ 		QFile p("/sys/power/state");
+-		QFile f("/proc/acpi/sleep");
+ 
+ 		if (p.open(IO_ReadOnly)) {
++			QTextStream stream(&p);
+ 			QString l;
+-			p.readLine(l,500);
++			l = stream.readLine();
++
+ 			QStringList ll = QStringList::split(' ',l,false);
+ 			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
+ 				QString s = *i;
+-				
++
+ 				if (s.compare("standby")==0)
+ 				mask |= (1<<1);
+ 				else if (s.compare("mem")==0)
+@@ -708,20 +709,6 @@ has_acpi_sleep(int state) 
+ 			}
+ 			p.close();
+ 		}
+-		else if (f.open(IO_ReadOnly)) {
+-			QString l;
+-			f.readLine(l, 500);
+-			QStringList ll = QStringList::split(' ',l,false);
+-			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
+-				QString s = *i;
+-				if (s[0] == 'S') {
+-					int c = s[1].digitValue();
+-					if (c >= 0 && c <= 9)
+-						mask |= 1<<c;
+-				}
+-			}
+-			f.close();
+-		}
+ 	}
+ 	return((mask&acpi_sleep_enabled&(1<<state)) != 0);
+ }
Index: extra/kde/kdeutils/klaptopdaemon.patch
diff -u extra/kde/kdeutils/klaptopdaemon.patch:1.1 extra/kde/kdeutils/klaptopdaemon.patch:1.2
--- extra/kde/kdeutils/klaptopdaemon.patch:1.1	Sun May 27 04:32:19 2007
+++ extra/kde/kdeutils/klaptopdaemon.patch	Mon Oct 15 08:06:17 2007
@@ -2,11 +2,11 @@
 --- kdeutils-3.5.7/klaptopdaemon/Makefile.am	2007-05-14 09:40:45.000000000 +0200
 +++ kdeutils-3.5.7-p/klaptopdaemon/Makefile.am	2007-05-26 16:27:01.000000000 +0200
 @@ -9,7 +9,7 @@
- 
+
  MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
  kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
 -kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
 +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_XEXT) $(LIB_XSS) -lXtst
- kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) libkcmlaptop.la
+ kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
  
  klaptop_acpi_helper_SOURCES = acpi_helper.cpp