diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2023-07-07 18:43:55 +0200 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2023-07-07 18:45:00 +0200 |
| commit | fb6f43da4a1fa2c3d442baaa32016593bbe816e1 (patch) | |
| tree | f92835ecbc4603552f1ddff3355fd461043d1861 /media-gfx/geeqie | |
| parent | dev-python/sqlalchemy: Bump to 2.0.18 (diff) | |
| download | gentoo-fb6f43da4a1fa2c3d442baaa32016593bbe816e1.tar.gz gentoo-fb6f43da4a1fa2c3d442baaa32016593bbe816e1.tar.bz2 gentoo-fb6f43da4a1fa2c3d442baaa32016593bbe816e1.zip | |
media-gfx/geeqie: use lua.hpp to fix lua plugin compilation
This can be replaced later by upstream official fix
Bug: https://bugs.gentoo.org/909302
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
Diffstat (limited to 'media-gfx/geeqie')
| -rw-r--r-- | media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch | 19 | ||||
| -rw-r--r-- | media-gfx/geeqie/geeqie-2.1.ebuild | 7 |
2 files changed, 23 insertions, 3 deletions
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch new file mode 100644 index 000000000000..a0c816b5fb3c --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch @@ -0,0 +1,19 @@ +--- + src/lua.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/lua.cc b/src/lua.cc +index 84aa549a..458b658a 100644 +--- a/src/lua.cc ++++ b/src/lua.cc +@@ -24,9 +24,7 @@ + + #define _XOPEN_SOURCE + +-#include <lua.h> +-#include <lauxlib.h> +-#include <lualib.h> ++#include <lua.hpp> + + #include <stdio.h> + #include <glib.h> diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild index 9553979fc1d4..62d485ca97b3 100644 --- a/media-gfx/geeqie/geeqie-2.1.ebuild +++ b/media-gfx/geeqie/geeqie-2.1.ebuild @@ -45,6 +45,10 @@ BDEPEND=" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-lua_hpp.patch +) + pkg_setup() { # Do not require setting LUA_SINGLE_TARGET if lua is not used use lua && lua-single_pkg_setup @@ -55,9 +59,6 @@ src_prepare() { # Disable doc build - not useful most of the time per upstream sed -e "/subdir('doc')/d" -i meson.build || die - - # Lua version - sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die } src_configure() { |