Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Add patch implementing missing function for FreeBSD, already proposed upstream: brndnmtthws/conky#1252 - Updated dependencies, upstream changed its documentation build method Old html documentation has been removed, the information is now encoded in yaml files. Upstream code does not provide a method to automatically produce human readable documentation from the yaml files, so I install those directly in PORTDOCS.
- Loading branch information
1 parent
e46dc1d
commit cf75f45
Showing
7 changed files
with
61 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1663601049 | ||
SHA256 (brndnmtthws-conky-v1.13.1_GH0.tar.gz) = f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a | ||
SIZE (brndnmtthws-conky-v1.13.1_GH0.tar.gz) = 2443276 | ||
TIMESTAMP = 1665603150 | ||
SHA256 (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964 | ||
SIZE (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 1797564 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- doc/CMakeLists.txt.orig 2022-10-12 18:18:08 UTC | ||
+++ doc/CMakeLists.txt | ||
@@ -32,7 +32,7 @@ if(BUILD_DOCS) | ||
) | ||
add_dependencies(conky.1 man.md) | ||
|
||
- set(MAN_PATH "share/man/man1") | ||
+ set(MAN_PATH "man/man1") | ||
set(MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/conky.1) | ||
|
||
install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH}) |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
--- src/freebsd.cc.orig 2022-10-12 18:18:08 UTC | ||
+++ src/freebsd.cc | ||
@@ -460,6 +460,27 @@ int get_battery_perct(const char *) { | ||
return batcapacity; | ||
} | ||
|
||
+void get_battery_power_draw(char *buffer, unsigned int n, const char *bat) { | ||
+ int rate = 0; | ||
+ double ret = 0; | ||
+ | ||
+ /* | ||
+ * hw.acpi.battery.rate returns battery discharge rate in mW, | ||
+ * or -1 (according to docs, but also 0 in practice) when not discharging. | ||
+ * | ||
+ * ref. acpi_battery(4) | ||
+ */ | ||
+ if (GETSYSCTL("hw.acpi.battery.rate", rate)) { | ||
+ fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.rate\"\n"); | ||
+ } | ||
+ | ||
+ if (rate > 0) { | ||
+ ret = (double)rate/(double)1000; | ||
+ } | ||
+ | ||
+ snprintf(buffer, n, "%.1f", ret); | ||
+} | ||
+ | ||
double get_battery_perct_bar(struct text_object *obj) { | ||
int batperct = get_battery_perct(obj->data.s); | ||
return batperct; |