1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Commit Graph

3371 Commits

Author SHA1 Message Date
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
Brenden Matthews
45b4c80ec2
Fix compiler warnings. 2018-12-20 21:20:43 -05:00
Brenden Matthews
e92c224e07
Build fixes. 2018-12-20 20:50:18 -05:00
Brenden Matthews
4fc4128ffa Squashed '3rdparty/toluapp/' content from commit 2e0e8533
git-subtree-dir: 3rdparty/toluapp
git-subtree-split: 2e0e8533a56405df26ebf15735cb8b81f23d0990
2018-12-20 20:48:35 -05:00
Brenden Matthews
234633f975 Merge commit '4fc4128ffad24e09dac5477a4b6b7c37985ee4d9' as '3rdparty/toluapp' 2018-12-20 20:48:35 -05:00
Brenden Matthews
4b36d526a3
Get build working with -Wall.
Enable `MAINTAINER_MODE` on travis builds.
2018-12-20 20:48:13 -05:00
Brenden Matthews
bb8723dd36
Add toluapp subtree (#712)
* First commit!

* Import to git

* Droping down CMake requirement

* Corrected installation of libraries

* Adding travis build

* Updated cmake macros

* Fixed find package

* Updated travis hook

* Updated travis hook

* Patch to support Lua 5.3.

* Fix Lua header include directives in tolua++.h

Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers.

As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble.

But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers.

Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first.

See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195

* Remove email notifications.

* Update travis build.

* Build shared and static libs.

* Patch toluapp to support Lua 5.3.

With this change, support for Lua 5.1 is dropped.

This resolve #116.

* Add some comments to clarify the toluapp handling.

* Add minor sonar fix.
2018-12-20 15:18:51 -05:00
Brenden Matthews
3a3092902e
Get rid of silly if (not ... exp. (#713)
* Get rid of silly `if (not ...` exp.

* Apply code fixes from sonar.

* Build fix.

* Apply more fixes from sonar.

* Apply more fixes from sonar.

* Apply more fixes from sonar.
2018-12-20 10:22:08 -05:00
Brenden Matthews
fef29a5f8e
Fix yaml syntax. 2018-12-19 13:31:22 -05:00
Brenden Matthews
2c816b1392
Build fix for older GCC versions. (#710)
Add some older OS versions to the build matrix to make sure we don't
inadvertantly break the build.

This resolves issue #708.
2018-12-19 11:11:24 -05:00
Brenden Matthews
37c3c9f1e9
Enable ccache for travis builds. (#711) 2018-12-19 10:40:26 -05:00
Brenden Matthews
616d3af655
Fix loading of Lua shared libs. (#707)
A previous change in 5b541b4 (to replace unsafe string functions with
safer equivalents) made a change which broke loading of shared libs.

The cause is a miscalculation of string length before executing a
strncpy(). The calculating did not account for the null character.

This resolves #705.
2018-12-17 11:21:12 -05:00
Brenden Matthews
bf1fd144da
Bump version for next release. 2018-12-16 15:26:24 -05:00
lasers
7cec37e009 conky.cc: fix short_units = False 2018-12-16 11:16:51 -06:00
lasers
dfdd573043 Revert "conky.cc: Fix for https://github.com/brndnmtthws/conky/issues/352 (#540)"
This reverts commit fa5e56720f.
2018-12-16 11:16:51 -06:00
Brenden Matthews
7cdeeae6d9
Fix Dockerfile formatting. 2018-12-15 12:56:56 -05:00
Brenden Matthews
9660c142a6
Update dockerfile. 2018-12-15 12:52:17 -05:00
Brenden Matthews
81a56410b4
Remove old NEWS. 2018-12-15 12:05:44 -05:00
Brenden Matthews
5ec8f4a9e0
Remove old ChangeLog. 2018-12-15 12:05:12 -05:00
Brenden Matthews
6fb392c032
Remove TODO. 2018-12-15 12:04:38 -05:00
npyl
e71a2ff448
Update conky.cc (#701)
In favor of #699
2018-12-15 17:29:40 +02:00
Brenden Matthews
a0d4393826
Fix nvidia crash (resolves #520). (#698)
* Fix XShape handling.
 * Fix crash when XDamage is disabled.
 * Make sure the nvidia COOLER target is available before trying to pull
 attribute values.
 * Check the nvidia extension is actually available.
 * Check that the display is valid.
2018-12-09 20:14:08 -05:00
Brenden Matthews
155563a446
Update default config. 2018-12-09 17:35:45 -05:00