Update wxgtk dependency in slade.

5 files changed, 123 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d20183270a41..c369783d9387 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slade
 	pkgdesc = SLADE3 Doom editor.
 	pkgver = 3.1.0_b3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://slade.mancubus.net/
 	arch = i686
 	arch = x86_64
@@ -14,10 +14,16 @@ pkgbase = slade
 	depends = ftgl
 	depends = libmodplug
 	depends = sfml
-	depends = wxgtk2.9
+	depends = wxgtk>=3.0
 	source = https://github.com/sirjuddington/SLADE/archive/3.1.0_b3.tar.gz
+	source = git-76d98460.patch
+	source = git-df5cd54e.patch
+	source = git-54f7e8cb.patch
 	source = slade.desktop
 	md5sums = 121cdfac8f829904e6293842fefd4775
+	md5sums = 46f472e312593da775779ebb0998ece6
+	md5sums = a08cfe25732ea04c9340b9189a857e7a
+	md5sums = 358d0b8f5abef1c8f974dac37cae97cc
 	md5sums = 49eb1692463e2aa93ea2754a5df7a6e4
 
 pkgname = slade
diff --git a/PKGBUILD b/PKGBUILD
index b2112815b8bb..addce7579089 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,36 @@
 
 pkgname=slade
 pkgver=3.1.0_b3
-pkgrel=1
+pkgrel=2
 pkgdesc="SLADE3 Doom editor."
 arch=('i686' 'x86_64')
 url="http://slade.mancubus.net/"
 license=('GPL')
-depends=('fluidsynth' 'freeimage' 'ftgl' 'libmodplug' 'sfml' 'wxgtk2.9')
+depends=('fluidsynth' 'freeimage' 'ftgl' 'libmodplug' 'sfml' 'wxgtk>=3.0')
 makedepends=('cmake' 'imagemagick' 'zip')
 source=(https://github.com/sirjuddington/SLADE/archive/$pkgver.tar.gz
+        git-76d98460.patch
+        git-df5cd54e.patch
+        git-54f7e8cb.patch
         slade.desktop)
 md5sums=('121cdfac8f829904e6293842fefd4775'
+         '46f472e312593da775779ebb0998ece6'
+         'a08cfe25732ea04c9340b9189a857e7a'
+         '358d0b8f5abef1c8f974dac37cae97cc'
          '49eb1692463e2aa93ea2754a5df7a6e4')
 
+prepare() {
+  cd SLADE-$pkgver
+
+  patch -p1 <"$srcdir/git-76d98460.patch"
+  patch -p1 <"$srcdir/git-df5cd54e.patch"
+  patch -p1 <"$srcdir/git-54f7e8cb.patch"
+}
+
 build() {
   cd SLADE-$pkgver
 
-  cmake -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9 \
-        -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc-2.9 \
-        -DCMAKE_CXX_FLAGS=-DNDEBUG \
+  cmake -DCMAKE_CXX_FLAGS=-DNDEBUG \
         .
   make
 
diff --git a/git-54f7e8cb.patch b/git-54f7e8cb.patch
new file mode 100644
index 000000000000..8cbf12769661
--- /dev/null
+++ b/git-54f7e8cb.patch
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 000000000000..bfd24ef85643
--- /dev/null
+++ b/git-76d98460.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..afd8c990e78a
--- /dev/null
+++ b/git-df5cd54e.patch
@@ -0,0 +1,25 @@
+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
+