From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] SLADE: fix build with gcc-10, link with system libraries
Date: Sun, 24 Jan 2021 08:33:37 +0100 [thread overview]
Message-ID: <20210124073337.UQvU5SQkc0FyyNfCAY1dnemR5nlrZRX-nb25ln6S-XA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28133@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages slade-gcc10-libraries
https://github.com/void-linux/void-packages/pull/28133
SLADE: fix build with gcc-10, link with system libraries
@Johnnynator I have no idea about this package, so the patch maybe plainly wrong :)
A patch file from https://github.com/void-linux/void-packages/pull/28133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-slade-gcc10-libraries-28133.patch --]
[-- Type: text/x-diff, Size: 3109 bytes --]
From 0044815d3b55a1b50498dad46a91fe408f25f997 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 | 5 ++--
3 files changed, 49 insertions(+), 2 deletions(-)
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..b7ec0f0749c 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,12 +1,13 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=3
+revision=4
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"
next prev parent reply other threads:[~2021-01-24 7:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 7:32 [PR PATCH] " sgn
2021-01-24 7:33 ` sgn [this message]
2021-01-26 14:01 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210124073337.UQvU5SQkc0FyyNfCAY1dnemR5nlrZRX-nb25ln6S-XA@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).