From ed092b1467719b03004974bf420eda7fc3ba91b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 13:44:49 +0700
Subject: [PATCH] SLADE: fix build with gcc-10, link with system libraries

---
 srcpkgs/SLADE/patches/pointer-decay.patch    | 29 ++++++++++++++++++++
 srcpkgs/SLADE/patches/system-libraries.patch | 17 ++++++++++++
 srcpkgs/SLADE/template                       |  3 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/SLADE/patches/pointer-decay.patch
 create mode 100644 srcpkgs/SLADE/patches/system-libraries.patch

diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch
new file mode 100644
index 00000000000..87f3370a85f
--- /dev/null
+++ b/srcpkgs/SLADE/patches/pointer-decay.patch
@@ -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);
+ 			}
+ 		};
+ 
diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch
new file mode 100644
index 00000000000..9f114e04204
--- /dev/null
+++ b/srcpkgs/SLADE/patches/system-libraries.patch
@@ -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)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 64a183b5498..8753ebbe8c3 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -6,7 +6,8 @@ build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
 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"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"