diff -Nru haskell-gtk-0.14.10/debian/changelog haskell-gtk-0.15.2/debian/changelog --- haskell-gtk-0.14.10/debian/changelog 2018-10-01 10:47:31.000000000 +0000 +++ haskell-gtk-0.15.2/debian/changelog 2019-08-29 14:21:32.000000000 +0000 @@ -1,3 +1,19 @@ +haskell-gtk (0.15.2-2) unstable; urgency=medium + + * Patch for newer glib + + -- Gianfranco Costamagna Thu, 29 Aug 2019 16:21:32 +0200 + +haskell-gtk (0.15.2-1) unstable; urgency=medium + + [ Dmitry Bogatov ] + * Add missing "Upstream-Name" field into "debian/copyright". + + [ Clint Adams ] + * New upstream release + + -- Clint Adams Thu, 01 Aug 2019 19:09:30 -0400 + haskell-gtk (0.14.10-3) unstable; urgency=medium * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3) diff -Nru haskell-gtk-0.14.10/debian/copyright haskell-gtk-0.15.2/debian/copyright --- haskell-gtk-0.14.10/debian/copyright 2018-07-04 14:04:33.000000000 +0000 +++ haskell-gtk-0.15.2/debian/copyright 2019-08-01 23:09:30.000000000 +0000 @@ -1,5 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://hackage.haskell.org/packages/archive/gtk/0.11.0/gtk-0.11.0.tar.gz +Upstream-Name: gtk Files: * Copyright: 2001-2010, The Gtk2Hs Team diff -Nru haskell-gtk-0.14.10/debian/patches/new-glib haskell-gtk-0.15.2/debian/patches/new-glib --- haskell-gtk-0.14.10/debian/patches/new-glib 1970-01-01 00:00:00.000000000 +0000 +++ haskell-gtk-0.15.2/debian/patches/new-glib 2019-08-29 14:21:28.000000000 +0000 @@ -0,0 +1,14 @@ +--- haskell-gtk-0.15.2.orig/gtk.cabal ++++ haskell-gtk-0.15.2/gtk.cabal +@@ -381,9 +381,9 @@ Library + -- needs to be imported from this module: + x-Signals-Import: Graphics.UI.Gtk.General.Threading + include-dirs: . +- cpp-options: -U__BLOCKS__ ++ cpp-options: -U__BLOCKS__ -D__attribute__(A)= + if os(darwin) || os(freebsd) +- cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull= ++ cpp-options: -D_Nullable= -D_Nonnull= + if !flag(deprecated) + cpp-options: -DDISABLE_DEPRECATED + else diff -Nru haskell-gtk-0.14.10/debian/patches/series haskell-gtk-0.15.2/debian/patches/series --- haskell-gtk-0.14.10/debian/patches/series 2016-06-11 16:29:35.000000000 +0000 +++ haskell-gtk-0.15.2/debian/patches/series 2019-08-29 14:21:24.000000000 +0000 @@ -1 +1,2 @@ work-around-pixel-define.patch +new-glib diff -Nru haskell-gtk-0.14.10/Graphics/UI/Gtk/Abstract/Widget.chs haskell-gtk-0.15.2/Graphics/UI/Gtk/Abstract/Widget.chs --- haskell-gtk-0.14.10/Graphics/UI/Gtk/Abstract/Widget.chs 2018-05-18 23:51:18.000000000 +0000 +++ haskell-gtk-0.15.2/Graphics/UI/Gtk/Abstract/Widget.chs 1970-01-01 00:00:00.000000000 +0000 @@ -706,7 +706,7 @@ -- or 'Graphics.Rendering.Cairo.setMatrix' and clip region with -- 'Graphics.Rendering.Cairo.clip' prior to calling this function. Also, it -- is fine to modify the context with 'Graphics.Rendering.Cairo.save' and --- 'Graphics.Rendering.Cairo.pushGroup prior to calling this function. +-- 'Graphics.Rendering.Cairo.pushGroup' prior to calling this function. -- -- Note that special-purpose widgets may contain special code for rendering -- to the screen and might appear differently on screen and when rendered diff -Nru haskell-gtk-0.14.10/gtk.cabal haskell-gtk-0.15.2/gtk.cabal --- haskell-gtk-0.14.10/gtk.cabal 2018-05-18 23:51:19.000000000 +0000 +++ haskell-gtk-0.15.2/gtk.cabal 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +1,5 @@ Name: gtk -Version: 0.14.10 +Version: 0.15.2 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -135,7 +135,7 @@ custom-setup setup-depends: base >= 4.6, - Cabal >= 1.24 && < 2.3, + Cabal >= 1.24 && < 2.5, gtk2hs-buildtools >= 0.13.2.0 && < 0.14 Library