diff options
author | Will Thompson <will@willthompson.co.uk> | 2012-01-23 09:38:11 +0000 |
---|---|---|
committer | Will Thompson <will@willthompson.co.uk> | 2012-01-23 09:38:11 +0000 |
commit | 581838ca4fa91fa7add0f3a7c22c867de3e21f62 (patch) | |
tree | be6565e2e838b3d606d4ca1d5f1b7cb156688789 | |
parent | 267ef5408b5f392c3db133de5b38b3b77af0138b (diff) |
Depend on gtk2hs ≥ 0.12
We need this for GtkBuilder support. This change means that Ubuntu Natty
users can no longer compile Bustle from source; but they should still be
able to run the binary packages.
https://bugs.freedesktop.org/show_bug.cgi?id=38672
-rw-r--r-- | Bustle/Diagram.hs | 6 | ||||
-rw-r--r-- | Bustle/Markup.hs | 7 | ||||
-rw-r--r-- | bustle.cabal | 72 |
3 files changed, 22 insertions, 63 deletions
diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs index 30f8bbc..f8c827d 100644 --- a/Bustle/Diagram.hs +++ b/Bustle/Diagram.hs @@ -16,7 +16,6 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -} -{-# LANGUAGE CPP #-} module Bustle.Diagram ( Diagram @@ -58,13 +57,8 @@ import Control.Monad.Reader import Graphics.Rendering.Cairo import Graphics.UI.Gtk.Cairo (cairoCreateContext, showLayout) -#if MIN_VERSION_gtk(0,11,0) import Graphics.Rendering.Pango.Layout import Graphics.Rendering.Pango.Font -#else -import Graphics.UI.Gtk.Pango.Layout -import Graphics.UI.Gtk.Pango.Font -#endif import qualified Bustle.Markup as Markup import Bustle.Markup (Markup) diff --git a/Bustle/Markup.hs b/Bustle/Markup.hs index 8d06d2e..5751655 100644 --- a/Bustle/Markup.hs +++ b/Bustle/Markup.hs @@ -16,7 +16,6 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -} -{-# LANGUAGE CPP #-} module Bustle.Markup ( Markup , unMarkup @@ -34,15 +33,9 @@ where import Data.Monoid -#if MIN_VERSION_gtk(0,11,0) import Graphics.Rendering.Pango.BasicTypes (Weight(..)) import Graphics.Rendering.Pango.Layout (escapeMarkup) import Graphics.Rendering.Pango.Markup (markSpan, SpanAttribute(..)) -#else -import Graphics.UI.Gtk.Pango.BasicTypes (Weight(..)) -import Graphics.UI.Gtk.Pango.Layout (escapeMarkup) -import Graphics.UI.Gtk.Pango.Markup (markSpan, SpanAttribute(..)) -#endif newtype Markup = Markup { unMarkup :: String } deriving (Show, Read, Ord, Eq) diff --git a/bustle.cabal b/bustle.cabal index 04c01b3..cf9ca20 100644 --- a/bustle.cabal +++ b/bustle.cabal @@ -38,11 +38,6 @@ Source-Repository head Type: git Location: git://anongit.freedesktop.org/bustle -Flag PostCabalizedGtk2HS - Description: Build against recent gtk2hs, with reorganized packaging and - module names - Default: True - Flag InteractiveTests Description: Build interactive test programs Default: False @@ -80,51 +75,28 @@ Executable bustle C-sources: c-sources/pcap-monitor.c pkgconfig-depends: glib-2.0 - if flag(PostCabalizedGtk2HS) - -- Since gtk2hs 0.11, pango is a separate package, and its module names - -- have changed. - Build-Depends: base >= 4 && < 5 - , binary - , bytestring - , cairo - , containers - , dbus-core == 0.9.* - , directory - , filepath - , glade - , glib - , gtk > 0.11 - , haskell98 - , mtl - , pango - , parsec - , pcap - , process - , text - , time - else - Build-Depends: base >= 4 && < 5 - , binary - , bytestring - , cairo - , containers - , dbus-core == 0.9.* - , directory - , filepath - , glade - , glib - , gtk > 0.10 && < 0.11 - , haskell98 - , mtl - , pango - , parsec - , pcap - , process - , text - , time + Build-Depends: base >= 4 && < 5 + , binary + , bytestring + , cairo + , containers + , dbus-core == 0.9.* + , directory + , filepath + , glade + , glib + , gtk > 0.12 + , haskell98 + , mtl + , pango + , parsec + , pcap + , process + , text + , time Executable test-monitor - if flag(InteractiveTests) && flag(PostCabalizedGtk2HS) + if flag(InteractiveTests) buildable: True else buildable: False @@ -135,11 +107,11 @@ Executable test-monitor C-sources: c-sources/pcap-monitor.c pkgconfig-depends: glib-2.0 Build-Depends: base >= 4 && < 5 - , gtk > 0.11 + , gtk > 0.12 , glib Executable dump-messages - if flag(InteractiveTests) && flag(PostCabalizedGtk2HS) + if flag(InteractiveTests) buildable: True else buildable: False |