1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 04:02:15 +00:00
Commit Graph

297 Commits

Author SHA1 Message Date
Tin Švagelj
5ee7bd1185
Add compiler cache and fix CMake deprecation warnings (#2132)
- Fix use of deprecated `exec_program`.
- Reformat 'UninstallConky.cmake.in' file.
- Separate BUILD_TESTS (now BUILD_TESTING to shadow CTest variable) from
  MAINTAINER_MODE flag.
  - Remove BUILD_TESTS flag from CI, default it already true.
- Add support for (s)ccache, enable it by default.
- Add REPRODUCIBLE_BUILD to disable (s)ccache default.
  - Set REPRODUCIBLE_BUILD=ON in nix flake.
- Add sccache to CI.
- Add CI detection for possible future use, stored in ENV_IS_CI variable.
- Minor formatting tweaks.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2025-01-05 05:37:03 +00:00
Brenden Matthews
0ce4eaebb7 Bump version 2025-01-01 08:19:38 -05:00
Tin Švagelj
fa045548af
Update Catch2 from 2.13.9 to 3.7.1 (#2114)
* Use test globbing to find new tests
* Silence CodeCoverage.cmake warning
* Update Catch2 to v3.7.1
* Add --output-on-failure flag to CI

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-12-09 02:26:32 +00:00
Brenden Matthews
15024a0095 Bump minor version 2024-11-29 12:50:17 -05:00
Tóth János
048ecf9c70
Fix NetBSD build (#2089)
- Fix NetBSD build.
- Use manual `curses` lookup, `FindCurses` doesn't work on NetBSD.
2024-11-25 23:21:21 +00:00
Tóth János
47ec9f911c
Fix OpenBSD build (#2080)
- Fix unclosed OBJ in core.cc when target is OpenBSD
- `to_real_path` changes:
  - Canonicalize result to mimic `realpath` behavior
  - Partially implement `to_real_path` for OpenBSD
  - Add more tests for `to_real_path`.
- Build system improvements:
  - Use same i18n include/link logic for all platforms
  - Replace `HAVE_SOME_SOUNDCARD_H` and `HAVE_LINUX_SOUNDCARD_H` with `HAVE_SOUNDCARD_H`
    and use other defines (__linux__) to guard include
  - Replace `<XXX>_LIBRARIES` with `<XXX>_LINK_LIBRARIES` for linking.
    - Libraries weren't in default linker search path on OpenBSD
- OpenBSD specific:
  - Fix bsdapm.cc
  - Remove diskio stats stubs
  - Stub get_battery_short_status
  - Remove `-stdlib=libc++` build flag on OpenBSD

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
Co-authored-by: gmb <gmb@openbsd76.my.domain>
Co-authored-by: Tin Švagelj <tin.svagelj@live.com>
2024-11-22 23:45:11 +00:00
Brenden Matthews
9e265a37c2 Bump version 2024-11-05 16:01:21 -05:00
Brenden Matthews
14622a8d9b Bump version 2024-08-29 12:32:08 -04:00
Brenden Matthews
b858d0cc77 Bump version 2024-07-30 12:54:47 -04:00
Brenden Matthews
a14e61adb6 Bump version 2024-07-23 14:34:12 -04:00
Brenden Matthews
61208fc9fb Bump version 2024-07-04 08:19:23 -04:00
Brenden Matthews
31590ddafc Bump version 2024-06-10 18:56:07 -04:00
Brenden Matthews
2f7a31c44a Bump version 2024-05-31 14:29:25 -04:00
Brenden Matthews
6f98039492 Don't include the -pre in install dir path.
We version the docs install path, but there's no reason to include the
-pre and git sha in the version for the path. With the git sha in
particular, it could result in having a bunch of dirs for each separate
git commit (annoying).

This resolves #1928.
2024-05-23 11:33:29 -04:00
Brenden Matthews
ccbac0a899 Bump version 2024-05-18 14:40:45 -04:00
Tin Švagelj
256ffbd75a
Disable Xinput by default (#1920)
* Disable Xinput by default

Causes performance issues for a lot of people.
See #1886.
2024-05-17 13:09:38 +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
49a43e4c98 Bump version 2024-05-11 14:42:26 -04:00
Brenden Matthews
9dfc7318f9 Bump minor version 2024-05-02 13:23:43 -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
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
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
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
c0f06aa0a0 Bump version 2024-04-24 15:17:13 -04:00
Tin Švagelj
93ffab51a0
Use perfect hash (gperf) for parsing color names (#1848)
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-24 06:24:54 +00:00
Tin Švagelj
6adf6b9dd4
Cleanup build flags, global namespace and includes (#1841)
- Separated displays so they don't have to all be included in build even when the features are disabled.
- Removed weird linker magic for display init and replaced it with straightforward (and faster) template functions that behave the same.
  - Replaced `disabled_display_output` classes with log messages.
- Add explicit compiler errors when feature dependent headers get included where they shouldn't (wl, x11).
- Switch BUILD_MOUSE_EVENTS dependency from OWN_WINDOW to BUILD_X11.
- Other minor improvements to some existing code which shouldn't affect behavior.
- Improve documentation.
- Remove X11 from unrelated headers.
  - This reaches 0% unneeded X11 polution in the sources.
  - Reenabled parts of window_type which would work in Wayland.
  - Remove unneeded guards.
- Display files are now no longer compiled if their features are disabled.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-23 21:15:37 +00:00
Tin Švagelj
45500b1439
Separate cairo-xlib.h Lua bindings from cairo.h (#1844)
- Separate cairo-xlib.h Lua bindings from cairo.h
  - This allows cairo.h to be used from Lua on Wayland without X11 as requirement.
- Add pango dependency for Wayland (adds pangocairo).
- Make graphics related bindings depend on BUILD_GUI.
- Remove BUILD_GUI guard around options in platform checks.
  - Keeping only checks that **directly contain module requirements**

A way of creating surfaces in Lua that uses Shm allocated buffers should
be added in future. This commit only cleans up build options to avoid weird
errors.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
2024-04-19 15:31:23 +00:00
Brenden Matthews
5a61390b14 Bump version 2024-04-18 07:15:05 -04:00
Brenden Matthews
ae13f0c42d Bump version 2024-04-17 06:47:37 -04:00
Brenden Matthews
0cfd5c0a31
Bump version 2024-03-03 09:25:37 -05:00
Brenden Matthews
9f59adf36b
Bump version 2024-02-26 14:18:53 -05:00
Brenden Matthews
84c8e187e9 Fix xcb include path 2024-02-26 08:36:50 -05:00
Brenden Matthews
e4bdabc538 Compile tolua++ output as C++ 2024-02-23 13:10:12 -05:00
Brenden Matthews
35357e437c Update copyright 2024-02-22 08:53:35 -05:00
Brenden Matthews
ac9d107e77 Remove build date and associated vars
For reproducible builds, the build date messes things up, and some
distros just set it to 1980 now anyway. Thus, it's better to remove the
date altogether.
2024-02-22 08:36:21 -05:00
Brenden Matthews
a1ab393318
Bump version 2024-02-20 09:10:19 -05:00
Tin
2e17a53d49
Prevent infinite loop in DependentOption
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
cbfdb13f50
Hide Nvidia on non-linux OSs
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
20f9f60c6a
Fix build & cleanup
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
cbebe44707
Fix DependentOptions splitting arguments on spaces
Fix broken x11.cc

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
4936c7492c
Provide a notice when build options get disabled
Reformat files and hope it invalidates CI cache :)

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
7a3020fad5
Fix CMake script
Cleanup debug statements

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:33 -05:00
Tin
a4ac632db7
Fix X11 area enter & leave bug
Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:32 -05:00
Tin
b1b7ae8b2c
Fix X11 build
Fix most issues with X11 event propagation.
Remove X11 code from mouse-events.cc/.h completely.

CMake:
Update toluapp cmake_minimum_required to stop it complaining during build.
Fix ConkyPlatformCheck.cmake not providing access to cairo, imlib2 and rsvg to Wayland.
Move BUILD_MOUSE_EVENTS includes under BUILD_GUI so they're not duplicated.

Signed-off-by: Tin <tin.svagelj@live.com>
2023-11-19 14:16:32 -05:00
Tin Svagelj
afa5f326e8
Prepare environment
Signed-off-by: Tin Svagelj <tin.svagelj@live.com>
2023-11-19 14:14:59 -05:00
Brenden Matthews
70a0e518c1
Bump version 2023-10-13 15:55:55 -04:00
Brenden Matthews
23a1ad3848
Bump version 2023-10-10 14:32:33 -04:00
Brenden Matthews
7b9d292892
Bump version 2023-08-15 12:24:18 -04:00
Brenden Matthews
a41d82b6a6
Bump version 2023-08-09 08:53:51 -04:00