diff -pruN 0.12.1-4/debian/changelog 0.12.1-4ubuntu1/debian/changelog --- 0.12.1-4/debian/changelog 2013-05-25 21:52:19.000000000 +0000 +++ 0.12.1-4ubuntu1/debian/changelog 2014-06-05 09:56:50.000000000 +0000 @@ -1,3 +1,9 @@ +haskell-gtkglext (0.12.1-4ubuntu1) utopic; urgency=medium + + * Work around predefined "pixel" on some architectures. + + -- Colin Watson Thu, 05 Jun 2014 10:56:50 +0100 + haskell-gtkglext (0.12.1-4) unstable; urgency=low * Move Haskell blurb to the end of the description, reduces the impact diff -pruN 0.12.1-4/debian/control 0.12.1-4ubuntu1/debian/control --- 0.12.1-4/debian/control 2013-05-25 21:42:45.000000000 +0000 +++ 0.12.1-4ubuntu1/debian/control 2014-06-05 09:56:49.000000000 +0000 @@ -1,7 +1,8 @@ Source: haskell-gtkglext Section: haskell Priority: extra -Maintainer: Debian Haskell Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Haskell Group Uploaders: Marco Túlio Gontijo e Silva Build-Depends: debhelper (>= 9) , cdbs diff -pruN 0.12.1-4/debian/patches/series 0.12.1-4ubuntu1/debian/patches/series --- 0.12.1-4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.1-4ubuntu1/debian/patches/series 2014-06-05 09:55:59.000000000 +0000 @@ -0,0 +1 @@ +work-around-pixel-define.patch diff -pruN 0.12.1-4/debian/patches/work-around-pixel-define.patch 0.12.1-4ubuntu1/debian/patches/work-around-pixel-define.patch --- 0.12.1-4/debian/patches/work-around-pixel-define.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.1-4ubuntu1/debian/patches/work-around-pixel-define.patch 2014-06-05 09:56:36.000000000 +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 +Forwarded: no +Last-Update: 2014-06-05 + +Index: b/gtkglext.cabal +=================================================================== +--- a/gtkglext.cabal ++++ b/gtkglext.cabal +@@ -71,3 +71,5 @@ + x-c2hs-Header: gtk/gtkgl.h + x-Types-Tag: gtkglext + pkgconfig-depends: gtkglext-1.0 >= 1.0.5 ++ ++ cpp-options: -Upixel diff -pruN 0.12.1-4/gtkglext.cabal 0.12.1-4ubuntu1/gtkglext.cabal --- 0.12.1-4/gtkglext.cabal 2011-09-12 11:45:30.000000000 +0000 +++ 0.12.1-4ubuntu1/gtkglext.cabal 2014-07-05 14:24:41.000000000 +0000 @@ -71,3 +71,5 @@ Library x-c2hs-Header: gtk/gtkgl.h x-Types-Tag: gtkglext pkgconfig-depends: gtkglext-1.0 >= 1.0.5 + + cpp-options: -Upixel diff -pruN 0.12.1-4/.pc/applied-patches 0.12.1-4ubuntu1/.pc/applied-patches --- 0.12.1-4/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.1-4ubuntu1/.pc/applied-patches 2014-07-05 14:24:41.290491282 +0000 @@ -0,0 +1 @@ +work-around-pixel-define.patch diff -pruN 0.12.1-4/.pc/work-around-pixel-define.patch/gtkglext.cabal 0.12.1-4ubuntu1/.pc/work-around-pixel-define.patch/gtkglext.cabal --- 0.12.1-4/.pc/work-around-pixel-define.patch/gtkglext.cabal 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.1-4ubuntu1/.pc/work-around-pixel-define.patch/gtkglext.cabal 2011-09-12 11:45:30.000000000 +0000 @@ -0,0 +1,73 @@ +Name: gtkglext +Version: 0.12.1 +License: LGPL-2.1 +License-file: COPYING +Copyright: (c) 2001-2010 The Gtk2Hs Team +Author: Duncan Coutts +Maintainer: gtk2hs-users@lists.sourceforge.net +Build-Type: Custom +Cabal-Version: >= 1.8 +Stability: provisional +homepage: http://projects.haskell.org/gtk2hs/ +bug-reports: http://hackage.haskell.org/trac/gtk2hs/ +Synopsis: Binding to the GTK+ OpenGL Extension +Description: GtkGLExt provides the GDK objects to support OpenGL rendering in GTK+, + and GtkWidget API add-ons to make GTK+ widgets OpenGL-capable. + +Category: Graphics +Tested-With: GHC == 6.10.4, GHC == 6.12.3, GHC == 7.0.4, GHC == 7.2.1 +Extra-Source-Files: SetupWrapper.hs SetupMain.hs Gtk2HsSetup.hs + hierarchy.list + +x-Types-File: Graphics/UI/Gtk/OpenGL/Types.chs +x-Types-ModName: Graphics.UI.Gtk.OpenGL.Types +x-Types-Forward: *Graphics.UI.GtkInternals +x-Types-Destructor: objectUnrefFromMainloop +x-Types-Hierarchy: hierarchy.list + +Data-Dir: demo +Data-Files: RotatingCube.hs + Makefile + +Source-Repository head + type: darcs + location: http://code.haskell.org/gtkglext/ + +Flag have-quartz-gtk + Description: Assume that the installed GTK is the version for OS X backend by Quartz, and hence does not provide gdk_gl_config_get_screen or gdk_gl_config_get_depth + Default: False + +Flag use-deprecated + Description: Use functions from gtkglext-1.2.0 (or earlier) which have been deprecated or dropped + Default: False + +Library + build-depends: base >= 4 && < 5, + glib >= 0.12 && < 0.13, + pango >= 0.12 && < 0.13, + gtk >= 0.12 && < 0.13 + if flag(have-quartz-gtk) + cpp-options: -DHAVE_QUARTZ_GTK + if flag(use-deprecated) + cpp-options: -DUSE_DEPRECATED_PANGO + + build-tools: gtk2hsC2hs >= 0.13.5, + gtk2hsHookGenerator, gtk2hsTypeGen + + exposed-modules: + Graphics.UI.Gtk.OpenGL + Graphics.UI.Gtk.OpenGL.Config + Graphics.UI.Gtk.OpenGL.Context + Graphics.UI.Gtk.OpenGL.Drawable + Graphics.UI.Gtk.OpenGL.DrawingArea + Graphics.UI.Gtk.OpenGL.General + Graphics.UI.Gtk.OpenGL.Pixmap + Graphics.UI.Gtk.OpenGL.Window + other-modules: + Graphics.UI.Gtk.OpenGL.Types + + extensions: ForeignFunctionInterface + + x-c2hs-Header: gtk/gtkgl.h + x-Types-Tag: gtkglext + pkgconfig-depends: gtkglext-1.0 >= 1.0.5