diff --git a/3.1.0.5.tar.gz b/3.1.0.5.tar.gz deleted file mode 100644 index 4f1abeb..0000000 --- a/3.1.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc802bac433894f35528bae54e337e4dfe5c40c631d02d4472601821f8e8f76e -size 4313839 diff --git a/SLADE-3.1.1.4.tar.gz b/SLADE-3.1.1.4.tar.gz new file mode 100644 index 0000000..2b8dcc8 --- /dev/null +++ b/SLADE-3.1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea71d8dcb7c99cea5afabdbf9c469955ff6c2072c450a62c346da3d9856f2e58 +size 4385105 diff --git a/basepk3.diff b/basepk3.diff deleted file mode 100644 index 533c192..0000000 --- a/basepk3.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt - -Search for the resource file in /usr/share/slade, and prefer ~/.slade -over anything else. ---- - src/ArchiveManager.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -Index: SLADE-3.1.0.5/src/ArchiveManager.cpp -=================================================================== ---- SLADE-3.1.0.5.orig/src/ArchiveManager.cpp -+++ SLADE-3.1.0.5/src/ArchiveManager.cpp -@@ -138,11 +138,13 @@ bool ArchiveManager::init() - } - - // Find slade3.pk3 directory -- string dir_slade_pk3 = appPath("slade.pk3", DIR_DATA); -+ string dir_slade_pk3 = appPath("slade.pk3", DIR_USER); -+ if (!wxFileExists(dir_slade_pk3)) -+ dir_slade_pk3 = appPath("slade.pk3", DIR_DATA); - if (!wxFileExists(dir_slade_pk3)) - dir_slade_pk3 = appPath("slade.pk3", DIR_APP); - if (!wxFileExists(dir_slade_pk3)) -- dir_slade_pk3 = appPath("slade.pk3", DIR_USER); -+ dir_slade_pk3 = "/usr/share/slade/slade.pk3"; - if (!wxFileExists(dir_slade_pk3)) - dir_slade_pk3 = "slade.pk3"; - diff --git a/slade.changes b/slade.changes index 5920fac..d95a96e 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 19 05:19:27 UTC 2016 - luke.nukem.jones@gmail.com + +- Update to version 3.1.1.4 +- Remove patch basepk3.diff +- Add patch wxWidgets.diff + + Corrects an issue with conversion from wxString to wxChar in + column sort + ------------------------------------------------------------------- Sun Jul 17 01:15:06 UTC 2016 - jengelh@inai.de diff --git a/slade.desktop b/slade.desktop new file mode 100644 index 0000000..628c23e --- /dev/null +++ b/slade.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=SLADE +GenericName=Doom editor +Icon=slade +Exec=slade %F +Terminal=false +MimeType=application/x-doom-wad;application/x-pak;application/zip;inode/directory; +Categories=GTK;Utility;Archiving; diff --git a/slade.spec b/slade.spec index 12062c6..f0937aa 100644 --- a/slade.spec +++ b/slade.spec @@ -17,26 +17,30 @@ Name: slade -Version: 3.1.0.5 +Version: 3.1.1.4 Release: 0 Summary: An editor for DOOM maps and WAD/PK3 archives -License: GPL-2.0+ +License: GPL-3.0+ Group: Amusements/Games/3D/Shoot -Url: http://slade.mancubus.net/ - -Source: https://github.com/sirjuddington/SLADE/archive/%version.tar.gz -Patch1: basepk3.diff +Url: https://github.com/sirjuddington/SLADE +Source0: https://github.com/sirjuddington/%{name}/archive/SLADE-%{version}.tar.gz +Source1: slade.desktop +# PATCH-FIX-UPSTREAM Fix conversion from wxString to wxChar when using wxWidgets >= 3.0.2 +Patch0: wxChar.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: freeimage-devel BuildRequires: ftgl-devel BuildRequires: gcc-c++ +BuildRequires: ImageMagick BuildRequires: sfml2-devel +BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel BuildRequires: zip BuildRequires: pkgconfig(fluidsynth) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(x11) %description @@ -46,24 +50,42 @@ game-specific formats, and even convert between some of them, or from/to other generic formats such as PNG. %prep -%setup -qn SLADE-%version -%patch -P 1 -p1 +%setup -qn SLADE-3.1.1.4 +%patch0 -p1 %build -%cmake +%cmake -DUSE_WEBKIT_STARTPAGE=ON make %{?_smp_mflags} %install -mkdir -p "%buildroot/%_bindir" "%buildroot/%_datadir/%name" -pushd build/ -install -pm0755 slade "%buildroot/%_bindir/" -install -pm0644 slade.pk3 "%buildroot/%_datadir/%name/" +install -Dm755 build/slade %{buildroot}%{_bindir}/slade +install -Dm644 build/slade.pk3 %{buildroot}%{_datadir}/slade3/slade.pk3 + +convert "build/msvc/slade.ico" -alpha on -flatten %{name}.png +install -D -p -m 644 %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png + +pushd misc +for txtfile in detect_functions.txt old-simage-formats.txt stuff.txt udmf11.txt \ + udmf_zdoom.txt usdf.txt usdf_zdoom.txt +do + install -Dm644 $txtfile %{buildroot}%{_datadir}/slade3/misc/$txtfile +done popd +install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop + +%post +%desktop_database_post + +%postun +%desktop_database_postun + %files %defattr(-,root,root) -%_bindir/slade -%_datadir/%name/ -%doc u*.txt gpl*txt +%doc gpl-2.0.txt README.md +%{_bindir}/slade +%{_datadir}/slade3/ +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/%{name}.desktop %changelog diff --git a/wxChar.patch b/wxChar.patch new file mode 100644 index 0000000..8d1cd95 --- /dev/null +++ b/wxChar.patch @@ -0,0 +1,17 @@ +diff --git a/src/UI/Lists/ArchiveEntryList.cpp b/src/UI/Lists/ArchiveEntryList.cpp +index 4c1ad82..e7cbe1c 100644 +--- a/src/UI/Lists/ArchiveEntryList.cpp ++++ b/src/UI/Lists/ArchiveEntryList.cpp +@@ -581,8 +581,10 @@ bool ArchiveEntryList::entrySort(long left, long right) + result = 0; + + // Name sort +- else if (ael_current->col_name >= 0 && ael_current->col_name == lv_current->sortColumn()) +- result = le->getName().CompareTo(re->getName(), string::ignoreCase); ++ else if (ael_current->col_name >= 0 && ael_current->col_name == lv_current->sortColumn()) { ++ const wxChar* reName = re->getName().c_str(); ++ result = le->getName().CompareTo(reName, string::ignoreCase); ++ } + + // Other (default) sort + else