Include the fix for Setup's help URL to the level warp

3 files changed, 62 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7698cd81931f..8fee1bf9cdc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chocolate-doom
 	pkgdesc = Historically-accurate Doom, Heretic, Hexen, and Strife ports.
 	pkgver = 2.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.chocolate-doom.org/
 	arch = i686
 	arch = x86_64
@@ -11,7 +11,9 @@ pkgbase = chocolate-doom
 	depends = sdl_mixer
 	depends = sdl_net
 	source = http://chocolate-doom.org/downloads/2.2.0/chocolate-doom-2.2.0.tar.gz
+	source = 0001-setup-Fix-help-URL-for-level-warp-menu.patch
 	sha256sums = 9fa9c56e72f8a04adf8f0800141192e9bafd38c9e424f70942ece6e515570173
+	sha256sums = f890dac486a77ace888e18419e0a3f95c2ff59fab9bea08eb92558c3d7320e50
 
 pkgname = chocolate-doom
 	pkgdesc = Doom port accurately reproducing the original DOS EXEs.
diff --git a/0001-setup-Fix-help-URL-for-level-warp-menu.patch b/0001-setup-Fix-help-URL-for-level-warp-menu.patch
new file mode 100644
index 000000000000..cd1888994753
--- /dev/null
+++ b/0001-setup-Fix-help-URL-for-level-warp-menu.patch
@@ -0,0 +1,46 @@
+From bed0ff13bf09b3c6190f9ff0cf6f7182a96a0faf Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Wed, 10 Jun 2015 22:38:19 -0400
+Subject: [PATCH] setup: Fix help URL for level warp menu.
+
+The help URL for the warp menu was linking to the multiplayer start
+game menu.
+---
+ src/setup/multiplayer.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
+index a36f4da..3fe6a82 100644
+--- a/src/setup/multiplayer.c
++++ b/src/setup/multiplayer.c
+@@ -37,6 +37,7 @@
+ #define MULTI_START_HELP_URL "http://www.chocolate-doom.org/setup-multi-start"
+ #define MULTI_JOIN_HELP_URL "http://www.chocolate-doom.org/setup-multi-join"
+ #define MULTI_CONFIG_HELP_URL "http://www.chocolate-doom.org/setup-multi-config"
++#define LEVEL_WARP_HELP_URL "http://www.chocolate-doom.org/setup-level-warp"
+ 
+ #define NUM_WADS 10
+ #define NUM_EXTRA_PARAMS 10
+@@ -715,9 +716,17 @@ static void StartGameMenu(char *window_title, int multiplayer)
+     txt_widget_t *iwad_selector;
+ 
+     window = TXT_NewWindow(window_title);
+-    TXT_SetWindowHelpURL(window, MULTI_START_HELP_URL);
+ 
+-    TXT_AddWidgets(window, 
++    if (multiplayer)
++    {
++        TXT_SetWindowHelpURL(window, MULTI_START_HELP_URL);
++    }
++    else
++    {
++        TXT_SetWindowHelpURL(window, LEVEL_WARP_HELP_URL);
++    }
++
++    TXT_AddWidgets(window,
+                    gameopt_table = TXT_NewTable(2),
+                    TXT_NewSeparator("Monster options"),
+                    TXT_NewInvertedCheckBox("Monsters enabled", &nomonsters),
+-- 
+2.4.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 6ffa5895080b..9e0dadf7c224 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,28 @@ pkgname=(chocolate-{doom,heretic,hexen,strife,common})
 pkgbase=${pkgname[0]}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
 depends=('libsamplerate' 'sdl_mixer' 'sdl_net')
 makedepends=('python')
-source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('9fa9c56e72f8a04adf8f0800141192e9bafd38c9e424f70942ece6e515570173')
+source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz
+        0001-setup-Fix-help-URL-for-level-warp-menu.patch)
+sha256sums=('9fa9c56e72f8a04adf8f0800141192e9bafd38c9e424f70942ece6e515570173'
+            'f890dac486a77ace888e18419e0a3f95c2ff59fab9bea08eb92558c3d7320e50')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
 
+  for patch in ../*.patch; do
+    if [ ! -f "$patch" ]; then
+      break;
+    else
+      patch -p1 -i "$patch"
+    fi
+  done
+
   # Change binary dir from /usr/games to /usr/bin
   sed 's|/games|/bin|g' -i src{,/setup}/Makefile.in
 }