Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity
3,493 Commits 5 Branches 46 Tags 22 MiB
0d449029ea
Commit Graph

3493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guido Falsi
21b4a0a403 These changes are required to make it build on FreeBSD i386 (x86/32) 
Otherwise I get this error while building:

/wrkdirs/usr/ports/sysutils/conky/work/conky-1.11.1/src/core.cc:1503:50: error: assigning to 'void (*)(struct text_object *, char *, unsigned int)' from incompatible type 'void (*)(struct text_object *, char *, int)': type mismatch at 3rd parameter ('unsigned int' vs 'int')
  END OBJ(apm_adapter, 0) obj->callbacks.print = &print_apm_adapter;
                                                 ^~~~~~~~~~~~~~~~~~
/wrkdirs/usr/ports/sysutils/conky/work/conky-1.11.1/src/core.cc:1504:55: error: assigning to 'void (*)(struct text_object *, char *, unsigned int)' from incompatible type 'void (*)(struct text_object *, char *, int)': type mismatch at 3rd parameter ('unsigned int' vs 'int')
  END OBJ(apm_battery_life, 0) obj->callbacks.print = &print_apm_battery_life;
                                                      ^~~~~~~~~~~~~~~~~~~~~~~
/wrkdirs/usr/ports/sysutils/conky/work/conky-1.11.1/src/core.cc:1505:55: error: assigning to 'void (*)(struct text_object *, char *, unsigned int)' from incompatible type 'void (*)(struct text_object *, char *, int)': type mismatch at 3rd parameter ('unsigned int' vs 'int')
  END OBJ(apm_battery_time, 0) obj->callbacks.print = &print_apm_battery_time;
                                                      ^~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.
*** [src/CMakeFiles/conky.dir/core.cc.o] Error code 1
 2019-01-07 19:38:04 -05:00
Guido Falsi
a3b03f2257 Add missing return statement. 
It was removed in commit e91b91d.
 2019-01-07 19:17:14 -05:00
lasers
7eec746b82 update copyright year to 2019 2019-01-05 11:15:36 -06:00
lasers
9dd559b1e9 remove deprecated BMPx support 2019-01-04 19:58:52 -06:00
Brenden Matthews
427fa810d7 Stick to 5 concurrent Travis builds. 
Travis limits OSS projects to 5 concurrent builds. Let's cut down the
number of different build platforms to 5 to keep the build from taking
too long.

Linux toolchains:
 - GCC 5
 - GCC 8
 - LLVM 7

macOS toolchains:
 - xcode 9.4
 - xcode 10.1
 2019-01-04 17:10:23 -05:00
Brenden Matthews
aed8255804 Enable IRC support in travis build. 2019-01-04 16:46:02 -05:00
lasers
fc5413f349 github: add issues+pull requests templates 2019-01-04 15:23:47 -06:00
lasers
d2283d410f doc: remove deprecated eve variable 2019-01-04 14:44:49 -06:00
Hizkia Felix
0e35526f48 Fix broken wiki link 2019-01-04 08:47:36 -05:00
Brenden Matthews
282160156f Remove deprecated EVE online support. 
The EVE API that was in use is now deprecated and no longer works.

This resolves #732.
 2019-01-03 10:42:49 -05:00
Brenden Matthews
03f3ce7bdc Reformat CMake files. 
Applied `cmake_format`.
 2019-01-03 09:48:43 -05:00
Glenn Dixon
95a4f0e2f0 Wiki link updates 
Corrected a couple of links
 2019-01-03 09:08:07 -05:00
Brenden Matthews
3366dd091e
Update README.md 2019-01-02 20:17:09 -05:00
Brenden Matthews
12cf957d1c
Change travis badge to svg version. 2018-12-31 16:08:36 -05:00
lasers
3cf0413503 doc: declare filename entities 2018-12-31 11:02:01 -06:00
lasers
e3469c25be doc: add missing periods and other tweaks 2018-12-31 11:02:01 -06:00
lasers
3c1c74f541 doc: tidy --wrap 79 -xml -i --indent-spaces 4 2018-12-31 11:02:01 -06:00
Brenden Matthews
edb7f84ecd Fix an FD leak in APCUPSD. 
In some cases the socket FD may have not been closed in the APCUPSD
update function.

This fixes #725.
 2018-12-31 09:27:33 -05:00
Brenden Matthews
e0209632d1 Simplify travis OSX build brew command. 2018-12-28 14:16:13 -05:00
Brenden Matthews
9c98ed4119 Fix CMake code for unit test discovery. 2018-12-28 13:38:19 -05:00
Brenden Matthews
0009f2473a Drop luajit support (Lua 5.1 API). 2018-12-24 10:07:20 -05:00
Brenden Matthews
212fda5757 Remove unused reporters. 2018-12-24 09:33:38 -05:00
Brenden Matthews
6c09affaf7 Add some basic unit tests. 
Introduced the Catch2 unit testing framework.
 2018-12-24 02:02:01 -05:00
Brenden Matthews
d422aa47d2 Fix more sonar issues. 2018-12-23 15:39:05 -05:00
Brenden Matthews
3df87776d5 Fix more sonar issues. 2018-12-23 14:27:11 -05:00
Brenden Matthews
db471102bb Fix wtf file encoding. 2018-12-23 14:27:11 -05:00
Brenden Matthews
134e667cf4 Don't add C/CXX flags to themselves every time. 2018-12-23 14:27:11 -05:00
Brenden Matthews
3c5fd4399a Fix some more sonar issues. 
Run clang-7 build first so that sonar data gets reported earlier, enable nvidia
in travis builds.
 2018-12-23 14:27:11 -05:00
Brenden Matthews
9af6fa7903
Merge pull request #714 from brndnmtthws/fix-build-with-warnings-enabled 
Fix MAINTAINER_MODE (-Wall -Werror -Wpedantic).
 2018-12-22 19:59:30 -05:00
Brenden Matthews
4ef597da92
Parallelize sonar execution. 2018-12-22 19:25:00 -05:00
Brenden Matthews
8e1d3cfdd3
Apply fixes from sonar. 2018-12-22 19:10:10 -05:00
Brenden Matthews
2e6894f564
Remove ccache; it breaks the build with GCC 7 & 8. 2018-12-22 18:50:39 -05:00
Brenden Matthews
bc60fb2c2f
More build fixes. 2018-12-22 18:34:29 -05:00
Brenden Matthews
50a4aa25ab
Merge commit 'ebfbb3f6dfb68e9c4701f1068f35f4c33ff47d07' into fix-build-with-warnings-enabled 2018-12-22 16:05:36 -05:00
Brenden Matthews
ebfbb3f6df Squashed '3rdparty/toluapp/' changes from db877c5d..afe3be74 
afe3be74 Enable std c99 (#5)

git-subtree-dir: 3rdparty/toluapp
git-subtree-split: afe3be74401a5e3fa592ddc1b0c625862ea3301d
 2018-12-22 16:05:36 -05:00
Brenden Matthews
94a854cfa2
More build fixes. 2018-12-22 15:53:34 -05:00
Brenden Matthews
198cc9230a
More build fixes. 2018-12-22 15:43:40 -05:00
Brenden Matthews
d191a5fa5c
More build fixes. 2018-12-22 15:42:46 -05:00
Brenden Matthews
dfd10667fd
More build fixes, warning fixes. 2018-12-22 15:37:53 -05:00
Brenden Matthews
f0eb4a3477 Squashed '3rdparty/toluapp/' changes from 1fae7fd2..db877c5d 
db877c5d Code generation fixes. (#4)

git-subtree-dir: 3rdparty/toluapp
git-subtree-split: db877c5dd1c2750cb5521b2bd82528ba500b3666
 2018-12-22 15:27:08 -05:00
Brenden Matthews
e2b2e33f33
Merge commit 'f0eb4a34776fa30d0033a5f89aa7d7de5525ff7e' into fix-build-with-warnings-enabled 2018-12-22 15:27:08 -05:00
Brenden Matthews
5d71853ec2 Squashed '3rdparty/toluapp/' changes from e0f18471..1fae7fd2 
1fae7fd2 Merge pull request #3 from brndnmtthws/enable-std-c99
a0462958 Don't update homebrew.
d0a259d2 Enable C99, ignore unused value.

git-subtree-dir: 3rdparty/toluapp
git-subtree-split: 1fae7fd29e3cd741ec62b3c2cd1fad22ff435911
 2018-12-22 14:01:32 -05:00
Brenden Matthews
f18c43ccfb
Merge commit '5d71853ec2da0cf37480459dcb1a398e9a1e8a03' into fix-build-with-warnings-enabled 2018-12-22 14:01:32 -05:00
Brenden Matthews
d54a5aec94 Squashed '3rdparty/toluapp/' changes from 2e0e8533..e0f18471 
e0f18471 Merge pull request #2 from brndnmtthws/fix-build-with-wall-werror
572e7f59 Enable -Wall -Werror on travis build.

git-subtree-dir: 3rdparty/toluapp
git-subtree-split: e0f18471d7eed84e2916713a86e0688fb95fa48f
 2018-12-22 13:33:48 -05:00
Brenden Matthews
bb9a460293
Merge commit 'd54a5aec9449a7376949217747d62ada945f72cb' into fix-build-with-warnings-enabled 2018-12-22 13:33:48 -05:00
Brenden Matthews
5e7b1764b2
Merge branch 'master' into fix-build-with-warnings-enabled 2018-12-22 13:32:51 -05:00
Brenden Matthews
41c32bb72f
More warning fixes. 2018-12-22 13:25:32 -05:00
lasers
d8ed1e20d2 doc/lua.xml: add missing lua apis (#716) 
* doc/lua.xml: add missing lua apis

* doc/lua.xml: tidy dirty markups
 2018-12-22 12:57:41 -05:00
Brenden Matthews
8ff1d9845d
Fix sonar issues. 2018-12-22 12:45:25 -05:00
Brenden Matthews
c6ad28074a
Fix docbook2x handling. 
* Include the XML schemas/libs in the repo so we don't have to reach out to
   3rd parties
 * Fix the sed commands to work on both GNU and BSD variants
 2018-12-22 12:38:10 -05:00