[Pkg-haskell-commits] darcs: haskell-gtk3: Work around predefined "pixel" on some architectures (closes: #766831).

[Colin Watson]

Wed Dec  3 15:34:06 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Work around predefined "pixel" on some architectures (closes: #766831).

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

Wed Dec  3 15:34:06 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Work around predefined "pixel" on some architectures (closes: #766831).
diff -rN -u old-haskell-gtk3/changelog new-haskell-gtk3/changelog
--- old-haskell-gtk3/changelog	2014-12-03 15:50:05.148726539 +0000
+++ new-haskell-gtk3/changelog	2014-12-03 15:50:05.168726545 +0000
@@ -1,3 +1,9 @@
+haskell-gtk3 (0.12.5.6-3) UNRELEASED; urgency=medium
+
+  * Work around predefined "pixel" on some architectures (closes: #766831).
+
+ -- Colin Watson <cjwatson at debian.org>  Wed, 03 Dec 2014 15:32:46 +0000
+
 haskell-gtk3 (0.12.5.6-2) unstable; urgency=medium
 
   * Patched to Closes: #763221
diff -rN -u old-haskell-gtk3/patches/series new-haskell-gtk3/patches/series
--- old-haskell-gtk3/patches/series	2014-12-03 15:50:05.140726537 +0000
+++ new-haskell-gtk3/patches/series	2014-12-03 15:50:05.152726540 +0000
@@ -1 +1,2 @@
 bug-763221
+work-around-pixel-define.patch
diff -rN -u old-haskell-gtk3/patches/work-around-pixel-define.patch new-haskell-gtk3/patches/work-around-pixel-define.patch
--- old-haskell-gtk3/patches/work-around-pixel-define.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-gtk3/patches/work-around-pixel-define.patch	2014-12-03 15:50:05.152726540 +0000
@@ -0,0 +1,20 @@
+Description: Work around predefined "pixel" on some architectures
+ "pixel" is predefined on some architectures, confusing gtk2hsC2hs.
+ Explicitly undefine it to work around this.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2014-12-03
+
+Index: b/gtk3.cabal
+===================================================================
+--- a/gtk3.cabal
++++ b/gtk3.cabal
+@@ -386,6 +386,8 @@
+ 
+         pkgconfig-depends: gthread-2.0, gtk+-3.0
+ 
++        cpp-options: -Upixel
++
+ Executable gtk2hs-demo-actionMenu
+     hs-source-dirs: demo/actionMenu
+     main-is: ActionMenu.hs