slade-git-3.1.2_b2+3+gf82a87de

* update pkgver()
* remove cruft

3 files changed, 35 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8334370103c0..1377636ab8a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = slade-git
 	pkgdesc = SLADE3 Doom editor (git version)
-	pkgver = 3.1.1.r73.g0f9f48a
+	pkgver = 3.1.2_b2+3+gf82a87de
 	pkgrel = 1
 	url = http://slade.mancubus.net/
-	install = install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = git
 	makedepends = imagemagick
-	makedepends = zip
+	makedepends = p7zip
 	depends = bzip2
+	depends = curl
 	depends = desktop-file-utils
 	depends = fluidsynth
 	depends = freeimage
@@ -20,10 +20,9 @@ pkgbase = slade-git
 	depends = glew
 	depends = gtk2
 	depends = libgl
-	depends = sfml
-	depends = webkitgtk2
-	depends = wxgtk>=3.0
-	depends = xdg-utils
+	depends = sfml>=2.4
+	depends = sfml<2.5
+	depends = wxgtk2>=3.0
 	depends = zlib
 	provides = slade
 	conflicts = slade
diff --git a/PKGBUILD b/PKGBUILD
index eb25a80ea998..1e7d75a85a4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 
 _name=slade
 pkgname=${_name}-git
-pkgver=3.1.1.r73.g0f9f48a
+pkgver=3.1.2_b2+3+gf82a87de
 pkgrel=1
 pkgdesc='SLADE3 Doom editor (git version)'
 arch=('i686' 'x86_64')
 url='http://slade.mancubus.net/'
 license=('GPL')
 depends=('bzip2'
+         'curl'
          'desktop-file-utils'
          'fluidsynth'
          'freeimage'
@@ -17,74 +18,57 @@ depends=('bzip2'
          'glew'
          'gtk2'
          'libgl'
-         'sfml'
-         'webkitgtk2'
-         'wxgtk>=3.0'
-         'xdg-utils'
+         'sfml>=2.4'
+         'sfml<2.5'
+         'wxgtk2>=3.0'
          'zlib')
 makedepends=('cmake'
              'git'
              'imagemagick'
-             'zip')
+             'p7zip')
 provides=("${_name}")
 conflicts=("${_name}")
-install='install'
 source=("${_name}::git://github.com/sirjuddington/SLADE.git"
         "${_name}.desktop")
-_srcsubdir="${_name}"
 sha256sums=('SKIP'
             'e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb')
 
 pkgver() {
-    cd "${_srcsubdir}"
+    cd slade
 
-    git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+    git describe --long --tags | sed -r 's/-/+/g'
 }
 
-prepare() {
-    cd "${_srcsubdir}"
+build() {
+    cd slade
 
-    cmake -DCMAKE_CXX_FLAGS=-DNDEBUG \
+    cmake -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr \
           .
-}
-
-build() {
-    cd "${_srcsubdir}"
-
     make
 
-    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'
+    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 "${_srcsubdir}"
-
-    make install DESTDIR="${pkgdir}"
+    cd slade
 
-    desktop-file-install --dir="${pkgdir}/usr/share/applications" \
-                         "${srcdir}/${_name}.desktop"
+    make install DESTDIR="$pkgdir"
 
-    mkdir -p "${pkgdir}/usr/share/icons/hicolor"
-    (
-        cd 'icons'
-        export XDG_DATA_DIRS="${pkgdir}/usr/share"
+    desktop-file-install --dir="$pkgdir"/usr/share/applications \
+                         "$srcdir"/${_name}.desktop
 
-        local _file
-        for _file in *.png; do
-            xdg-icon-resource install --noupdate \
-                                      --novendor \
-                                      --size "${_file%.png}" \
-                                      "${_file}" \
-                                      "${_name}"
-        done
-    )
+    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/install b/install
deleted file mode 100644
index c49ac8d80518..000000000000
--- a/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}