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
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
Search for the resource file in /usr/share/slade, and prefer ~/.slade
|
|
over anything else.
|
|
(DIR_RES is /usr/share/appinfo according to wxWidgets,
|
|
which is not used in Linux distros.)
|
|
---
|
|
src/Archive/ArchiveManager.cpp | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
Index: SLADE-3.1.11/src/Archive/ArchiveManager.cpp
|
|
===================================================================
|
|
--- SLADE-3.1.11.orig/src/Archive/ArchiveManager.cpp
|
|
+++ SLADE-3.1.11/src/Archive/ArchiveManager.cpp
|
|
@@ -153,14 +153,12 @@ bool ArchiveManager::init()
|
|
}
|
|
|
|
// Find slade3.pk3 directory
|
|
- string dir_slade_pk3 = App::path("slade.pk3", App::Dir::Resources);
|
|
+ string dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
|
|
if (!wxFileExists(dir_slade_pk3))
|
|
dir_slade_pk3 = App::path("slade.pk3", App::Dir::Data);
|
|
if (!wxFileExists(dir_slade_pk3))
|
|
dir_slade_pk3 = App::path("slade.pk3", App::Dir::Executable);
|
|
if (!wxFileExists(dir_slade_pk3))
|
|
- dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
|
|
- if (!wxFileExists(dir_slade_pk3))
|
|
dir_slade_pk3 = "slade.pk3";
|
|
|
|
// Open slade.pk3
|