diff --git a/ghc-gtk.spec b/ghc-gtk.spec index 20eeba7..11616d4 100644 --- a/ghc-gtk.spec +++ b/ghc-gtk.spec @@ -29,6 +29,7 @@ BuildRequires: ghc-gio-prof BuildRequires: ghc-glib-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-pango-prof +Patch1: gtk-gthread.h-include.patch %description %{common_description} @@ -36,7 +37,7 @@ BuildRequires: ghc-pango-prof %prep %setup -q -n %{pkg_name}-%{version} - +%patch1 -p1 -b .orig %build %ghc_lib_build @@ -67,6 +68,7 @@ Obsoletes: ghc-gtkglext-prof < 0.11, ghc-soegtk-prof < 0.11, ghc-vte-prof < 0.11 %changelog * Fri Jan 6 2012 Jens Petersen - 0.12.2-1 - update to 0.12.2 and cabal2spec-0.25.2 +- workaround gthread.h error "Only can be included directly." * Thu Oct 20 2011 Marcela Mašláňová - 0.12.1-1.2 - rebuild with new gmp without compat lib diff --git a/gtk-gthread.h-include.patch b/gtk-gthread.h-include.patch new file mode 100644 index 0000000..fc600d6 --- /dev/null +++ b/gtk-gthread.h-include.patch @@ -0,0 +1,15 @@ +diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c +--- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 ++++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 +@@ -26,7 +26,8 @@ + */ + + #include +-#include ++/* f17 gives Error "Only can be included directly." ++ #include */ + #include + #include "hsgthread.h" + + +Diff finished. Sun Jan 8 14:58:54 2012