From 4c1d56b7a917787e89ab2ea1953ee2ae9c75722b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 4 Jan 2015 22:24:17 +0000 Subject: [PATCH] Version bump (also fixes bug #533766 by Francesco Riosa which ports bustle to dev-haskell/gtk-0.13). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA --- dev-util/bustle/ChangeLog | 11 +- dev-util/bustle/Manifest | 23 +-- dev-util/bustle/bustle-0.4.7-r1.ebuild | 71 ++++++++ .../bustle/files/bustle-0.4.7-gtk-0.13.patch | 172 ++++++++++++++++++ 4 files changed, 260 insertions(+), 17 deletions(-) create mode 100644 dev-util/bustle/bustle-0.4.7-r1.ebuild create mode 100644 dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch diff --git a/dev-util/bustle/ChangeLog b/dev-util/bustle/ChangeLog index 46e2ade32180..198108bf15d9 100644 --- a/dev-util/bustle/ChangeLog +++ b/dev-util/bustle/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/bustle -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.24 2014/02/02 11:14:03 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.25 2015/01/04 22:24:16 slyfox Exp $ + +*bustle-0.4.7-r1 (04 Jan 2015) + + 04 Jan 2015; Sergei Trofimovich +bustle-0.4.7-r1.ebuild, + +files/bustle-0.4.7-gtk-0.13.patch: + Version bump (also fixes bug #533766 by Francesco Riosa which ports bustle to + dev-haskell/gtk-0.13). 02 Feb 2014; Agostino Sarubbo bustle-0.4.2-r1.ebuild: Stable for sparc, wrt bug #488808 diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest index 9fef026d485e..73d7b3d621c1 100644 --- a/dev-util/bustle/Manifest +++ b/dev-util/bustle/Manifest @@ -7,32 +7,25 @@ AUX bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch 2003 SHA256 192f5ec3718b AUX bustle-0.4.0-ghc-7.4.patch 1343 SHA256 658e19353f171a27fdd7aba37cdf14899da9c1fcf6e9a4eda15452f468661071 SHA512 f78b0042375241c948fb8389db956f93ca33188ba5fb2b40e10505caa023a97028b372d9f89d83290f86efde65fb0ed894d7cdc7e11032b128dd6a0b88e358c6 WHIRLPOOL 1ac0ef7060a5d24cfdc188ebc0447d70a3e91d5c4d8a5c12ced423652da0435fb5b1ebc135e4481cf1998207dcdf5f75f24848222c4dde4a6bdca24d2338a265 AUX bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch 2341 SHA256 c8eefa55f67dd26cbd181abc1f7290c52b5aa0ea946c5fe145e4acfceaaeb9cb SHA512 607d2eb9fb2dfff04cf13d33bb89f9410aa5c1086484c0723b6ed6a798bcc482b2a58af0c1603dbd699d65c0995d8675ea961b3244183122f185d1dd16f3c999 WHIRLPOOL 9bc49665897dbae7348460f49a84bf5529c7df7d97471c02a33beca22601f52251768537ce4a139a4c9a229d8b3d279b1daf721aa71131c6fa71cfe7bf7efe4e AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 SHA256 2ab67f33ffa069c15214f6c08918a2caacefbc0c4a920660340c4837dd32e641 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588 WHIRLPOOL 2075edc5fd7f0b43b86bf1c71b9cc23fff136c888f169f4710715dd0cbba41bcf613f44f094c3a2fb633554b4401f79a7914dd937cdf750da5e925f635ec8551 +AUX bustle-0.4.7-gtk-0.13.patch 6428 SHA256 0d6654717a4fe09f323aa9a6a522874c790a5f046be9a0084730ee89b96981c6 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff WHIRLPOOL 3ae726c122785b4dda2f3c85b1f1683db4a0f4f6a18161d04fe341d2e3fbd2e992f4855a47981427f342fcb67d81947270d8f6dbe3c19dd43195cf57ca2d0092 DIST bustle-0.2.3.tar.gz 39314 SHA256 2a2d0633d6a0714c845715f6aa4392b08d1d241187f22b27122bb1bfcbf6d23a SHA512 ef45b13e10d934da1dad68e61a8ff99a4f45c79c5ad362134546ecf5533703e93453a9357a40f9cc5a26d3a8873f09dc8e1d8053f8403c535ae8227bf2e4bbcd WHIRLPOOL 53bfec22bf71d8a1ad7b56a6c4e05a3ba2ed9b92d68feab1355e5f8fb393749523ed45b9516978073f455250aade62582a41a0eee1e5634e45d88cbb7483fa5e DIST bustle-0.4.0-tests.tar.gz 8340 SHA256 7e4c354479edc835457fdecc89ab7fc5e1087ab4637b7b1ac6fadfe860190fbe SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1 WHIRLPOOL 6591ed10c75ef044375bf5e80719aac4a40244f647c4045f45811c9e8736afaafa5b83b92803ef8912c2ecfe9672ac20734fc954ab2bb09cff2842c1e6b4fe5a DIST bustle-0.4.0.tar.gz 89873 SHA256 a48acd215f918381b96d6a7fc60528d6f30a982bfc529c329f890485680d2549 SHA512 5a8078976bb85b9f3674a7d8914729710e69c5db7779e012659bab4064d1f170508f7b8e45575d5b40abd48b4054e6e06d89b450320c69d22a841ba54bceb200 WHIRLPOOL a55946ffa82275a9aa556f88b4112be153ab8fa3407565f3849253a5d6ccf863f1262313fe3b356806f5b552c23a14595ce296a69cd1a30af6aafce6054c3321 DIST bustle-0.4.2.tar.gz 95707 SHA256 bf03fb0a14a2559b6abe4cfeb673b30d86a31a89fb45883d7594644afc434cee SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562 WHIRLPOOL ebc31713bb202f247a38ed04357598ba9951f72a3fa18b679d83a3ce088dd8a144d7ee5a772ce02715dd735907ba2219541e971d5b1f3a16eb21d22ab1600753 DIST bustle-0.4.3.tar.gz 96970 SHA256 255e035a8b494f7edd21e657c246be00da1452faa2341abccebd53e8f333e9d1 SHA512 263c929a38ffa8c0df03deb9736879d1fbc630f1dcd47183cc304495cb6d5d2fbdb01e4b83e25712ad13d57662d41d0eee35495b76ca52484b9b2352dfde1bdb WHIRLPOOL fe434e7468132e3ecca848bdc09db3bd6d3191ca7fb720fabab48e6181983e6a6facc437421ba4eaea3e17815ac0527e3c0bd648ff449f5fb02212c920c40ff4 +DIST bustle-0.4.7.tar.gz 114231 SHA256 08b12207561157e639bc64e0b274e70e4909f50079cd97564c916d66a3f088b9 SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd WHIRLPOOL 8f6a80b881b9c13498351e2dc4910406dc151db9c320b8fba291c9577b41eede58003b943de13bf637d28226e7301e4dfdc8f2b6a0fa4fda2792962505fd0153 EBUILD bustle-0.2.3.ebuild 1456 SHA256 cb9d90768b6f240b84726b385afd14bf6ae6b6e21e8476396b89cd94cdb3e789 SHA512 3af6bea2a573bf57ce0be8bc7ede67972f69ab2c50784e8a05c90fa0f3b261fece076f76bfe91b12f4ab5675ce1f53473b04c57c92808cce390fce78032733c4 WHIRLPOOL ed99b28771df4b4c090044e7af38e809c1ddbd9f4522a67f3b69e634cfc11cdf34f2a04e3a5a333d749a572430a3649a84246d3dd30c306f8a068260ea960f4d EBUILD bustle-0.4.0.ebuild 1822 SHA256 3580557331d2a5873774f3e3a9b44ada691e4376e91919ea0cc1e121fd199203 SHA512 f5566f0daaa082d80ef5c06f62ae26ad451166650cdb954a68e286c2a4e7c243d83739d96cd43ace04c86311cbc07ad495577da0d1c70ebd98a92a80ca8c628f WHIRLPOOL 19362def3ae3b46b7256dbb4b3ce02e35ac326b5d52133330b3bd06b3a2fef4f02de2291d3b22ad5deac9e5cfa7b1d4683008f1f913036f9bfbf3ac62d226f41 EBUILD bustle-0.4.2-r1.ebuild 1672 SHA256 ed116fc750dd19674c7ab83b5ead016f1f8b0f4400a6cf925eaac91b43241612 SHA512 a74bc4cbc6cf5aeb1ad890d61280208af001482aa722e36e8d665f5185cbb8db87f213dbaf2ccb1536a294de6a2e756cbf3a183e7b175e12b2b76b15f9096b6b WHIRLPOOL bc31930b47e2318139276877acc4d0436b63a1760da21618ec1950f6c5daebd12c501d792d1f585dff502b3265a4dd943f7d3b836bc9812d736be00eb4e9a1cc EBUILD bustle-0.4.2.ebuild 1677 SHA256 534b96ff8b5c2f657fdc77e4c8e920553b488af96762fa0bf387cbd50d602e29 SHA512 224ae6430fb326d22f00607c53ea60dc5c826fe349bc7f1502c11e42b9f427ac9defdd84d1ae757014ec4453de29bdf11b0f2e62d190f75480c9ad3b39781733 WHIRLPOOL 8a452daaf8bf5838f43de5b940a125bf82fa4c74f5aabc61b2488bed643293be71b688140d5fade97dcda09eb7f01f724aad54526e70caffd843b36b610bfaaf EBUILD bustle-0.4.3.ebuild 1570 SHA256 8176a4325aa8372911027335ac1ae15cd0e925b238e7234ddc94d11ba3029a30 SHA512 8340d1c2d9216a1374120d9083a7296dfa25fb9ef1f039d34c34127dc39e7fb117474d002442ccdb886789d5d992c398b54376f6c847c089e508366f6347874d WHIRLPOOL 7cf67fc9a322d8f63021e119e69885a32349a98fb6cd78b529caaa95face36f823efbfb890f82085975c5f6bdb0089fff3b3fd47868875b86aa45158eed5f7f2 -MISC ChangeLog 3857 SHA256 ad342e3e232be60a61b5fa4cc9ebbdcf1242d1adf4006ba9a0ed7d7fd7e5b548 SHA512 c172f0daebd39465bf0245ef3cdb0c45552effd54cf8d49cbdc37b8bbef302fc2186e836fb3df371b9505fe1dc0919eee8c6d5301a5f6a6d8c9cb4bf1ac8bb68 WHIRLPOOL cf69dff1e137bf8539849ee5ecadae6d83b007711a11bb213f5d73360d0e9260c7425b0661f0a85d0c541dbc098e711f1081de31feb8a4343d241b2963cb0dd3 +EBUILD bustle-0.4.7-r1.ebuild 1617 SHA256 564f3b4b5fab2c91ea4bb25c2f31b78412799102c5911a8fca5cb078ca396270 SHA512 8b24c81de3868ae623eea2b4f659ecb6ad8753d837d594f41fedf6c4dcd095fa78ff6c3c301b6dc2e9f17055cf57a90f8f140f4fb1cdef87140c002ff5a82c24 WHIRLPOOL 5595aae5d6947e2ebefc88355d46bfe0bdcdd743a4d4a910bb2c7b0633c126a2d33a28b9cf69040455a0c1938f28b1220be14d3f61af4afa72cd78eee650b469 +MISC ChangeLog 4115 SHA256 ed25998146f6ceda3e0c3d94277fa5de66ad5e20cb26747cdfad42abab05d3f6 SHA512 7cca9cf8734757aca86a6290a03b23b24289bdd0c06b93262b700fca3442d74ce57fe38802c71504faf7f6ab963efe4fe379a80b0cb02b80e1e39c80922c03f4 WHIRLPOOL bdc8f52aabb15b3fb49db6b27160ca52bb62d57335b350bc52adfcc32dd0e351ba915b82419d0bd8edbdc6f2445a383f58ae86f243fcd94750e8e246d228ae6f MISC metadata.xml 314 SHA256 2a36dc7de9fdc3b983bc20185c7091d00937b33fc4b71b4e86d4c5def6eebadc SHA512 cd6c3a7d1ba97797fab5cf6dd797c1f5317c17cd878873b941a3e0ebf9ccca056b4c440d940fb011bb62b4002911df5bbd7ff7cb74a02cddd0fc6c38bb3b0276 WHIRLPOOL f229b7f8afe393103347463fc7332a49db6212e04e49ab446fb5e90b85fb68e9ef2c91b8b2e62d807eedbeb317f6e8a7f5ee51f9454c2e212b1d0a9a0d2d3a0f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJS7ih8AAoJELp701BxlEWfLiwP/1T+BZGO48nN+r5ahL/NEo8z -1JAoNcJb4ZVIgoMWtgmUETGvYqlwFWZOon7jETXjB/r0PQY9a9uVlAWZC+zaOWLF -8L1h3nAg17w3C2JkVtn7qDrSuv7JH1UF0h0cuzU9XsM8IRB4Uv3qaJMdQ4KyfFsu -d93kQqmbuQEyGGQtDTT6OAgpLXKI5qQFSp6YQgyBZQgEMD6dTbBUGc66E6IhRHhi -V5mQlCbA8MIhYAzhslOkfToEQgohBrIVt0B2AJKi7YYEWANkEd2rBk4nVG22lkJE -wSgCuz/nGdWz1FM3JjQbNwoKgpEgM3/3NVqGNFOrglMW8Bv7UZfCG6i+6z3qhbnq -SWHwyE9Xrzj6fjYlwvUfcqIIZTz2LWbJRMpy+6yUCiRkzaT3rCiDAnYQOJJjQPJ2 -vq6pRt/ofWSWOI8ZDiLOC0QaQAolu4i2V46BDzYnEUrBz36XQkiFzYLdA5687oLz -S4WO2s+oyvQkLyuFPKOlHjnTn8Ly3px+S4+2/3BI+s5PnWMSB6Mya+i5mNES5a3T -f5b3t7AE7p642ZM/4jN9MyoGsx6B98ZoNaGueVkKvgkVVXvivYlqlojfs2E4tU4K -/8i2Ob/AwqEeyY5xUKTnz4AtZD9mwUhZNv2mOrgsibLj23GtQaNKUmNptbbW2orY -wMAjMNimJqUML/8htG4i -=hcAF +iEYEAREIAAYFAlSpvZEACgkQcaHudmEf86q8SQCfduVXK9KUlSyw9eW/IdgO1jOC +D+EAmwcPeoYt2NeoPujxsiWy64MsVHT2 +=UQzM -----END PGP SIGNATURE----- diff --git a/dev-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild new file mode 100644 index 000000000000..da689bcba005 --- /dev/null +++ b/dev-util/bustle/bustle-0.4.7-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.7-r1.ebuild,v 1.1 2015/01/04 22:24:16 slyfox Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.3.6.9999 + +CABAL_FEATURES="bin test-suite" +inherit haskell-cabal + +DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic" +HOMEPAGE="http://hackage.haskell.org/package/bustle" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2 GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-libs/glib:2 + net-libs/libpcap + sys-apps/dbus + x11-libs/cairo + x11-libs/pango + gnome-base/libglade:2.0" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8.0.2 + dev-haskell/cairo + >=dev-haskell/dbus-0.10 + dev-haskell/glib + >=dev-haskell/gtk-0.13 + >=dev-haskell/hgettext-0.1.5 + dev-haskell/mtl + >=dev-haskell/pango-0.13 + dev-haskell/parsec + dev-haskell/pcap + dev-haskell/setlocale + dev-haskell/text + >=dev-lang/ghc-6.12.1 + virtual/pkgconfig + test? ( dev-haskell/hunit + dev-haskell/quickcheck + dev-haskell/test-framework + dev-haskell/test-framework-hunit ) +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gtk-0.13.patch +} + +src_compile() { + # compile haskell part + cabal_src_compile || die "could not build haskell parts" + + # compile C part + emake \ + "CC=$(tc-getCC)" \ + "CFLAGS=${CFLAGS}" \ + "CPPFLAGS=${CPPFLAGS}" \ + "LDFLAGS=${LDFLAGS}" +} + +src_install() { + # install haskell part + cabal_src_install || die "could not install haskell parts" + + dobin "${S}"/dist/build/bustle-pcap + doman bustle-pcap.1 + dodoc README HACKING NEWS +} diff --git a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch new file mode 100644 index 000000000000..f2691521c4bd --- /dev/null +++ b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch @@ -0,0 +1,172 @@ +diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs +index d558beb..ef96d60 100644 +--- a/Bustle/Diagram.hs ++++ b/Bustle/Diagram.hs +@@ -450,7 +450,7 @@ mkLayout :: (MonadIO m) + mkLayout s e a = liftIO $ do + ctx <- cairoCreateContext Nothing + layout <- layoutEmpty ctx +- layoutSetMarkup layout (Markup.unMarkup s) ++ layoutSetMarkup layout (Markup.unMarkup s) :: IO String + layoutSetFontDescription layout (Just font) + layoutSetEllipsize layout e + layoutSetAlignment layout a +diff --git a/Bustle/UI.hs b/Bustle/UI.hs +index a78797e..9843b29 100644 +--- a/Bustle/UI.hs ++++ b/Bustle/UI.hs +@@ -30,6 +30,7 @@ import Data.IORef + import qualified Data.Set as Set + import Data.List (intercalate) + import Data.Time ++import qualified Data.Text as T + import Data.Monoid (mempty) + import Text.Printf + +@@ -281,6 +282,7 @@ promptToSave wi = io $ do + case mdetails of + Just (RecordedLog tempFilePath) -> do + let tempFileName = takeFileName tempFilePath ++ title :: String + title = printf (__ "Save log '%s' before closing?") tempFileName + prompt <- messageDialogNew (Just (wiWindow wi)) + [DialogModal] +@@ -459,7 +461,7 @@ wiSetLogDetails :: WindowInfo + -> IO () + wiSetLogDetails wi logDetails = do + writeIORef (wiLogDetails wi) (Just logDetails) +- windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails)) ++ windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails) :: String) + + setPage :: MonadIO io + => WindowInfo +@@ -525,7 +527,7 @@ loadPixbuf :: FilePath -> IO (Maybe Pixbuf) + loadPixbuf filename = do + iconName <- getDataFileName $ "data/" ++ filename + C.catch (fmap Just (pixbufNewFromFile iconName)) +- (\(GError _ _ msg) -> warn msg >> return Nothing) ++ (\(GError _ _ msg) -> warn (T.unpack msg) >> return Nothing) + + openDialogue :: Window -> B () + openDialogue window = embedIO $ \r -> do +diff --git a/Bustle/UI/Canvas.hs b/Bustle/UI/Canvas.hs +index 46c1582..5a28761 100644 +--- a/Bustle/UI/Canvas.hs ++++ b/Bustle/UI/Canvas.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE OverloadedStrings #-} + {- + Bustle.UI.Canvas: displays diagrams + Copyright © 2008–2012 Collabora Ltd. +@@ -58,7 +59,7 @@ canvasNew :: Eq a + -> (Maybe a -> IO ()) + -> IO (Canvas a) + canvasNew builder showBounds selectionChangedCb = do +- layout <- builderGetObject builder castToLayout "diagramLayout" ++ layout <- builderGetObject builder castToLayout ("diagramLayout" :: String) + idRef <- newIORef Nothing + shapesRef <- newIORef [] + widthRef <- newIORef 0 +diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs +index 35e80d6..d1b9d96 100644 +--- a/Bustle/UI/DetailsView.hs ++++ b/Bustle/UI/DetailsView.hs +@@ -55,7 +55,7 @@ addValue :: Table + -> Int + -> IO Label + addValue table row = do +- label <- labelNew Nothing ++ label <- labelNew (Nothing :: Maybe String) + miscSetAlignment label 0 0 + labelSetEllipsize label EllipsizeStart + labelSetSelectable label True +@@ -77,7 +77,7 @@ detailsViewNew = do + , tableColumnSpacing := 6 + ] + +- title <- labelNew Nothing ++ title <- labelNew (Nothing :: Maybe String) + miscSetAlignment title 0 0 + tableAttach table title 0 2 0 1 [Fill] [Fill] 0 0 + +diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs +index 9560507..152931e 100644 +--- a/Bustle/UI/FilterDialog.hs ++++ b/Bustle/UI/FilterDialog.hs +@@ -99,7 +99,7 @@ runFilterDialog parent names currentlyHidden = do + nameStore <- makeStore names currentlyHidden + sw <- makeView nameStore + +- instructions <- labelNew Nothing ++ instructions <- labelNew (Nothing :: Maybe String) + widgetSetSizeRequest instructions 600 (-1) + labelSetMarkup instructions + (__ "Unticking a service hides its column in the diagram, \ +diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs +index 1e98a68..085eea2 100644 +--- a/Bustle/UI/Recorder.hs ++++ b/Bustle/UI/Recorder.hs +@@ -27,6 +27,7 @@ import Control.Monad (when, liftM) + import Control.Concurrent.MVar + import qualified Data.Map as Map + import Data.Monoid ++import qualified Data.Text as T + import Control.Monad.State (runStateT) + import Text.Printf + +@@ -77,8 +78,7 @@ processBatch pendingRef n label incoming = do + -- message from the user's perspective. + i <- takeMVar n + let j = i + (length pending) +- labelSetMarkup label $ +- printf (__ "Logged %u messages…") j ++ labelSetMarkup label $ (printf (__ "Logged %u messages…") j :: String) + putMVar n j + + incoming rr' +@@ -97,8 +97,8 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do + maybe (return ()) (windowSetTransientFor dialog) mwindow + dialog `set` [ windowModal := True ] + +- label <- labelNew Nothing +- labelSetMarkup label $ printf (__ "Logged %u messages…") (0 :: Int) ++ label <- labelNew (Nothing :: Maybe String) ++ labelSetMarkup label $ (printf (__ "Logged %u messages…") (0 :: Int) :: String) + loaderStateRef <- newMVar Map.empty + pendingRef <- newMVar [] + let updateLabel µs body = do +@@ -142,7 +142,7 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do + widgetShowAll dialog + where + newFailed (GError _ _ message) = do +- displayError mwindow message Nothing ++ displayError mwindow (T.unpack message) Nothing + + recorderChooseFile :: FilePath + -> Maybe Window +diff --git a/bustle.cabal b/bustle.cabal +index 4ac107c..2d1f907 100644 +--- a/bustle.cabal ++++ b/bustle.cabal +@@ -106,10 +106,10 @@ Executable bustle + , directory + , filepath + , glib +- , gtk >= 0.12.4 ++ , gtk >= 0.13 + , hgettext >= 0.1.5 + , mtl +- , pango ++ , pango >= 0.13 + , parsec + , pcap + , process +@@ -136,7 +136,7 @@ Executable test-monitor + , dbus + , directory + , filepath +- , gtk > 0.12 ++ , gtk >= 0.13 + , glib + , hgettext + , mtl -- 2.26.2