Upstream patch for getting temperature from sysfs wrt #356385 by Pavel Goran.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 110 insertions, 22 deletions

diff --git a/xfce-extra/xfce4-battery-plugin/ChangeLog b/xfce-extra/xfce4-battery-plugin/ChangeLog
index a9e661417387..d79ec39c4e64 100644
--- a/xfce-extra/xfce4-battery-plugin/ChangeLog
+++ b/xfce-extra/xfce4-battery-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-battery-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.3 2011/03/13 16:28:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.4 2011/03/20 15:36:36 ssuominen Exp $
+
+*xfce4-battery-plugin-1.0.0-r1 (20 Mar 2011)
+
+  20 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-battery-plugin-1.0.0-r1.ebuild,
+  +files/xfce4-battery-plugin-1.0.0-sysfs.patch:
+  Upstream patch for getting temperature from sysfs wrt #356385 by Pavel Goran.
 
   13 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
   xfce4-battery-plugin-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index 6fd82de3f996..8b40a43503f9 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,30 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 0.5.1-2.6.24-headers.patch 422 RMD160 f8d0895dfef8b67569fcc253f2cde2330bfe89e7 SHA1 a8818bd9111dd0feca524244ca3504d8475396df SHA256 c44e0db7010b12b9de40c4072b84088761e5b1f08775445eaa6d6bbca242680d
 AUX 0.5.1-freebsd.patch 654 RMD160 fd42146bc6fd149a03a48f656c1108c5b8833b0e SHA1 28f8049c305a4f2b3aaa9ad483897083ecb15055 SHA256 750596b88e43f6bac05eaa8f63dd753d9b42a89a31063562905785555be1b919
 AUX 0.5.1-libacpi.patch 1505 RMD160 709bd01ddbbfb2bf117d0e87d0642c463676c167 SHA1 e14de88cab52ed6e6146122f9997b8b93b3a301e SHA256 1f49924a10c5e53f88912db3e63dc382052e68fdd4c1ea439771a504f5f08566
 AUX 0.5.1-sysfs.patch 8838 RMD160 3295285f56473996c168cc0a265714f134c359c2 SHA1 1573a3269045cf8baa73bf156d49bd9f3a09bdb2 SHA256 725692d98eead435099e6a27f527523d4984c792751379d7b9b501be04072e39
+AUX xfce4-battery-plugin-1.0.0-sysfs.patch 1847 RMD160 433831562377027586d7cb5d28702c389adfe7ca SHA1 79403dee1dac687087df4f83f557abb6d4f9bc8c SHA256 7fe42981006e32fc263d346f0b79bc8f0ca0133aa493e781bece5203dbc8d58e
 DIST xfce4-battery-plugin-0.5.1.tar.bz2 227940 RMD160 ee770f06226cf8dfed95892c152ae3a2a446079a SHA1 f97c1b6445c8da07c17353ae385b5fadb2fd5f1a SHA256 6b90a37d8f01d2f042679a3f3f92f08dee96510096115f52fb9210ef4cad7c61
 DIST xfce4-battery-plugin-1.0.0.tar.bz2 358338 RMD160 3fe88d5d75e8388803a7f2f65362b09e1a2e7ba0 SHA1 405723c7a28229a946339594db7f8b6a079018c0 SHA256 c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f
 EBUILD xfce4-battery-plugin-0.5.1.ebuild 967 RMD160 cf2bebe5324065e2b199e0dee8a6b08849c74aa7 SHA1 9535bce5de0ca9742f3704ef3b90d1255637411e SHA256 d71afc658a6b8007d931ab4b23a6e1f689f3b9e5c423a290495ea2ebc3699934
+EBUILD xfce4-battery-plugin-1.0.0-r1.ebuild 941 RMD160 4c6e2e2ec20e9d9d2ac783f5a9960a82836f2fa0 SHA1 7dc3527201b6e568e68159fed5cebe662f0eee6f SHA256 79d7d96d97042fa99b88eb0e87d04294279e426b439e189b88900d96181b3f71
 EBUILD xfce4-battery-plugin-1.0.0.ebuild 892 RMD160 b819900b5cb70cb9a97d924049d08d3798b3d1f7 SHA1 76f00757b8c1323698868af45edee434e79aa7d4 SHA256 ebbb90396a72e3060f589764cdf891719e6ce79893bfde0c82fdc91eea909672
-MISC ChangeLog 819 RMD160 4fd7a7a2540b8682218302daebdce04d6517589f SHA1 ffbf0eb3a3d1b8dd9e61e7a5d37e39a43f9ba51d SHA256 a4b0241571fcf6edd9f5880bb476521a3e3ee7256ec1e6554005a9ca223d6382
+MISC ChangeLog 1091 RMD160 b3d819bb10b85586b32dff644b852889fe657f66 SHA1 5e8d719638b839e2f0002d9742e83e724a2cd934 SHA256 2d6d652e2a719c1c0a77c18f8e391383b7d69f2d0d6fb9d004cb246b98363643
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNfPBRAAoJEPqDWhW0r/LC4ekP/01y+kU2PqorybZGsuJQBiYG
-/RrwWry2IuC9i9sGP2N0FdvgbuMHDeqDP3NNVCx9ELSbrgkV5ZenGeCHlW3rbxaW
-9BF7+dEC1oO7UhHR2SvN0yZlSDWHTDhT0BQcO0PexssrFpgRq5JrKeocApEXtJNS
-3TW8ltyjfZH9IpYVid89BFZjxCG0Kpwabk4BCx4vnQFUt5drmlXKNmQbcw91P/j9
-O300VG7C2TN76AYodkjDeo8/D6iQtyr/EYLJAT6gXpGro3rZSle3ZpLk9cIceADn
-KeHqn6e3D1V/Adw+pQvCJgIXawv6yL+qcpaBfnkXYzxBhgGq/9u6JiKLBmi5Pd4R
-LAgROI2JkSkbzkQd1vxQeiRm2Ie67Omx2cWkT471g0zWZmTPci+SP+TS64m8nQ5M
-O+uKW0wFIFmR0X/Rw9346kmQBa2FzfmwqlM5rjur+5TaqKHXIHfugz7appzoQp/v
-87de0mXJqFhQPzVloQ9C09gFoIiwarBYheA3YmdqG+n52zsq/DSmxq/D2v+xZAae
-Q7JY85K7qGjUOqxg4AAhxw9sKOakdAZmRvtd7L0HgG7vSFicmx9CZKsxbQCLdFRf
-TOiS3PeYoLy+nKAJhO+jdiXxlXbQslrg5rlXY4MDkqKaPL7MYH9DAz5VhAwwKSxi
-gcZnI0VTEZ8ubS3IeJfb
-=OR2z
------END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch b/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch
new file mode 100644
index 000000000000..d20680ed8d90
--- /dev/null
+++ b/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch
@@ -0,0 +1,66 @@
+From e33899de3205edfc0b2c330f43da6a4bc8141b85 Mon Sep 17 00:00:00 2001
+From: Florian Rivoal <frivoal@xfce.org>
+Date: Sat, 26 Feb 2011 13:53:09 +0000
+Subject: Add support for getting the temperature from sysfs
+
+Up to the linux kernel version 2.6.37, this information was available in
+the proc file system, but after that, it is only available from the sys
+file system.
+
+This fixes bug #7339.
+---
+diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
+index 838a760..0e368f4 100644
+--- a/panel-plugin/libacpi.c
++++ b/panel-plugin/libacpi.c
+@@ -1002,18 +1002,36 @@ const char *get_temperature(void)
+ #ifdef __linux__
+   FILE *fp;
+   char *proc_temperature="/proc/acpi/thermal_zone/*/temperature";
+-  static char *p,line[256];
+-
+-  if ( (fp=fopen_glob(proc_temperature, "r")) == NULL) return NULL;
+-  fgets(line,255,fp);
+-  fclose(fp);
+-  p=strtok(line," ");
+-  if (!p) return NULL;
+-  p=p+strlen(p)+1;
+-  while (p && *p ==' ') p++;
+-  if (*p==0) return NULL;
+-  if (strchr(p,'\n')) p=strtok(p,"\n");
+-  return (const char *)p;
++  char *sys_temperature="/sys/class/thermal/thermal_zone*/temp";
++  static char *p,*p2,line[256];
++
++  if ( (fp=fopen_glob(proc_temperature, "r")) != NULL )
++  {
++    fgets(line,255,fp);
++    fclose(fp);
++    p=strtok(line," ");
++    if (!p) return NULL;
++    p=p+strlen(p)+1;
++    while (p && *p ==' ') p++;
++    if (*p==0) return NULL;
++    if (strchr(p,'\n')) p=strtok(p,"\n");
++    return (const char *)p;
++  }
++  else if ( (fp=fopen_glob(sys_temperature, "r")) != NULL )
++  {
++    fgets(line,255,fp);
++    fclose(fp);
++    p = line;
++    if (strchr(p,'\n')) *strchr(p,'\n') = 0;
++    if (strlen(p) <= 3) return NULL;
++    p2 = p + strlen(p) - 3;
++    strcpy(p2, " C");
++    return (const char *)p;
++  }
++  else
++  {
++    return NULL;
++  }
+ #else
+ #ifdef HAVE_SYSCTL
+   static char buf[BUFSIZ];
+--
+cgit v0.8.3.4
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..32049886db2d
--- /dev/null
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild,v 1.1 2011/03/20 15:36:36 ssuominen Exp $
+
+EAPI=3
+inherit xfconf
+
+DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=xfce-base/xfce4-panel-4.3.90.2
+	>=xfce-base/libxfce4util-4.3.90.2
+	>=xfce-base/libxfcegui4-4.3.90.2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-sysfs.patch )
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+}