Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
authorDominik Stadler <centic@gentoo.org>2004-05-01 12:39:29 +0000
committerDominik Stadler <centic@gentoo.org>2004-05-01 12:39:29 +0000
commit76ab698d67ec23deb57ed6aa4d8a5c1fcb0370cd (patch)
treeba7f6e615c8f270ab20d880c36f009b0515ef50d /app-misc
parentMarked as stable on x86/amd64 (diff)
downloadhistorical-76ab698d67ec23deb57ed6aa4d8a5c1fcb0370cd.tar.gz
historical-76ab698d67ec23deb57ed6aa4d8a5c1fcb0370cd.tar.bz2
historical-76ab698d67ec23deb57ed6aa4d8a5c1fcb0370cd.zip
Add patch to fix invalid scaling, see Bug 41611.
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/ksensors/ChangeLog10
-rw-r--r--app-misc/ksensors/Manifest7
-rw-r--r--app-misc/ksensors/files/digest-ksensors-0.7.2-r11
-rw-r--r--app-misc/ksensors/files/ksensors-0.7.2-scaling.diff56
-rw-r--r--app-misc/ksensors/ksensors-0.7.2-r1.ebuild27
-rw-r--r--app-misc/ksensors/ksensors-0.7.2.ebuild5
6 files changed, 102 insertions, 4 deletions
diff --git a/app-misc/ksensors/ChangeLog b/app-misc/ksensors/ChangeLog
index 19760f946e8b..3a5034b50730 100644
--- a/app-misc/ksensors/ChangeLog
+++ b/app-misc/ksensors/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-misc/ksensors
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ksensors/ChangeLog,v 1.7 2004/04/12 01:02:33 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ksensors/ChangeLog,v 1.8 2004/05/01 12:39:29 centic Exp $
+
+*ksensors-0.7.2-r1 (01 May 2004)
+
+ 01 May 2004; Dominik Stadler <centic@gentoo.org>
+ +files/ksensors-0.7.2-scaling.diff, +ksensors-0.7.2-r1.ebuild,
+ ksensors-0.7.2.ebuild:
+ Add patch to fix scaling, thanks to harmgeerts@hotmail.com for the fix in Bug
+ 41611
12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> ksensors-0.7.2.ebuild:
marked ~amd64
diff --git a/app-misc/ksensors/Manifest b/app-misc/ksensors/Manifest
index 2bff9f325994..47e0c2239a87 100644
--- a/app-misc/ksensors/Manifest
+++ b/app-misc/ksensors/Manifest
@@ -1,5 +1,8 @@
-MD5 a51f7d2e3001185b6d3b099bf2cb9ff4 ChangeLog 907
-MD5 313086c6f1bbd2d19cc80d6fc28e2b72 ksensors-0.7.2.ebuild 583
+MD5 79004fb0201ded0cddbbbe8280f1ae27 ChangeLog 1168
+MD5 7f841f9b0986d6ee45ea217e8cd7eff9 ksensors-0.7.2.ebuild 598
MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 b416a7161ff2e7051ded60911e716cc4 ksensors-0.7.2-r1.ebuild 640
MD5 7e219e54436163ee72f99d92a157215a files/digest-ksensors-0.7.2 66
MD5 5735dac5885bda1ec14e3015ad47f87a files/startupcrash.diff 618
+MD5 7e219e54436163ee72f99d92a157215a files/digest-ksensors-0.7.2-r1 66
+MD5 8c18772cb6400af497858e0c7f9658ec files/ksensors-0.7.2-scaling.diff 2085
diff --git a/app-misc/ksensors/files/digest-ksensors-0.7.2-r1 b/app-misc/ksensors/files/digest-ksensors-0.7.2-r1
new file mode 100644
index 000000000000..337a6bdddcff
--- /dev/null
+++ b/app-misc/ksensors/files/digest-ksensors-0.7.2-r1
@@ -0,0 +1 @@
+MD5 e54e706ea240a162377a17b85715ad62 ksensors-0.7.2.tar.gz 739244
diff --git a/app-misc/ksensors/files/ksensors-0.7.2-scaling.diff b/app-misc/ksensors/files/ksensors-0.7.2-scaling.diff
new file mode 100644
index 000000000000..055d3d55bbab
--- /dev/null
+++ b/app-misc/ksensors/files/ksensors-0.7.2-scaling.diff
@@ -0,0 +1,56 @@
+diff -aur ksensors-0.7.2.old/ksensors/cpupanel.cpp ksensors-0.7.2/ksensors/cpupanel.cpp
+--- ksensors-0.7.2.old/ksensors/cpupanel.cpp 2002-05-24 22:50:14.000000000 +0200
++++ ksensors-0.7.2/ksensors/cpupanel.cpp 2004-03-07 19:24:51.000000000 +0100
+@@ -38,7 +38,7 @@
+ ptr= strchr(buffer,':');
+ if(ptr) {
+ value= (const char *)(ptr+2);
+- value.stripWhiteSpace();
++ value= value.stripWhiteSpace();
+ }
+ result= true;
+ break;
+diff -aur ksensors-0.7.2.old/ksensors/lmsensorpanel.cpp ksensors-0.7.2/ksensors/lmsensorpanel.cpp
+--- ksensors-0.7.2.old/ksensors/lmsensorpanel.cpp 2003-02-18 00:41:41.000000000 +0100
++++ ksensors-0.7.2/ksensors/lmsensorpanel.cpp 2004-03-07 19:25:17.000000000 +0100
+@@ -51,8 +51,8 @@
+ }
+ switch( sensor->getTempScale() )
+ {
+- case Sensor::dgKelvin: valMask= "%0.fK"; break;
+- default : valMask= "%0.f^"; break;
++ case Sensor::dgKelvin: valMask= "%.1fK"; break;
++ default : valMask= "%.1f^"; break;
+ }
+ break;
+
+@@ -63,7 +63,7 @@
+ arc->setValueMaxLimit( sensor->getValueMax(),0);
+ arc->setColorRanges(red,green,green);
+ }
+- valMask= "%0.f RPM";
++ valMask= "%.0f RPM";
+ break;
+
+ case Sensor::lmVoltage :
+@@ -76,7 +76,7 @@
+ arc->setColorRanges(blue,QColor(0,200,150),blue);
+ arc->setArrowColor(darkBlue);
+ }
+- valMask= "%0.2fv";
++ valMask= "%.2fv";
+ break;
+
+ }
+diff -aur ksensors-0.7.2.old/ksensors/lmsensor.cpp ksensors-0.7.2/ksensors/lmsensor.cpp
+--- ksensors-0.7.2.old/ksensors/lmsensor.cpp 2003-02-18 00:04:59.000000000 +0100
++++ ksensors-0.7.2/ksensors/lmsensor.cpp 2004-03-13 17:20:17.000000000 +0100
+@@ -69,7 +69,7 @@
+ bool valid= false;
+ while( (*data= sensors_get_all_features(*chip_name, nr1, nr2)) && (*data)->mapping!=SENSORS_NO_MAPPING) {
+ str= (*data)->name;
+- if(str.find("_min")>=0) {
++ if(str.find("_min")>=0 || str.find("_low")>=0) {
+ sensors_get_feature(*chip_name, (*data)->number, &valMin);
+ valid= true;
+ } else
diff --git a/app-misc/ksensors/ksensors-0.7.2-r1.ebuild b/app-misc/ksensors/ksensors-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..0308e5b37126
--- /dev/null
+++ b/app-misc/ksensors/ksensors-0.7.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ksensors/ksensors-0.7.2-r1.ebuild,v 1.1 2004/05/01 12:39:29 centic Exp $
+
+inherit kde
+need-kde 3.0
+
+DESCRIPTION="KSensors - a nice lm_sensors frontend for KDE"
+SRC_URI="mirror://sourceforge/ksensors/${P}.tar.gz"
+HOMEPAGE="http://ksensors.sourceforge.net/"
+
+newdepend ">=sys-apps/lm-sensors-2.6.3
+ >=kde-base/kdebase-3.0"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+SLOT="0"
+
+src_unpack()
+{
+ kde_src_unpack
+ cd ${S}
+ rm -f config.cache
+ epatch ${FILESDIR}/${P}-scaling.diff
+}
diff --git a/app-misc/ksensors/ksensors-0.7.2.ebuild b/app-misc/ksensors/ksensors-0.7.2.ebuild
index e11b9ecae366..b4386cba85cc 100644
--- a/app-misc/ksensors/ksensors-0.7.2.ebuild
+++ b/app-misc/ksensors/ksensors-0.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ksensors/ksensors-0.7.2.ebuild,v 1.4 2004/04/12 01:02:33 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ksensors/ksensors-0.7.2.ebuild,v 1.5 2004/05/01 12:39:29 centic Exp $
inherit kde
need-kde 3.0
@@ -15,6 +15,9 @@ newdepend ">=sys-apps/lm-sensors-2.6.3
LICENSE="GPL-2"
KEYWORDS="x86 ~amd64"
+IUSE=""
+SLOT="0"
+
src_unpack()
{
kde_src_unpack