Jan Engelhardt
6afcedf9d0
- Update to version 3.2.6:
* Please see Release Notes upstream at
https://github.com/sirjuddington/SLADE/releases
- Drop patches fixed upstream:
* disable_sse.patch
* 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
- Disable patches that needs rebase or dropping:
* basepk3.diff
* wx.diff
* clzma.diff
- Rebase 0001-build-allow-deactivating-the-crash-handler-at-build-.patch
- Replace wxWidgets-3_0-devel for wxWidgets-devel BuildRequires:
Package builds just fine with the newer 3.2 version.
- Add pkgconfig(libmpg123) BuildRequires: New dependency.
OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=44
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2020-04-18 20:10:34.215071041 +0200
|
|
|
|
external.so references wx functions (including those present in base), but does
|
|
not link them => add wx libs to the link.
|
|
|
|
[ 12s] /usr/include/wx-3.0/wx/filename.h:139: undefined reference to `wxFileName::Assign(wxString const&, wxPathFormat)'
|
|
[ 12s] /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: CMakeFiles/external.dir/email/wxEmailMessage.o: in function `wxEmailMessage::DoAddAttachment(wxString const&, wxString&) const':
|
|
|
|
Furthermore, external.so references MemChunk:: functions, but does not link
|
|
them => change to STATIC because I am too lazy.
|
|
|
|
---
|
|
src/CMakeLists.txt | 2 +-
|
|
src/External/CMakeLists.txt | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: SLADE-3.1.12/src/CMakeLists.txt
|
|
===================================================================
|
|
--- SLADE-3.1.12.orig/src/CMakeLists.txt
|
|
+++ SLADE-3.1.12/src/CMakeLists.txt
|
|
@@ -52,7 +52,7 @@ if (WX_GTK3)
|
|
set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
|
|
endif (WX_GTK3)
|
|
|
|
-SET(WX_LIBS std aui gl stc richtext propgrid media)
|
|
+SET(WX_LIBS base std aui gl stc richtext propgrid media)
|
|
if (NO_WEBVIEW)
|
|
SET(WX_LIBS ${WX_LIBS} html)
|
|
else (NO_WEBVIEW)
|
|
Index: SLADE-3.1.12/src/External/CMakeLists.txt
|
|
===================================================================
|
|
--- SLADE-3.1.12.orig/src/External/CMakeLists.txt
|
|
+++ SLADE-3.1.12/src/External/CMakeLists.txt
|
|
@@ -31,5 +31,5 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
|
|
)
|
|
|
|
add_library(external STATIC ${EXTERNAL_SOURCES})
|
|
-target_link_libraries(external ${ZLIB_LIBRARY})
|
|
+target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
|
|
set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
|