slade-3.1.2-1

3 files changed, 19 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 050c132415bd..558d95171a1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,30 @@
 pkgbase = slade
 	pkgdesc = SLADE3 Doom editor
-	pkgver = 3.1.2_b5
-	pkgrel = 2
+	pkgver = 3.1.2
+	pkgrel = 1
 	url = http://slade.mancubus.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
-	makedepends = imagemagick
 	makedepends = p7zip
 	depends = bzip2
 	depends = curl
-	depends = desktop-file-utils
 	depends = fluidsynth
 	depends = freeimage
-	depends = freetype2
 	depends = ftgl
 	depends = glew>=2.1
 	depends = glew<2.2
-	depends = gtk2
+	depends = glu
+	depends = gtk3
 	depends = libgl
 	depends = sfml>=2.5
 	depends = sfml<2.6
-	depends = wxgtk2>=3.0
+	depends = webkit2gtk
+	depends = wxgtk3>=3.0
 	depends = zlib
-	source = https://github.com/sirjuddington/SLADE/archive/3.1.2_b5.tar.gz
-	source = slade.desktop
-	sha256sums = 3771605047be66d7de828b84aa41913d0c6723ccae034cc97af5413b9858eee2
-	sha256sums = e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb
+	source = https://github.com/sirjuddington/SLADE/archive/3.1.2.tar.gz
+	sha256sums = 213d8ac065e3ec06e7e7df39695a58296f7ca435c10244389b21d9f91ed49724
 
 pkgname = slade
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f652649bf46..5deecaede5e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,66 +2,46 @@
 
 _name=slade
 pkgname=${_name}
-pkgver=3.1.2_b5
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc='SLADE3 Doom editor'
 arch=('i686' 'x86_64')
 url='http://slade.mancubus.net/'
 license=('GPL')
 depends=('bzip2'
          'curl'
-         'desktop-file-utils'
          'fluidsynth'
          'freeimage'
-         'freetype2'
          'ftgl'
          'glew>=2.1'
          'glew<2.2'
-         'gtk2'
+         'glu'
+         'gtk3'
          'libgl'
          'sfml>=2.5'
          'sfml<2.6'
-         'wxgtk2>=3.0'
+         'webkit2gtk'
+         'wxgtk3>=3.0'
          'zlib')
 makedepends=('cmake'
-             'imagemagick'
              'p7zip')
-source=("https://github.com/sirjuddington/SLADE/archive/${pkgver}.tar.gz"
-        "${_name}.desktop")
-sha256sums=('3771605047be66d7de828b84aa41913d0c6723ccae034cc97af5413b9858eee2'
-            'e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb')
+source=("https://github.com/sirjuddington/SLADE/archive/${pkgver}.tar.gz")
+sha256sums=('213d8ac065e3ec06e7e7df39695a58296f7ca435c10244389b21d9f91ed49724')
 
 build() {
     cd SLADE-${pkgver}
 
+    ln -sf /usr/bin/wx-config-gtk3 wx-config
+
     cmake -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr \
-          -DNO_WEBVIEW=ON \
+          -DWITH_WXPATH=. \
           .
     make
-
-    convert dist/res/slade.ico'[0]' ${_name}-128.png
-    convert dist/res/slade.ico'[1]' ${_name}-16.png
-    convert dist/res/slade.ico'[2]' ${_name}-24.png
-    convert dist/res/slade.ico'[3]' ${_name}-256.png
-    convert dist/res/slade.ico'[4]' ${_name}-32.png
-    convert dist/res/slade.ico'[5]' ${_name}-40.png
-    convert dist/res/slade.ico'[6]' ${_name}-48.png
-    convert dist/res/slade.ico'[7]' ${_name}-64.png
 }
 
 package() {
     cd SLADE-${pkgver}
 
     make install DESTDIR="$pkgdir"
-
-    desktop-file-install --dir="$pkgdir"/usr/share/applications \
-                         "$srcdir"/${_name}.desktop
-
-    local _size
-    for _size in 16 24 32 40 48 64 128 256; do
-        install -D -m644 \
-                ${_name}-${_size}.png \
-                "$pkgdir"/usr/share/icons/hicolor/${_size}x${_size}/apps/${_name}.png
-    done
 }
diff --git a/slade.desktop b/slade.desktop
deleted file mode 100644
index c6796e083d73..000000000000
--- a/slade.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[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;