[arch-commits] Commit in conky/repos (3 files)

[Giovanni Scafora]

    Date: Thursday, October 15, 2009 @ 09:00:01
  Author: giovanni
Revision: 55879

Merged revisions 55875,55877 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/conky/trunk

........
  r55875 | giovanni | 2009-10-15 05:50:10 -0700 (gio, 15 ott 2009) | 2 lines
  
  upgpkg: conky 1.7.2-4
      Fixed FS16650
........
  r55877 | giovanni | 2009-10-15 05:51:37 -0700 (gio, 15 ott 2009) | 1 line
........

Modified:
  conky/repos/extra-i686/	(properties)
  conky/repos/extra-i686/PKGBUILD
Deleted:
  conky/repos/extra-i686/fix_hwmon_for_2.6.31.patch

----------------------------+
 PKGBUILD                   |    9 +++------
 fix_hwmon_for_2.6.31.patch |   36 ------------------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)


Property changes on: conky/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /conky/trunk:1-55475
   + /conky/trunk:1-55878

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-15 12:55:26 UTC (rev 55878)
+++ extra-i686/PKGBUILD	2009-10-15 13:00:01 UTC (rev 55879)
@@ -5,7 +5,7 @@
 
 pkgname=conky
 pkgver=1.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
 arch=('i686' 'x86_64')
 url="http://conky.sourceforge.net/"
@@ -14,14 +14,11 @@
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
 makedepends=('pkgconfig')
 backup=(etc/conky/conky.conf etc/conky/conky_no_x11.conf)
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        fix_hwmon_for_2.6.31.patch)
-md5sums=('cf6f5d45d42ad68c618c00271813b80d'
-         'efb3e188cd3879fc7b5af51b59d553ec')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('cf6f5d45d42ad68c618c00271813b80d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/fix_hwmon_for_2.6.31.patch || return 1
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --enable-wlan \

Deleted: extra-i686/fix_hwmon_for_2.6.31.patch
===================================================================
--- extra-i686/fix_hwmon_for_2.6.31.patch	2009-10-15 12:55:26 UTC (rev 55878)
+++ extra-i686/fix_hwmon_for_2.6.31.patch	2009-10-15 13:00:01 UTC (rev 55879)
@@ -1,36 +0,0 @@
-Horrible hack to make conky JUST compatible with the karmic kernel (2.6.31).
-See LP #435571.
-
-Index: conky-1.7.2/src/linux.c
-===================================================================
---- conky-1.7.2.orig/src/linux.c	2009-09-24 15:33:48.000000000 +0200
-+++ conky-1.7.2/src/linux.c	2009-09-24 15:37:11.000000000 +0200
-@@ -858,25 +858,14 @@
- 	}
- 
- 	if (strcmp(dir, "/sys/class/hwmon/") == 0) {
--		if (*buf) {
--			/* buf holds result from get_first_file_in_a_directory() above,
--			 * e.g. "hwmon0" -- append "/device" */
--			strcat(buf, "/device");
--		} else {
-+	  if (!(*buf)) {
- 			/* dev holds device number N as a string,
--			 * e.g. "0", -- convert to "hwmon0/device" */
--			sprintf(buf, "hwmon%s/device", dev);
-+			 * e.g. "0", -- convert to "hwmon0" */
-+			sprintf(buf, "hwmon%s", dev);
- 			dev = buf;
- 		}
- 	}
- 
--	/* At least the acpitz hwmon doesn't have a 'device' subdir,
--	 * so check it's existence and strip it from buf otherwise. */
--	snprintf(path, 255, "%s%s", dir, dev);
--	if (stat(path, &st)) {
--		buf[strlen(buf) - 7] = 0;
--	}
--
- 	/* change vol to in, tempf to temp */
- 	if (strcmp(type, "vol") == 0) {
- 		type = "in";