1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-06 05:17:57 +00:00
Commit Graph

3537 Commits

Author SHA1 Message Date
Monsterovich
fc250d8047 fix spaces 2019-02-25 17:11:14 -05:00
Monsterovich
af99a203f8 Added docs 2019-02-25 17:11:14 -05:00
Monsterovich
3893146995 Added option to disable redraw on desktop change 2019-02-25 17:11:14 -05:00
lasers
3ee6b4fda4 make changes to default theme 2019-02-25 15:14:07 -06:00
Brenden Matthews
ddce0580c2
Apply d0d8930c5d for base image too, derp. 2019-02-25 16:10:51 -05:00
Brenden Matthews
d0d8930c5d Only push images if dockerfiles changed. 2019-02-25 16:06:16 -05:00
Brenden Matthews
c5adfcd7e6 FreeBSD build: increase lock delay for pkg install. 2019-02-25 15:24:03 -05:00
Brenden Matthews
520827bc8a Fix docker image cache handling. 2019-02-25 13:40:05 -05:00
Brenden Matthews
483105ee35
Remove sonarcloud, add GitLab badges.
Out with the old, in with the new.
2019-02-25 13:28:56 -05:00
Brenden Matthews
40a438be3e FreeBSD fixes, GitLab CI build improvements.
- use sccache for build caching
 - add coverage reports as build artifacts
 - add lcov-summary for coverage summary
 - clean up/refactor CI yaml

This resolves the FreeBSD part of #754.
2019-02-25 11:22:19 -05:00
Brenden Matthews
7b89d84f42 Enable tests on travis build. 2019-02-25 01:14:16 -05:00
Brenden Matthews
ef003a6491 Move key decryption to before_deploy. 2019-02-24 13:15:48 -05:00
Brenden Matthews
08f7cf0605 Refactor gitlab CI. 2019-02-24 12:33:34 -05:00
Brenden Matthews
f29da158cc
Add retry to gitlab jobs. 2019-02-24 09:55:30 -05:00
Brenden Matthews
dc35a1b0a8 Add more build envs to GitLab CI.
Adding:

 - clang-8
 - gcc-5 through gcc-8
 - fedora & centos builds

Fixing:
 - mysqlclient default search path
 - build on centos6
2019-02-24 09:46:45 -05:00
Brenden Matthews
46abd3b75a Apply fixes from clang-tidy/format. 2019-02-23 17:13:19 -05:00
Brenden Matthews
90673cf161 Make GitLab build work with clang checks. 2019-02-23 17:13:19 -05:00
Brenden Matthews
0ea4559f30
Set clang CC/CXX env vars in gitlab build. 2019-02-22 22:03:05 -05:00
Brenden Matthews
7b60d77538
Fix gitlab syntax. 2019-02-22 21:57:58 -05:00
Brenden Matthews
ed1d6eb8fd
Add gitlab CI. 2019-02-22 21:57:10 -05:00
Brenden Matthews
b3db652f4b
Add builder dockerfile. 2019-02-22 21:51:48 -05:00
Brenden Matthews
bc29814fec
Bump version. 2019-02-22 21:51:32 -05:00
Brenden Matthews
89316a620f
Use appimagetool to generate final appimage. 2019-02-22 21:12:15 -05:00
Brenden Matthews
79383ab7fa
Specify appimage signing key ID. 2019-02-22 20:58:17 -05:00
Brenden Matthews
9d5bc64c23
Fix key import command. 2019-02-22 20:55:45 -05:00
Brenden Matthews
e13bd4a1fd
Revert "Don't bother cleaning up temp dir on appimage build."
This reverts commit 96cdd3b5d5.
2019-02-22 20:45:05 -05:00
Brenden Matthews
96cdd3b5d5
Don't bother cleaning up temp dir on appimage build. 2019-02-22 20:25:07 -05:00
Brenden Matthews
4ae019386b
Derp, fix it for real. 2019-02-22 19:39:21 -05:00
Brenden Matthews
1a932bd736
Actually fix appimage signing. 2019-02-22 19:24:30 -05:00
Brenden Matthews
31a0096879
Fix key signing path. 2019-02-22 19:05:27 -05:00
Brenden Matthews
c9c6126df8
App public key for signing appimage. 2019-02-22 18:46:03 -05:00
Brenden Matthews
2e029e8720 Add appimage signing key. 2019-02-22 18:43:00 -05:00
Brenden Matthews
25acfe51cc Refactor Dockerfile. 2019-02-21 09:21:22 -05:00
Qu Wenruo
14e3b80c45 conky: Allow hwmon command to accept hwmon device name
[PROBLEM]
Some hwmon device number may change due to module load sequence.
E.g:
One boot would cause the following layout:
hwmon0->acpitz
hwmon1->pch_skylake
hwmon2->thinkpad
hwmon3->coretemp
hwmon4->iwlwifi

While another boot could lead to:
hwmon0->acpitz
hwmon1->pch_skylake
hwmon2->coretemp
hwmon3->thinkpad
hwmon4->iwlwifi

[ENHANCEMENT]
This patch will enhance the hwmon command to accept hwmon device name as
first parameter instead of number.

Now "hwmon 3 temp 1" can be converted to "hwmon coretemp temp 1", which
is more readable and user won't ever need to bother the hwmon sequence
number change.

Signed-off-by: Qu Wenruo <wqu@suse.com>
2019-02-17 09:24:15 -05:00
Brenden Matthews
846c25b28b
Include versioned tags in builds. 2019-01-24 12:50:19 -05:00
Brenden Matthews
1fc2b17eb5 FreeBSD build fix. 2019-01-13 12:45:20 -05:00
Brenden Matthews
298eb76434 Include missing FreeBSD header. 2019-01-12 11:50:50 -05:00
Brenden Matthews
eb9d72f2af
Fix logo path in readme. 2019-01-09 11:14:26 -05:00
Brenden Matthews
aa2de72541 Fix build with BUILD_BUILTIN_CONFIG=OFF. 2019-01-09 09:42:54 -05:00
Brenden Matthews
e834782ddb Build fix for x86 arch.
size_t is unsigned long on x86-64, but not x86.

This fixes #759.
2019-01-09 08:18:07 -05:00
Brenden Matthews
8feae589dc Install libconky_core, too, if wanted.
If someone decides to install the testing build, it doesn't include
libconky_core.

This fixes #756.
2019-01-08 20:02:53 -05:00
Brenden Matthews
14af88ddbd Add AppImage integration. 2019-01-08 19:44:24 -05:00
Brenden Matthews
fcc315f28f
Bump version for next release. 2019-01-08 10:23:15 -05:00
Brenden Matthews
6a7dc0cd65 Fix update_total_processes() missing return val. 2019-01-07 20:26:24 -05:00
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