[Pkg-haskell-commits] darcs: haskell-gtk: Patch by Colin Watson with workaround undefining pixel so gtk2hsC2hs will not break the build. Fixes ftbfs on ppc64el. (Closes: 762208)

[Joachim Breitner]

Fri Sep 19 19:48:32 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Patch by Colin Watson with workaround undefining pixel so gtk2hsC2hs will not break the build.  Fixes ftbfs on ppc64el. (Closes: 762208)

    M ./changelog +8
    A ./patches/
    A ./patches/series
    A ./patches/work-around-pixel-define.patch

Fri Sep 19 19:48:32 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Patch by Colin Watson with workaround undefining pixel so gtk2hsC2hs will not break the build.  Fixes ftbfs on ppc64el. (Closes: 762208)
diff -rN -u old-haskell-gtk/changelog new-haskell-gtk/changelog
--- old-haskell-gtk/changelog	2014-09-19 19:58:37.046786807 +0000
+++ new-haskell-gtk/changelog	2014-09-19 19:58:37.054786807 +0000
@@ -1,3 +1,11 @@
+haskell-gtk (0.12.5.6-1ppc64el1) UNRELEASED; urgency=medium
+
+  [ Fernando Seiti Furusato ]
+  * Patch by Colin Watson with workaround undefining pixel so gtk2hsC2hs will
+    not break the build.  Fixes ftbfs on ppc64el. (Closes: 762208)
+
+ -- Fernando Seiti Furusato <ferseiti at br.ibm.com>  Fri, 19 Sep 2014 13:42:30 +0000
+
 haskell-gtk (0.12.5.6-1) unstable; urgency=low
 
   * Adjust watch file to new hackage layout
diff -rN -u old-haskell-gtk/patches/series new-haskell-gtk/patches/series
--- old-haskell-gtk/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-gtk/patches/series	2014-09-19 19:58:37.050786807 +0000
@@ -0,0 +1 @@
+work-around-pixel-define.patch
diff -rN -u old-haskell-gtk/patches/work-around-pixel-define.patch new-haskell-gtk/patches/work-around-pixel-define.patch
--- old-haskell-gtk/patches/work-around-pixel-define.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-gtk/patches/work-around-pixel-define.patch	2014-09-19 19:58:37.050786807 +0000
@@ -0,0 +1,17 @@
+Description: Work around predefined "pixel" on some architectures
+ "pixel" is predefined on some Ubuntu architectures, confusing gtk2hsC2hs.
+ Explicitly undefine it to work around this.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2014-06-05
+
+Index: b/gtk.cabal
+===================================================================
+--- a/gtk.cabal
++++ b/gtk.cabal
+@@ -399,3 +399,5 @@
+           cc-options: -DGTK2HS_SET_FMODE_BINARY
+
+         pkgconfig-depends: gthread-2.0, gtk+-2.0
++
++        cpp-options: -Upixel