cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update conky to 1.10.6

Browse Source 
- Remove patch submitted upstream
This commit is contained in:
Guido Falsi 2016-12-12 09:58:04 +00:00
parent 83e46fb070
commit 1760f8c459
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=428403
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/conky/Makefile
View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= conky
PORTVERSION= 1.10.5
PORTVERSION= 1.10.6
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= madpilot@FreeBSD.org

6
sysutils/conky/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1475571819
SHA256 (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 3bcf1ae93721e0575cd4ef8fd60da9e5bf1b2fbceb365fb9792f2aec6139f569
SIZE (brndnmtthws-conky-v1.10.5_GH0.tar.gz) = 365176
TIMESTAMP = 1481146772
SHA256 (brndnmtthws-conky-v1.10.6_GH0.tar.gz) = 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca
SIZE (brndnmtthws-conky-v1.10.6_GH0.tar.gz) = 365669

24
sysutils/conky/files/patch-src_freebsd.cc
View File

@ -1,24 +0,0 @@
--- src/freebsd.cc.orig 2016-10-04 07:49:19 UTC
+++ src/freebsd.cc
@@ -426,13 +426,15 @@ double get_acpi_temperature(int fd)
int temp;
(void)fd;
- if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp)) {
- fprintf(stderr,
- "Cannot read sysctl \"hw.acpi.thermal.tz0.temperature\"\n");
- return 0.0;
- }
+ if (GETSYSCTL("hw.acpi.thermal.tz0.temperature", temp) == 0)
+ return KELVTOC(temp);
+ if (GETSYSCTL("dev.cpu.0.temperature", temp) == 0)
+ return KELVTOC(temp);
+ if (GETSYSCTL("dev.amdtemp.0.core0.sensor0", temp) == 0)
+ return KELVTOC(temp);
+ fprintf(stderr, "Cannot get temperature from sysctl\n");
- return KELVTOC(temp);
+ return 0.0;
}
static void get_battery_stats(int *battime, int *batcapacity, int *batstate, int *ac) {