[hedgewars] The ghc instance issue was fixed upstream

Bruno Wolff III bruno at fedoraproject.org
Sat Jan 3 22:37:23 UTC 2015


commit 317deaa3ec0956bb39c7e9ef394e3e4e8b87c737
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jan 3 13:23:38 2015 -0600

    The ghc instance issue was fixed upstream

 hedgewars-0.9.18-instance.patch |   10 ----------
 hedgewars.spec                  |    7 -------
 2 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/hedgewars.spec b/hedgewars.spec
index 072fc81..076f2b3 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -19,12 +19,6 @@ Patch0:         hedgewars-compiler-opts.patch
 Patch1:         hedgewars-no-bytestring.patch
 # Lua 5.2
 Patch2:		hedgewars-0.9.18-lua-5.2.patch
-# A ghc update is doing stricter checking that causes a fatal error.
-# This won't be needed in 0.9.19.
-# I am not sure if removing the extra definition is right, but if builds 
-# now, so I can do some more testing. But given it was probably wrong before 
-# and still worked, it has a reasonable chance of working.
-Patch3:		hedgewars-0.9.18-instance.patch
 # ghc does not support -dynamic on arm
 #Patch4:         hedgewars-0.9.18-no-dyn-haskell.patch
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
@@ -68,7 +62,6 @@ A standalone server that can be used for LAN play or a private internet server.
 #%patch0 -p1
 %patch1 -p0
 #%patch2 -p1 -b .lua-52
-#%patch3 -p0
 %ifarch %{arm}
 # ghc does not support -dynamic on arm
 #%patch4 -p1


More information about the scm-commits mailing list