1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-10-01 22:49:09 +00:00
Commit Graph

4270 Commits

Author SHA1 Message Date
Simon Lees
4119af0ffe cmake: use full path rather then relative.
Co-authored-by: Brenden Matthews <github@brenden.brndn.io>
2024-03-11 16:08:32 -04:00
Simon Lees
8800c645f2 Fix Memory Leak 2024-03-11 16:08:32 -04:00
Simon Lees
304e4f3823 Swap to internal C++ logging.h
Along with some other minor merge / C++ fixes.`
2024-03-11 16:08:32 -04:00
Simon Lees
96337be28f Split cairo_draw_image into two functions
In some cases you are already working with a cairo_t and know
your destination image size, this adds an API that allows you
to handle these cases more easily. Along with now being able to
draw images with an alpha level. It also leaves the original API
unchanged.
2024-03-11 16:08:32 -04:00
Simon Lees
2ade1e292b lua-imlib2: Add missing logging.h file 2024-03-11 16:08:32 -04:00
Simon Lees
99406d7a83 lua-imlib2: Fix typo in the docs. 2024-03-11 16:08:32 -04:00
Simon Lees
b79d465ed3 lua-imlib2: move to conky style logging
Unfortunately we can't use logging.h directly from conky as its
in C++ and lua bindings only have access to a C compiler.

Instead we now have a very simple C implementation of logging.h to
use within the bindings.

This change also adds NULL checks to catch some extra invalid
states
2024-03-11 16:08:32 -04:00
Simon Lees
78a38db342 lua-imlib2: Add cairo_imlib2_helper to docs. 2024-03-11 16:08:32 -04:00
Simon Lees
2e54b29450 lua-imlib2: Fix alpha mask so that its scaled
Previously if the source image was a different to the displayed
image the alpha channel was incorrect, as it wasn't scaled leading
to a series of artifacts.
2024-03-11 16:08:32 -04:00
Simon Lees
01ca581259 lua-imlib2: Implement Stride in a standard way 2024-03-11 16:08:32 -04:00
Simon Lees
3397155da4 lua-imlib2: Improve Error handling
Each of the following cases cause large numbers of cryptic imlib2
prints, so detect them and print a single error for each.
2024-03-11 16:08:32 -04:00
Brenden Matthews
755e8c3e10 Fix regression in lua_load path handling
This should resolve #1778 (and similar issues).
2024-03-10 09:57:58 -04:00
Brenden Matthews
26384446fa Just ignore homebrew return code 2024-03-09 18:25:22 -05:00
Brenden Matthews
34edbe45d9 This too 2024-03-09 18:25:22 -05:00
Brenden Matthews
06d1d21ae2 Use --force with brew install, block upgrades 2024-03-09 18:25:22 -05:00
Brenden Matthews
11a823afa9
Update README.md 2024-03-09 07:18:16 -05:00
Brenden Matthews
f02cb2ad07 Actually that won't work 2024-03-08 18:58:21 -05:00
Brenden Matthews
85056408ce This is duplicated 2024-03-08 18:58:21 -05:00
Brenden Matthews
e22e081aee Fix bad imlib2 typedefs for imlib<1.10
This should (properly) resolve #1743.
2024-03-08 18:58:21 -05:00
Brenden Matthews
d0783eb244
Update install instructions, fix Lua link 2024-03-08 18:53:25 -05:00
Brenden Matthews
7cd11c676d Updated flake per https://github.com/NixOS/nix/issues/5532
`nix flake check` no longer returns warnings.
2024-03-08 18:48:51 -05:00
Brenden Matthews
998f7ff14d Bump web deps, fix lint 2024-03-04 13:29:50 -05:00
Livanh
ee42a51006 Re-define text_object.data.l as "int64_t" 2024-03-04 08:18:19 -05:00
Livanh
4571c7f5d8 Define text_object.data.l as "long long"
This ensures that text_object.data.l is at least 64 bits in size,
even in a 32-bit environment. It can cause issues if smaller,
such as text turning black instead of a desired color (see #1477).
2024-03-04 08:18:19 -05:00
Brenden Matthews
0cfd5c0a31
Bump version 2024-03-03 09:25:37 -05:00
Brenden Matthews
585b1061ed Reorder these 2024-03-01 09:11:58 -05:00
Brenden Matthews
679065c0f6 This too 2024-03-01 09:11:58 -05:00
Brenden Matthews
10e1e4bc9d Add/use clang 15 on ubuntu builds 2024-03-01 09:11:58 -05:00
Brenden Matthews
ddb0d70708 Rotate appimage signing key 2024-02-29 10:29:58 -05:00
Stavros Ntentos
4d57ec6e67 actions/checkout@v4: with: fetch-depth: 0
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Stavros Ntentos
2f0e7eb109 git describe --tags --always --debug??
https://github.com/brndnmtthws/conky/actions/runs/8097991410/job/22130348973?pr=1761#step:6:5
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Stavros Ntentos
2f851665fd Download in pwd, not in artifacts/
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Stavros Ntentos
d5471c1f82 Allow visibility in >> $GITHUB_ENVs
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Stavros Ntentos
de5e25567a Try harder to ignore duplicate conky.1.gzs
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
d77a5a8e39 Underp this derp 2024-02-29 10:22:08 -05:00
Stavros Ntentos
e7aeed4ebb D'oh! We need tags to git describe
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
0daa51d970 Refactor this 2024-02-29 10:22:08 -05:00
Stavros Ntentos
b8edc07638 Ubuntu 20.04 clang+library-versions typo
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
9f69ab21b3 Make sure correct libc++ is installed 2024-02-29 10:22:08 -05:00
Stavros Ntentos
bb417dfd72 Missed .sha256 extension
Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
9f9640ded8 Check librsvg version before enabling 2024-02-29 10:22:08 -05:00
Stavros Ntentos
1876a56d95 jobs.<job_id>.strategy.fail-fast = false
Ubuntu 22.04 should theoretically build cleanly; let's see it

Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
6a0d42af73 Include arch in appimage name 2024-02-29 10:22:08 -05:00
Brenden Matthews
f6c8b60f83 Fix clang versions 2024-02-29 10:22:08 -05:00
Brenden Matthews
c20ca4cbca Typo 2024-02-29 10:22:08 -05:00
Brenden Matthews
6af39252ed Only sign appimage if the signing key is available 2024-02-29 10:22:08 -05:00
Brenden Matthews
8173e037d4 Build appimage on PRs 2024-02-29 10:22:08 -05:00
Stavros Ntentos
5b23276296 Build AppImage separately per OS
Different OS'es have different `GLIBC_X.XX` versions.

While installing extra libraries is of course maybe necessary,
it is next-to-impossible (AFAIU) to install/compliment a diffent
`GLIBC_X.XX` on non-flexible OSes such as Debian, Ubuntu, etc.

If AppImage is unable to hide those differences,
then we must diversify if we want to support a wider base.

Fixes: https://github.com/brndnmtthws/conky/issues/1142
Fixes: https://github.com/brndnmtthws/conky/issues/1717

... and probably others.

Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>
2024-02-29 10:22:08 -05:00
Brenden Matthews
40638d125e
Add missing deps 2024-02-28 21:05:54 -05:00
Brenden Matthews
73d90d5976 Enable wayland in appimage build
This resolves #1759.
2024-02-28 20:23:50 -05:00