rpms/gtk2hs/devel gtk2hs-fasm-0.9.13.patch, NONE, 1.1 gtk2hs.spec, 1.40, 1.41 gtk2hs-gtype-cuint.patch, 1.1, NONE

Bryan O'Sullivan (bos) fedora-extras-commits at redhat.com
Mon Jul 14 14:12:07 UTC 2008


Author: bos

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27773

Modified Files:
	gtk2hs.spec 
Added Files:
	gtk2hs-fasm-0.9.13.patch 
Removed Files:
	gtk2hs-gtype-cuint.patch 
Log Message:
Try to fix ppc build


gtk2hs-fasm-0.9.13.patch:

--- NEW FILE gtk2hs-fasm-0.9.13.patch ---
--- gtk2hs-0.9.13/Makefile.am.orig	2008-07-14 07:06:04.000000000 -0700
+++ gtk2hs-0.9.13/Makefile.am	2008-07-14 07:06:05.000000000 -0700
@@ -217,7 +217,7 @@
 tools_c2hs_base_general_Binary_hs_HCFLAGS = -O -funbox-strict-fields
 tools_c2hs_base_general_FastMutInt_hs_HCFLAGS = -O
 tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts
-tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \
+tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi \
 	'-\#include<c2hs_config.h>'
 
 tools/c2hs/c/CLexer.hs : tools/c2hs/c/CLexer.x


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gtk2hs.spec	14 Jul 2008 11:47:23 -0000	1.40
+++ gtk2hs.spec	14 Jul 2008 14:11:32 -0000	1.41
@@ -11,7 +11,7 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
 Version:        0.9.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -20,6 +20,7 @@
 License:        LGPLv2+
 Group:          Development/Libraries
 Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
+Patch0:         gtk2hs-fasm-0.9.13.patch
 URL:            http://gtk2hs.sourceforge.net/
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
 ExcludeArch:	alpha ppc64
@@ -122,6 +123,7 @@
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}}
+%patch0 -p1 -b .fasm
 
 
 %build
@@ -304,6 +306,9 @@
 
 
 %changelog
+* Mon Jul 14 2008 Bryan O'Sullivan <bos at serpentine.com> - 0.9.13-2
+- Try to fix ppc build due to ghc 6.8.3 -fvia-C bug
+
 * Mon Jul 14 2008 Bryan O'Sullivan <bos at serpentine.com> - 0.9.13-1
 - Update to 0.9.13
 


--- gtk2hs-gtype-cuint.patch DELETED ---




More information about the scm-commits mailing list