wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SLADE: fix build with gcc-10, link with system libraries

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2021-01-24 13:44:49 +07:00
parent d1d4423093
commit db94965355
3 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
srcpkgs/SLADE/patches/pointer-decay.patch Normal file
View file

@ -0,0 +1,29 @@
--- src/External/sol/sol.hpp
+++ src/External/sol/sol.hpp
@@ -6818,7 +6818,7 @@
}
static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
- return stack::push<const wchar_t*>(L, str, str + sz);
+ return stack::push<const wchar_t*>(L, str + 0, str + sz);
}
};
@@ -6829,7 +6829,7 @@
}
static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
- return stack::push<const char16_t*>(L, str, str + sz);
+ return stack::push<const char16_t*>(L, str + 0, str + sz);
}
};
@@ -6840,7 +6840,7 @@
}
static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
- return stack::push<const char32_t*>(L, str, str + sz);
+ return stack::push<const char32_t*>(L, str + 0, str + sz);
}
};

17
srcpkgs/SLADE/patches/system-libraries.patch Normal file
View file

@ -0,0 +1,17 @@
lzma is p7zip not liblzma
--- src/External/CMakeLists.txt
+++ src/External/CMakeLists.txt
@@ -24,12 +24,10 @@
file(GLOB_RECURSE EXTERNAL_SOURCES
*.cpp
*.cxx
- dumb/*.c
- lua/*.c
lzma/C/LzmaDec.c
${SLADE_HEADERS}
)
add_library(external STATIC ${EXTERNAL_SOURCES})
target_link_libraries(external ${ZLIB_LIBRARY})
-set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
+set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE)

5
srcpkgs/SLADE/template
View file

@ -1,12 +1,13 @@
# Template file for 'SLADE' # Template file for 'SLADE'
pkgname=SLADE pkgname=SLADE
version=3.1.12a version=3.1.12a
revision=3 revision=4
build_style=cmake build_style=cmake
build_helper=cmake-wxWidgets-gtk3 build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config p7zip which" hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
gtk+3-devel libcurl-devel wxWidgets-gtk3-devel" gtk+3-devel libcurl-devel wxWidgets-gtk3-devel bzip2-devel zlib-devel
lua53-devel dumb-devel liblzma-devel"
short_desc="Modern editor for Doom-engine based games" short_desc="Modern editor for Doom-engine based games"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"