[kaya/f14/master] - Try to fix FTBFS (#660866)

[Jochen Schmitt]

commit 51cc47960e739c224f0ebbc0b01bf3f8fd7ef8b5
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Dec 7 19:42:50 2010 +0100

    - Try to fix FTBFS (#660866)

 kaya-0.5.2-codegen.patch |   21 +++++++++++++++++++++
 kaya.spec                |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/kaya-0.5.2-codegen.patch b/kaya-0.5.2-codegen.patch
new file mode 100644
index 0000000..228532d
--- /dev/null
+++ b/kaya-0.5.2-codegen.patch
@@ -0,0 +1,21 @@
+diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc7 kaya-0.5.2/compiler/CodegenCPP.hs
+--- kaya-0.5.2/compiler/CodegenCPP.hs.ghc7	2010-12-01 17:13:57.989909984 +0100
++++ kaya-0.5.2/compiler/CodegenCPP.hs	2010-12-01 17:15:26.590910022 +0100
+@@ -1,3 +1,4 @@
++
+ {-
+     Kaya - My favourite toy language.
+     Copyright (C) 2004, 2005 Edwin Brady
+@@ -386,10 +387,10 @@ mkfcall n lib ty args res 
+       (conv ty) ++ "("++n++"("++stackconv 0 args++")))"
+  where
+     popvals n 0 = ""
+-    popvals n (a+1) = 
++    popvals n a = 
+ 		    -- "HEAPVAL("++show (tmpval n)++"); " ++ 
+                     "POPARG(" ++ show (tmpval n) ++ "); " ++
+-                    popvals (n+1) a
++                    popvals (n+1) (a-1)
+ 
+ {- CIM 12/7/05 changed to KVOID to avoid clashes with MinGW -}
+     conv (Prim Void) = "KVOID("
diff --git a/kaya.spec b/kaya.spec
index 92521dd..9a349bc 100644
--- a/kaya.spec
+++ b/kaya.spec
@@ -4,7 +4,7 @@
 
 Name:		kaya
 Version:	0.5.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A Statically typed, imperative programming-language
 
 Group:		Development/Languages
@@ -19,6 +19,7 @@ Patch2:	        kaya-0.5.2-ghc612.patch
 # will be send to upstream
 Patch3:		kaya-0.5.2-gc.patch
 Patch4:		kaya-0.5.2-dyn.patch
+Patch5:		kaya-0.5.2-codegen.patch
 
 #
 # ghc is not supported on alpha and ppc64
@@ -65,6 +66,7 @@ Additional you may find samples for this language.
 %patch2 -p1 -b .ghc621
 %patch3 -p1 -b .gc
 %patch4 -p1 -b .dyn
+%patch5 -p1 -b .dcodegen
 
 %build
 autoconf
@@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/ docs/
 
 %changelog
+* Tue Dec  7 2010 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-8
+- Try to fix FTBFS (#660866)
+
 * Wed May  5 2010 Jochen Schmitt <Jochen herr-schmitt de> 0.5.2-6
 - Fix GC-API issue and ImplicitDSOLining failure (#555493)