slade-3.1.2_b4-1

3 files changed, 9 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7df11d56baa0..6f62b4b193c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slade
 	pkgdesc = SLADE3 Doom editor
-	pkgver = 3.1.2_b2
-	pkgrel = 3
+	pkgver = 3.1.2_b4
+	pkgrel = 1
 	url = http://slade.mancubus.net/
 	arch = i686
 	arch = x86_64
@@ -23,12 +23,10 @@ pkgbase = slade
 	depends = sfml<2.5
 	depends = wxgtk2>=3.0
 	depends = zlib
-	source = https://github.com/sirjuddington/SLADE/archive/3.1.2_b2.tar.gz
+	source = https://github.com/sirjuddington/SLADE/archive/3.1.2_b4.tar.gz
 	source = slade.desktop
-	source = 0001-NO_WEBVIEW-fix-742.patch
-	sha256sums = 7b473853acbddfc03b1821ebec13e61f0caf26a6718f88bc4136989df15f853c
+	sha256sums = 8acb79c51ca0d4b0f21b38a63c8121286e76b2f51711b5d603a27aca3187b870
 	sha256sums = e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb
-	sha256sums = 8df409857161d3b72097326f574daa778efde945edc2373d435537e05be5dc8e
 
 pkgname = slade
 
diff --git a/0001-NO_WEBVIEW-fix-742.patch b/0001-NO_WEBVIEW-fix-742.patch
deleted file mode 100644
index 1b56af54e80e..000000000000
--- a/0001-NO_WEBVIEW-fix-742.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 097d5be38f27e8d829fcb394877c1db623f066f6 Mon Sep 17 00:00:00 2001
-From: Jacendi <jacendi@protonmail.com>
-Date: Fri, 23 Jun 2017 03:06:19 +0400
-Subject: [PATCH] NO_WEBVIEW fix (#742)
-
-* Update MainEditor.cpp
-
-* Update MainWindow.cpp
-
-* Update MainEditor.cpp
----
- src/MainEditor/MainEditor.cpp    | 3 ++-
- src/MainEditor/UI/MainWindow.cpp | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/MainEditor/MainEditor.cpp b/src/MainEditor/MainEditor.cpp
-index 0c024de2..cb219265 100644
---- a/src/MainEditor/MainEditor.cpp
-+++ b/src/MainEditor/MainEditor.cpp
-@@ -94,8 +94,9 @@ EntryPanel* MainEditor::currentEntryPanel()
- {
- 	return main_window->getArchiveManagerPanel()->currentArea();
- }
--
-+#ifdef USE_WEBVIEW_STARTPAGE
- void MainEditor::openDocs(string page_name)
- {
- 	main_window->openDocs(page_name);
- }
-+#endif
-diff --git a/src/MainEditor/UI/MainWindow.cpp b/src/MainEditor/UI/MainWindow.cpp
-index ecb0f875..92e183bd 100644
---- a/src/MainEditor/UI/MainWindow.cpp
-+++ b/src/MainEditor/UI/MainWindow.cpp
-@@ -921,7 +921,8 @@ void MainWindow::onHTMLLinkClicked(wxEvent& e)
- 		string rs = href.Mid(9);
- 		unsigned long index = 0;
- 		rs.ToULong(&index);
--		SActionHandler::doAction("aman_recent", index);
-+		SActionHandler::setWxIdOffset(index);
-+		SActionHandler::doAction("aman_recent");
- 		createStartPage();
- 	}
- 	else if (href.StartsWith("action://"))
--- 
-2.13.2
-
diff --git a/PKGBUILD b/PKGBUILD
index fcfb3266c911..f914a5d53eab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _name=slade
 pkgname=${_name}
-pkgver=3.1.2_b2
-pkgrel=3
+pkgver=3.1.2_b4
+pkgrel=1
 pkgdesc='SLADE3 Doom editor'
 arch=('i686' 'x86_64')
 url='http://slade.mancubus.net/'
@@ -26,17 +26,9 @@ makedepends=('cmake'
              'imagemagick'
              'p7zip')
 source=("https://github.com/sirjuddington/SLADE/archive/${pkgver}.tar.gz"
-        "${_name}.desktop"
-        '0001-NO_WEBVIEW-fix-742.patch')
-sha256sums=('7b473853acbddfc03b1821ebec13e61f0caf26a6718f88bc4136989df15f853c'
-            'e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb'
-            '8df409857161d3b72097326f574daa778efde945edc2373d435537e05be5dc8e')
-
-prepare() {
-    cd SLADE-${pkgver}
-
-    patch -p1 -i"$srcdir"/0001-NO_WEBVIEW-fix-742.patch
-}
+        "${_name}.desktop")
+sha256sums=('8acb79c51ca0d4b0f21b38a63c8121286e76b2f51711b5d603a27aca3187b870'
+            'e69d6e0da523c5d649bd51316fa827175b5858cb91b4ad311b2f0d0dedd8b9bb')
 
 build() {
     cd SLADE-${pkgver}