Updated slade to 3.1.0_b1.

4 files changed, 38 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72774d376290..feb6ba72bce5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = slade
 	pkgdesc = SLADE3 Doom editor.
-	pkgver = 3.0.2
-	pkgrel = 3
+	pkgver = 3.1.0_b1
+	pkgrel = 1
 	url = http://slade.mancubus.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = imagemagick
+	makedepends = zip
 	depends = fluidsynth
 	depends = freeimage
-	depends = sfml1.6
+	depends = ftgl
+	depends = libmodplug
+	depends = sfml
 	depends = wxgtk2.9
-	source = http://slade.mancubus.net/files/slade_302_src.zip
-	source = build.patch
-	md5sums = 4cce3c83292ea55044b7d385bb61a907
-	md5sums = 09d9a15776a96af7b1b84512bc651033
+	source = https://github.com/sirjuddington/SLADE/archive/3.1.0_b1.tar.gz
+	source = slade.desktop
+	md5sums = 8d5cfeef811b5438dc41f5d1826df143
+	md5sums = 49eb1692463e2aa93ea2754a5df7a6e4
 
 pkgname = slade
 
diff --git a/PKGBUILD b/PKGBUILD
index 0622ef5ef523..e6390f749962 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,41 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
 pkgname=slade
-pkgver=3.0.2
-pkgrel=3
+pkgver=3.1.0_b1
+pkgrel=1
 pkgdesc="SLADE3 Doom editor."
 arch=('i686' 'x86_64')
 url="http://slade.mancubus.net/"
 license=('GPL')
-depends=('fluidsynth' 'freeimage' 'sfml1.6' 'wxgtk2.9')
-makedepends=('cmake' 'imagemagick')
-source=(http://slade.mancubus.net/files/${pkgname}_302_src.zip
-        build.patch)
-md5sums=('4cce3c83292ea55044b7d385bb61a907'
-         '09d9a15776a96af7b1b84512bc651033')
-
-prepare() {
-  patch -p1 <"$srcdir/build.patch"
-}
+depends=('fluidsynth' 'freeimage' 'ftgl' 'libmodplug' 'sfml' 'wxgtk2.9')
+makedepends=('cmake' 'imagemagick' 'zip')
+source=(https://github.com/sirjuddington/SLADE/archive/$pkgver.tar.gz
+        slade.desktop)
+md5sums=('8d5cfeef811b5438dc41f5d1826df143'
+         '49eb1692463e2aa93ea2754a5df7a6e4')
 
 build() {
+  cd SLADE-$pkgver
+
   cmake -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9 \
         -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc-2.9 \
-        -DCMAKE_INCLUDE_PATH=/usr/include/sfml-1.6 \
-        -DSFML_SYSTEM_LIBRARY_SHARED_NONDEBUG=/usr/lib/libsfml-system-1.6.so \
-        -DSFML_AUDIO_LIBRARY_SHARED_NONDEBUG=/usr/lib/libsfml-audio-1.6.so \
-        -DCMAKE_CXX_FLAGS="-I/usr/include/sfml-1.6 -DNDEBUG" \
+        -DCMAKE_CXX_FLAGS=-DNDEBUG \
         .
   make
 
+  pushd dist/res
+  zip -r ../slade.pk3 *
+  popd
+
   convert "slade.ico[0]" slade.png
 }
 
 package() {
+  cd SLADE-$pkgver
+
   install -Dm755 slade "$pkgdir/usr/bin/slade"
   install -Dm644 dist/slade.pk3 "$pkgdir/usr/share/slade3/slade.pk3"
 
   install -Dm644 slade.png "$pkgdir/usr/share/pixmaps/slade.png"
-  install -Dm644 slade.desktop "$pkgdir/usr/share/applications/slade.desktop"
+  install -Dm644 "$srcdir/slade.desktop" "$pkgdir/usr/share/applications/slade.desktop"
 }
diff --git a/build.patch b/build.patch
deleted file mode 100644
index 4eb600cbab77..000000000000
--- a/build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur slade.orig/src/CMakeLists.txt slade/src/CMakeLists.txt
---- slade.orig/src/CMakeLists.txt	2011-07-26 00:29:58.000000000 +0200
-+++ slade/src/CMakeLists.txt	2012-09-14 09:45:40.475302229 +0200
-@@ -1,7 +1,9 @@
--find_package(wxWidgets COMPONENTS aui gl stc richtext REQUIRED)
-+find_package(wxWidgets COMPONENTS aui gl stc richtext core adv html REQUIRED)
- include(${wxWidgets_USE_FILE})
- 
--set(SFML_FIND_COMPONENTS system audio)
-+find_package(OpenGL REQUIRED)
-+
-+set(SFML_FIND_COMPONENTS audio system)
- 
- include(../FindFluidSynth.cmake)
- include(../FindFreeImage.cmake)
-@@ -15,7 +17,7 @@
- if(NOT ${SFML_FOUND})
- 	message(SEND_ERROR "SFML required.")
- endif()
--include_directories(${FLUIDSYNTH_INCLUDE_DIR} ${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR})
-+include_directories(${FLUIDSYNTH_INCLUDE_DIR} ${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
- 
- set(SLADE_SOURCES 
- )
-@@ -30,5 +32,5 @@
- 	${SLADE_SOURCES}
- )
- 
--target_link_libraries(slade ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${wxWidgets_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${FREEIMAGE_LIBRARIES} ${SFML_LIBRARY})
-+target_link_libraries(slade ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${wxWidgets_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${FREEIMAGE_LIBRARIES} ${SFML_LIBRARY} ${OPENGL_LIBRARIES})
- set_target_properties(slade PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SLADE_OUTPUT_DIR})
diff --git a/slade.desktop b/slade.desktop
new file mode 100644
index 000000000000..dce26665608b
--- /dev/null
+++ b/slade.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=SLADE
+Type=Application
+Comment=Slayer's Leet-Ass Doom Editor
+Exec=slade
+Icon=slade
+Categories=Game;
+Terminal=False