1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Commit Graph

14 Commits

Author SHA1 Message Date
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
Brenden Matthews
bbdc7081ae
Preserve ordering of generated Lua code (#1646)
* Preserve ordering of generated Lua code

This fixes #1645, and (partially) reverts 68ac28.
2023-10-13 09:51:50 -04:00
Bernhard M. Wiedemann
68ac2842d6 Patch toluapp for reproducible output
Without this patch, libimlib2.c varied every time.

This patch was done while working on reproducible builds for openSUSE.
2023-09-08 11:17:16 -04:00
Brenden Matthews
761f05c2b4 Also replace this. 2023-02-16 21:54:40 -05:00
Brenden Matthews
ba870aa733 Use FindLua CMake module. 2023-02-16 21:54:40 -05:00
Brenden Matthews
0009f2473a Drop luajit support (Lua 5.1 API). 2018-12-24 10:07:20 -05:00
Brenden Matthews
50a4aa25ab
Merge commit 'ebfbb3f6dfb68e9c4701f1068f35f4c33ff47d07' into fix-build-with-warnings-enabled 2018-12-22 16:05:36 -05:00
Brenden Matthews
e2b2e33f33
Merge commit 'f0eb4a34776fa30d0033a5f89aa7d7de5525ff7e' into fix-build-with-warnings-enabled 2018-12-22 15:27:08 -05:00
Brenden Matthews
f18c43ccfb
Merge commit '5d71853ec2da0cf37480459dcb1a398e9a1e8a03' into fix-build-with-warnings-enabled 2018-12-22 14:01:32 -05:00
Brenden Matthews
bb9a460293
Merge commit 'd54a5aec9449a7376949217747d62ada945f72cb' into fix-build-with-warnings-enabled 2018-12-22 13:33:48 -05:00
Brenden Matthews
e92c224e07
Build fixes. 2018-12-20 20:50:18 -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