Update to 3.1.1

7 files changed, 96 insertions, 131 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fbbe58fb9ae..ff075960a5ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,32 @@
 pkgbase = slade
-	pkgdesc = SLADE3 Doom editor.
-	pkgver = 3.1.0.4
+	pkgdesc = SLADE3 Doom editor
+	pkgver = 3.1.1
 	pkgrel = 1
 	url = http://slade.mancubus.net/
+	install = install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = imagemagick
 	makedepends = zip
+	depends = bzip2
+	depends = desktop-file-utils
 	depends = fluidsynth
 	depends = freeimage
+	depends = freetype2
 	depends = ftgl
-	depends = libmodplug
+	depends = glew
+	depends = gtk2
+	depends = libgl
 	depends = sfml
 	depends = wxgtk>=3.0
-	source = https://github.com/sirjuddington/SLADE/archive/3.1.0.4.tar.gz
+	depends = xdg-utils
+	depends = zlib
+	source = https://github.com/sirjuddington/SLADE/archive/3.1.1.tar.gz
 	source = slade.desktop
-	sha256sums = f643174975b2e7cd5c54be75a319a128f703231115f2ceba34ef0b9718d5fb8e
-	sha256sums = 5d619cdae8a993b07bb72aed54c7e814db48e66aac61a809dd2c5ab1373cd811
+	sha256sums = da7efc529823772b561a2405dbbc8b59467f3dfc98b9d753af9b1836d3a97529
+	sha256sums = e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb
 
 pkgname = slade
 
diff --git a/PKGBUILD b/PKGBUILD
index b44d2c4518f4..0d826d57b5bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,80 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-pkgname=slade
-pkgver=3.1.0.4
+_name=slade
+pkgname=${_name}
+pkgver=3.1.1
 pkgrel=1
-pkgdesc="SLADE3 Doom editor."
+pkgdesc='SLADE3 Doom editor'
 arch=('i686' 'x86_64')
-url="http://slade.mancubus.net/"
+url='http://slade.mancubus.net/'
 license=('GPL')
-depends=('fluidsynth' 'freeimage' 'ftgl' 'libmodplug' 'sfml' 'wxgtk>=3.0')
-makedepends=('cmake' 'imagemagick' 'zip')
-source=(https://github.com/sirjuddington/SLADE/archive/$pkgver.tar.gz
-        slade.desktop)
-sha256sums=('f643174975b2e7cd5c54be75a319a128f703231115f2ceba34ef0b9718d5fb8e'
-            '5d619cdae8a993b07bb72aed54c7e814db48e66aac61a809dd2c5ab1373cd811')
+depends=('bzip2'
+         'desktop-file-utils'
+         'fluidsynth'
+         'freeimage'
+         'freetype2'
+         'ftgl'
+         'glew'
+         'gtk2'
+         'libgl'
+         'sfml'
+         'wxgtk>=3.0'
+         'xdg-utils'
+         'zlib')
+makedepends=('cmake'
+             'imagemagick'
+             'zip')
+install='install'
+source=("https://github.com/sirjuddington/SLADE/archive/${pkgver}.tar.gz"
+        "${_name}.desktop")
+_srcsubdir="SLADE-${pkgver}"
+sha256sums=('da7efc529823772b561a2405dbbc8b59467f3dfc98b9d753af9b1836d3a97529'
+            'e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb')
 
-_srcsubdir=SLADE-$pkgver
+prepare() {
+    cd "${_srcsubdir}"
+
+    cmake -DCMAKE_CXX_FLAGS=-DNDEBUG \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          .
+}
 
 build() {
-  cd $_srcsubdir
+    cd "${_srcsubdir}"
 
-  cmake -DCMAKE_CXX_FLAGS=-DNDEBUG \
-        .
-  make
+    make
 
-  convert "slade.ico[0]" slade.png
+    mkdir -p 'icons'
+    convert 'dist/res/slade.ico[0]' 'icons/128.png'
+    convert 'dist/res/slade.ico[1]' 'icons/16.png'
+    convert 'dist/res/slade.ico[2]' 'icons/24.png'
+    convert 'dist/res/slade.ico[3]' 'icons/256.png'
+    convert 'dist/res/slade.ico[4]' 'icons/32.png'
+    convert 'dist/res/slade.ico[5]' 'icons/40.png'
+    convert 'dist/res/slade.ico[6]' 'icons/48.png'
+    convert 'dist/res/slade.ico[7]' 'icons/64.png'
 }
 
 package() {
-  cd $_srcsubdir
+    cd "${_srcsubdir}"
+
+    make install DESTDIR="${pkgdir}"
+
+    desktop-file-install --dir="${pkgdir}/usr/share/applications" \
+                         "${srcdir}/${_name}.desktop"
 
-  install -Dm755 slade "$pkgdir/usr/bin/slade"
-  install -Dm644 slade.pk3 "$pkgdir/usr/share/slade3/slade.pk3"
+    mkdir -p "${pkgdir}/usr/share/icons/hicolor"
+    (
+        cd 'icons'
+        export XDG_DATA_DIRS="${pkgdir}/usr/share"
 
-  install -Dm644 slade.png "$pkgdir/usr/share/pixmaps/slade.png"
-  install -Dm644 "$srcdir/slade.desktop" "$pkgdir/usr/share/applications/slade.desktop"
+        local _file
+        for _file in *.png; do
+            xdg-icon-resource install --noupdate \
+                                      --novendor \
+                                      --size "${_file%.png}" \
+                                      "${_file}" \
+                                      "${_name}"
+        done
+    )
 }
diff --git a/git-54f7e8cb.patch b/git-54f7e8cb.patch
deleted file mode 100644
index 8cbf12769661..000000000000
--- a/git-54f7e8cb.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 54f7e8cb0433e8cfe607f4f6b9db015156e1c101 Mon Sep 17 00:00:00 2001
-From: Gaerzi <gaerzi@gmail.com>
-Date: Fri, 17 Jan 2014 14:28:53 +0100
-Subject: [PATCH] Restored a few CHR() that were in fact needed.
-
----
- src/MainApp.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/MainApp.cpp b/src/MainApp.cpp
-index d1f7ffa..e2b893b 100644
---- a/src/MainApp.cpp
-+++ b/src/MainApp.cpp
-@@ -861,14 +861,14 @@ void MainApp::readConfigFile()
- 		if (!token.Cmp("base_resource_paths"))
- 		{
- 			// Skip {
--			token = wxString::FromUTF8(tz.getToken());
-+			token = wxString::FromUTF8(CHR(tz.getToken()));
- 
- 			// Read paths until closing brace found
- 			token = tz.getToken();
- 			while (token.Cmp("}"))
- 			{
- 				theArchiveManager->addBaseResourcePath(token);
--				token = wxString::FromUTF8(tz.getToken());
-+				token = wxString::FromUTF8(CHR(tz.getToken()));
- 			}
- 		}
- 
-@@ -879,11 +879,11 @@ void MainApp::readConfigFile()
- 			token = tz.getToken();
- 
- 			// Read files until closing brace found
--			token = wxString::FromUTF8(tz.getToken());
-+			token = wxString::FromUTF8(CHR(tz.getToken()));
- 			while (token != "}")
- 			{
- 				theArchiveManager->addRecentFile(token);
--				token = wxString::FromUTF8(tz.getToken());
-+				token = wxString::FromUTF8(CHR(tz.getToken()));
- 			}
- 		}
- 
--- 
-1.8.5.3
-
diff --git a/git-76d98460.patch b/git-76d98460.patch
deleted file mode 100644
index bfd24ef85643..000000000000
--- a/git-76d98460.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 76d98460016d501a490310a877d96001c69384f9 Mon Sep 17 00:00:00 2001
-From: Gaerzi <gaerzi@gmail.com>
-Date: Fri, 17 Jan 2014 00:30:11 +0100
-Subject: [PATCH] Restored one CHR()
-
-Should fix #74 I think.
----
- src/CVar.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CVar.cpp b/src/CVar.cpp
-index 4b881d8..b10b4df 100644
---- a/src/CVar.cpp
-+++ b/src/CVar.cpp
-@@ -162,7 +162,7 @@ void read_cvar(string name, string value)
- 				*((CFloatCVar*) cvars[c]) = atof(CHR(value));
- 
- 			if (cvars[c]->type == CVAR_STRING)
--				*((CStringCVar*) cvars[c]) = wxString::FromUTF8(value);
-+				*((CStringCVar*) cvars[c]) = wxString::FromUTF8(CHR(value));
- 		}
- 	}
- }
--- 
-1.8.5.3
-
diff --git a/git-df5cd54e.patch b/git-df5cd54e.patch
deleted file mode 100644
index afd8c990e78a..000000000000
--- a/git-df5cd54e.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From df5cd54ed3acc737631e4592de873efd9dacf0b8 Mon Sep 17 00:00:00 2001
-From: Gaerzi <gaerzi@gmail.com>
-Date: Fri, 17 Jan 2014 12:05:35 +0100
-Subject: [PATCH] Dat write
-
----
- src/DatArchive.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/DatArchive.cpp b/src/DatArchive.cpp
-index 23c33e2..0402c69 100644
---- a/src/DatArchive.cpp
-+++ b/src/DatArchive.cpp
-@@ -553,7 +553,7 @@ bool DatArchive::write(MemChunk& mc, bool update)
- 		entry = getEntry(l);
- 		if (nameoffsets[l])
- 		{
--			mc.write(entry->getName(), entry->getName().length());
-+			mc.write(CHR(entry->getName()), entry->getName().length());
- 			mc.write(&zero, 1);
- 		}
- 	}
--- 
-1.8.5.3
-
diff --git a/install b/install
new file mode 100644
index 000000000000..c49ac8d80518
--- /dev/null
+++ b/install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/slade.desktop b/slade.desktop
index dce26665608b..c6796e083d73 100644
--- a/slade.desktop
+++ b/slade.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Version=1.0
 Name=SLADE
-Type=Application
-Comment=Slayer's Leet-Ass Doom Editor
-Exec=slade
+GenericName=Doom editor
 Icon=slade
-Categories=Game;
-Terminal=False
+Exec=slade %F
+Terminal=false
+MimeType=application/x-doom-wad;application/x-pak;application/zip;inode/directory;
+Categories=GTK;Utility;Archiving;