1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 12:10:31 +00:00
Commit Graph

4369 Commits

Author SHA1 Message Date
Fernando Apesteguía
c635df8689
Fix build with specific option combination (#1918)
Fixes incorrect member accessing left behind after #1910.
2024-05-15 18:18:11 +00:00
Tin Švagelj
2d50767216
Remove _member_access from geometry (#1910)
* It was difficult/too costly ensuring temporary this was correct when vecs contained in rects were accessed directly.
* Added semantics to `rect` and some utility functions.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-13 20:08:27 +00:00
Brenden Matthews
968fc7fcbc Group all actions dependabot updates 2024-05-13 14:38:55 -04:00
dependabot[bot]
488df948a9 build(deps): bump DeterminateSystems/nix-installer-action from 10 to 11
Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 10 to 11.
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v10...v11)

---
updated-dependencies:
- dependency-name: DeterminateSystems/nix-installer-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-13 14:28:30 -04:00
dependabot[bot]
5fe8cdd5be build(deps): bump DeterminateSystems/magic-nix-cache-action from 4 to 6
Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 4 to 6.
- [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases)
- [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v4...v6)

---
updated-dependencies:
- dependency-name: DeterminateSystems/magic-nix-cache-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-13 14:23:21 -04:00
Brenden Matthews
4636f4e3a5 Fix dockerhub login 2024-05-13 14:21:19 -04:00
Tin Švagelj
46afeaeef1 Comment out Vc installation
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-13 14:15:25 -04:00
Vincent Cheng
495c1c38b2 Disable Vc_ENABLE_INSTALL by default 2024-05-13 14:15:25 -04:00
Brenden Matthews
71d02514e7
Refactor the CMake 3rdparty/Vc-related bits (#1903)
* Include the 3rdparty/ dir from top-level
 * Set includes/libs at top-level
 * Remove the inner CMake version requirement
 * Fix deprecated use of CMake's exec_program()
2024-05-13 11:53:28 +00:00
Brenden Matthews
49a43e4c98 Bump version 2024-05-11 14:42:26 -04:00
Tin Švagelj
6bf383cf78
Introduce geometry primitives (#1862)
* Introduce geometry primitives based on Vc
* Apply geometry primitives to some existing code

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-07 20:02:47 +00:00
Tin Švagelj
f5b7106088
Enable use of HTML in docs (#1900)
Fix alignment documentation:
- while it renders fine on the web, it's stripped from man pages.
  Inline HTML renders fine in some cases, but tables don't.

There's no unified (remark) plugin that works well with headless
tables pandoc supports as well, so the only way to achieve a similar
effect is to leave header cells empty.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-06 18:51:19 +00:00
Brenden Matthews
a03f0bc562 Fix typo 2024-05-02 15:14:48 -04:00
Brenden Matthews
89e8fe580e Move docker build to separate script for less jank 2024-05-02 15:09:45 -04:00
Brenden Matthews
2578be2447 Try to fix this quote handling again
Unsure why this works but it does 🤷‍♂️
2024-05-02 14:43:59 -04:00
Brenden Matthews
a5cc142bba Fix this env var handling (derp) 2024-05-02 14:17:26 -04:00
Brenden Matthews
6a248a94d2 Docker: improve tagging, distinguish main and latest
* Use `latest` for the latest release
 * Use `main` (or the branch) for the latest dev builds against a branch
 * Tag releases with their version
 * Only push when building against `main` branch
 * Only build amd64 images on PRs for speedier builds
 * Separate main/PR caches
2024-05-02 14:00:15 -04:00
Brenden Matthews
9dfc7318f9 Bump minor version 2024-05-02 13:23:43 -04:00
Brenden Matthews
8ba6cf625c Docker: use 64bit time packages 2024-05-02 13:21:55 -04:00
Brenden Matthews
35d72314d2 Docker: re-enable PR builds 2024-05-02 13:21:55 -04:00
Brenden Matthews
a533bcb8e4 Docker: updated base image to Ubuntu 24.04 LTS
This allows us to drop the CMake compliation step, which should speed up
image build times significantly.
2024-05-02 13:21:55 -04:00
Brenden Matthews
28a63989ab shared_ptr::unique() deprecated, use use_count()
unique() was deprecated in C++17, replace it with use_count(). We don't
need to worry about a race condition here.
2024-05-02 09:52:30 -04:00
Brenden Matthews
71ff774a44 Ensure we use correct LLVM in nix dev shell 2024-05-02 08:32:38 -04:00
Brenden Matthews
1352c28d1b Change debug message level 2024-05-02 08:32:22 -04:00
Brenden Matthews
d6a6aadc5c Add BUILD_COLOUR_NAME_MAP build flag
You can now specify `BUILD_COLOUR_NAME_MAP=OFF` to disable building the
gperf-based colour map, which also removes the requirement for gperf at
build time.
2024-05-02 08:32:22 -04:00
Brenden Matthews
6008bd7923 Fix AppImage version naming
The version should match what Conky itself outputs.
2024-05-01 15:03:31 -04:00
Brenden Matthews
fe5552f3a8 Use MODULE library type for Lua libs
Per the docs at
https://cmake.org/cmake/help/latest/command/add_library.html, we should
use `MODULE` rather than `SHARED` for the Lua libraries.

This mostly affects macOS, where the libraries are compiled as MH_DYLIB
(`.dylib`) rather than MH_BUNDLE (`.so`).
2024-05-01 15:03:14 -04:00
Brenden Matthews
8aa7116e5f Make sure the git command is run from the source dir 2024-05-01 15:02:58 -04:00
Brenden Matthews
e8fd689b92 Make version string semver compliant, add git sha
Per https://semver.org/, use `-pre` rather than `_pre` version postfix,
and include the git short commit hash in the version string.
2024-05-01 15:02:58 -04:00
Brenden Matthews
d8c8fd3de5 CLI: -V now displays a short version string
* -v shows the full version output with build details
 * -V (capital V) shows only the short version string
2024-05-01 14:44:28 -04:00
Brenden Matthews
17bc14f5fb Update nix flake w/ LLVM 18 2024-05-01 14:11:49 -04:00
Tin Švagelj
7b44b2a27b
Update DPI when changed in resource manager (#1878)
* Update xft_dpi on property change
  * Added fallback calculation when Xft is disabled.
* Removed display_width/height and replaced it with workarea for
  consistency.
* Make DPI work on X11 when Xft is disabled
* Make find_subwindow more specific, rename it

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-05-01 14:55:05 +00:00
Tin Švagelj
384bbed0df
Use _NET_VIRTUAL_ROOTS for querying virtual roots (#1875)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 20:59:28 +00:00
Tin Švagelj
e1f301354b
Remove dpi scaling of maximum width (#1877)
* Fix dpi scaling maximum_width setting
* Set workspace dimensions from WL output_geometry
* Append script parent dir to lua package.path
* Fix issues with dpi_scale function selection
* Re-implement rounding through `type_traits` generically

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 20:21:39 +00:00
Tin Švagelj
b486263b27
Use private mapping from provided shm_pool buffer (#1876)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 16:14:34 +00:00
Tin Švagelj
f3f53fd764
Fix conky-cairo_imlib2_helper dependency conditions (#1874)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-30 15:17:44 +00:00
Brenden Matthews
bbc6193014 Docker: Add gperf, enable Lua Cairo Xlib bindings 2024-04-28 18:41:41 -04:00
Brenden Matthews
10045ab9f1 Require gperf at build-time
Rather than allowing the build to continue without gperf, we should
fail with an error so that the colour behaviour does not change in a
backward incompatible manner. The old colour behaviour should continue
to work going forward.

This resolves #1868.
2024-04-28 18:27:34 -04:00
Brenden Matthews
777b9a8dd7 Simplify binary include handling (and fix build) 2024-04-28 16:50:15 -04:00
Brenden Matthews
ef3ed8c1dc Include these when linting 2024-04-28 15:22:59 -04:00
Brenden Matthews
7598b89960 Disable -Wregister on gperf output
Older versions of gperf use the `register` keyword which is deprecated
in C++17, and warnings are treated as errors.

This disables the warning on gperf's output (colour-names.hh). I also
renamed `colour-names.cc` -> `colour-names.hh` because we're including
it as a header, not compiling it separately.

This resolves #1865.
2024-04-28 15:22:59 -04:00
Brenden Matthews
b6b9b3666e Enable cURL, RSS on mac build, lint codeql.yml 2024-04-25 20:13:02 -04:00
Brenden Matthews
e686a5f991 Set RELEASE=ON only when it's a release 2024-04-25 20:13:02 -04:00
Brenden Matthews
e93819b2ea Print appimage version for visibility 2024-04-25 20:13:02 -04:00
Brenden Matthews
e2147bd5d7 Re-enable RSS in AppImage, also enable in Nix flake
The behaviour of the RSS flag changed in 4936c74, previously it would
enable cURL support when it was switched on, but now you must pass both
BUILD_RSS=ON and BUILD_CURL=ON to CMake at configure time.

This fixes #1861.
2024-04-25 20:13:02 -04:00
Tin Švagelj
71c4e6ea52
Fix bad query_x11_windows early returns (#1864)
* Fix bad early returns
* Prevent fallback tree traversal from propagation code

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-26 00:09:20 +00:00
Brenden Matthews
0821c25533 This span doesn't need to exist 2024-04-24 17:01:38 -04:00
Brenden Matthews
3d62277edd Fix type def, handle error case 2024-04-24 17:01:38 -04:00
Brenden Matthews
4c2969778b Link to latest commit in web footer 2024-04-24 17:01:38 -04:00
Brenden Matthews
224c5ebd72 Explicitly note updated time is UTC 2024-04-24 15:17:29 -04:00