taffybar: New upstream release

7 files changed, 25 insertions, 338 deletions

diff --git a/p/taffybar/debian/changelog b/p/taffybar/debian/changelog
index 62e08a1c8..964ad99c2 100644
--- a/p/taffybar/debian/changelog
+++ b/p/taffybar/debian/changelog
@@ -1,8 +1,9 @@
-taffybar (0.2.1-2) UNRELEASED; urgency=low
+taffybar (0.4.4-1) UNRELEASED; urgency=low
 
   * Adjust watch file to new hackage layout
+  * New upstream release
 
- -- Joachim Breitner <nomeata@debian.org>  Sat, 05 Oct 2013 18:22:30 +0200
+ -- Joachim Breitner <nomeata@debian.org>  Tue, 30 Dec 2014 13:42:05 +0100
 
 taffybar (0.2.1-1) unstable; urgency=low
 
diff --git a/p/taffybar/debian/control b/p/taffybar/debian/control
index 268557058..a503ca80d 100644
--- a/p/taffybar/debian/control
+++ b/p/taffybar/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9)
   , libghc-dbus-dev (>= 0.10.1)
   , libghc-dbus-dev (<< 1.0)
   , libghc-gtk-dev (>= 0.12.1)
+  , libghc-gtk-dev (<< 0.14)
   , libghc-dyre-dev (>= 0.8.6)
   , libghc-hstringtemplate-dev
   , libghc-gtk-traymanager-dev (>= 0.1.2)
@@ -26,9 +27,11 @@ Build-Depends: debhelper (>= 9)
   , libghc-xdg-basedir-dev
   , libghc-utf8-string-dev
   , libghc-stm-dev
-  , libghc-transformers-dev (>= 0.3.0.0)
   , libghc-x11-dev (>= 1.5.0.1)
+  , libghc-safe-dev (>= 0.3)
+  , libghc-safe-dev (<< 1)
   , libghc-split-dev (>= 0.1.4.2)
+  , libghc-enclosed-exceptions-dev (>= 1.0.0.1)
   , libghc-text-prof
   , libghc-http-prof
   , libghc-parsec3-prof
@@ -45,9 +48,10 @@ Build-Depends: debhelper (>= 9)
   , libghc-xdg-basedir-prof
   , libghc-utf8-string-prof
   , libghc-stm-prof
-  , libghc-transformers-prof
   , libghc-x11-prof
+  , libghc-safe-prof
   , libghc-split-prof
+  , libghc-enclosed-exceptions-prof
   , libgtk2.0-dev
 Build-Depends-Indep: ghc-doc
   , libghc-text-doc
@@ -66,9 +70,10 @@ Build-Depends-Indep: ghc-doc
   , libghc-xdg-basedir-doc
   , libghc-utf8-string-doc
   , libghc-stm-doc
-  , libghc-transformers-doc
   , libghc-x11-doc
+  , libghc-safe-doc
   , libghc-split-doc
+  , libghc-enclosed-exceptions-doc
 Standards-Version: 3.9.4
 Homepage: http://hackage.haskell.org/package/taffybar
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/taffybar
diff --git a/p/taffybar/debian/patches/cabal-bug-626.patch b/p/taffybar/debian/patches/cabal-bug-626.patch
deleted file mode 100644
index 1d9ca0cc5..000000000
--- a/p/taffybar/debian/patches/cabal-bug-626.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: taffybar/taffybar.cabal
-===================================================================
---- taffybar.orig/taffybar.cabal	2013-07-17 21:35:44.000000000 +0200
-+++ taffybar/taffybar.cabal	2013-07-23 12:54:33.000000000 +0200
-@@ -22,9 +22,9 @@
-   .
-     * More robust strut handling for multiple monitors of different sizes (contributed by Morgan Gibson)
-   .
--    * New widgets from José A. Romero (network monitor, fs monitor, another CPU monitor)
-+    * New widgets from Jose' A. Romero (network monitor, fs monitor, another CPU monitor)
-   .
--    * Allow the bar widget to grow vertically (also contributed by José A. Romero)
-+    * Allow the bar widget to grow vertically (also contributed by Jose' A. Romero)
-   .
-   Changes in v0.2.0:
-   .
diff --git a/p/taffybar/debian/patches/eliminate-web-encodings-dependency.patch b/p/taffybar/debian/patches/eliminate-web-encodings-dependency.patch
deleted file mode 100644
index 5382d708c..000000000
--- a/p/taffybar/debian/patches/eliminate-web-encodings-dependency.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: CJ van den Berg <cj@vdbonline.com>
-Subject: Eliminate web-encodings dependency
-
-Origin: upstream, https://github.com/travitch/taffybar/commit/4c2591a25c8700cec29aa28892e4dbfa610ed1e2
-Index: taffybar/src/System/Taffybar/FreedesktopNotifications.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/FreedesktopNotifications.hs	2013-07-16 18:20:24.000000000 +0200
-+++ taffybar/src/System/Taffybar/FreedesktopNotifications.hs	2013-07-17 21:01:58.000000000 +0200
-@@ -28,7 +28,6 @@
- import Data.Word ( Word32 )
- import DBus.Client.Simple
- import Graphics.UI.Gtk hiding ( Variant )
--import Web.Encodings ( decodeHtml, encodeHtml )
-
- -- | A simple structure representing a Freedesktop notification
- data Notification = Notification { noteAppName :: Text
-@@ -116,8 +115,8 @@
-       nid <- modifyMVar idSrc (\x -> return (x+1, x))
-       let n = Notification { noteAppName = appName
-                            , noteReplaceId = 0
--                           , noteSummary = encodeHtml $ decodeHtml summary
--                           , noteBody = encodeHtml $ decodeHtml body
-+                           , noteSummary = T.pack $ escapeMarkup $ T.unpack summary
-+                           , noteBody = T.pack $ escapeMarkup $ T.unpack body
-                            , noteExpireTimeout = tout
-                            , noteId = fromIntegral nid
-                            }
-Index: taffybar/src/System/Taffybar/MPRIS.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/MPRIS.hs	2013-07-16 18:20:24.000000000 +0200
-+++ taffybar/src/System/Taffybar/MPRIS.hs	2013-07-17 21:01:58.000000000 +0200
-@@ -18,7 +18,6 @@
- import DBus.Types
- import DBus.Message
- import Graphics.UI.Gtk hiding ( Signal, Variant )
--import Web.Encodings ( encodeHtml, decodeHtml )
- import Text.Printf
-
- setupDBus :: Label -> IO ()
-@@ -53,7 +52,7 @@
-     Just m -> do
-       let artist = maybe "[unknown]" id (variantDictLookup "artist" m)
-           track = maybe "[unknown]" id (variantDictLookup "title" m)
--          msg = encodeHtml $ decodeHtml $ printf "%s - %s" (T.unpack artist) (T.unpack track)
-+          msg = escapeMarkup $ printf "%s - %s" (T.unpack artist) (T.unpack track)
-           txt = "<span fgcolor='yellow'>Now Playing:</span> " ++ msg
-       postGUIAsync $ do
-         -- In case the widget was hidden due to a stop/pause, forcibly
-Index: taffybar/src/System/Taffybar/XMonadLog.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/XMonadLog.hs	2013-07-16 18:20:24.000000000 +0200
-+++ taffybar/src/System/Taffybar/XMonadLog.hs	2013-07-17 21:01:58.000000000 +0200
-@@ -33,8 +33,6 @@
- import XMonad
- import XMonad.Hooks.DynamicLog
-
--import Web.Encodings ( decodeHtml, encodeHtml )
--
- -- | This is a DBus-based logger that can be used from XMonad to log
- -- to this widget.  This version lets you specify the format for the
- -- log using a pretty printer (e.g., 'taffybarPP').
-@@ -52,7 +50,7 @@
- -- | Escape strings so that they can be safely displayed by Pango in
- -- the bar widget
- taffybarEscape :: String -> String
--taffybarEscape = encodeHtml . decodeHtml
-+taffybarEscape = escapeMarkup
-
- -- | The same as defaultPP in XMonad.Hooks.DynamicLog
- taffybarDefaultPP :: PP
-Index: taffybar/taffybar.cabal
-===================================================================
---- taffybar.orig/taffybar.cabal	2013-07-16 18:20:24.000000000 +0200
-+++ taffybar/taffybar.cabal	2013-07-17 21:01:58.000000000 +0200
-@@ -58,7 +58,7 @@
- library
-   default-language: Haskell2010
-   build-depends: base > 3 && < 5, time, old-locale, containers, text, HTTP,
--                 parsec >= 3.1, mtl >= 2, network, web-encodings, cairo,
-+                 parsec >= 3.1, mtl >= 2, network, cairo,
-                  dbus-core >= 0.9.1 && < 1.0, gtk >= 0.12.1, dyre >= 0.8.6,
-                  HStringTemplate, gtk-traymanager >= 0.1.2 && < 0.2, xmonad-contrib, xmonad,
-                  xdg-basedir, filepath, utf8-string, process
diff --git a/p/taffybar/debian/patches/no-network-uri b/p/taffybar/debian/patches/no-network-uri
new file mode 100644
index 000000000..f17c0b7b9
--- /dev/null
+++ b/p/taffybar/debian/patches/no-network-uri
@@ -0,0 +1,13 @@
+Index: taffybar-0.4.4/taffybar.cabal
+===================================================================
+--- taffybar-0.4.4.orig/taffybar.cabal	2014-12-30 13:40:09.980001474 +0100
++++ taffybar-0.4.4/taffybar.cabal	2014-12-30 13:40:53.696939599 +0100
+@@ -55,7 +55,7 @@
+   if flag(network-uri)
+     build-depends: network-uri >= 2.6 && < 3, network >= 2.6 && < 3
+   else
+-    build-depends: network-uri < 2.6, network < 2.6
++    build-depends: network < 2.6
+   hs-source-dirs: src
+   pkgconfig-depends: gtk+-2.0
+   exposed-modules: System.Taffybar,
diff --git a/p/taffybar/debian/patches/port-from-dbus-core-to-dbus.patch b/p/taffybar/debian/patches/port-from-dbus-core-to-dbus.patch
deleted file mode 100644
index 728ea8396..000000000
--- a/p/taffybar/debian/patches/port-from-dbus-core-to-dbus.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From: CJ van den Berg <cj@vdbonline.com>
-Subject: Port from dbus-core to dbus
-
-Origin: upstream, https://github.com/travitch/taffybar/commit/a54f2fca4a99f06ffc284c5d53aa532d76bc2d4e
-Index: taffybar/src/System/Information/Battery.hs
-===================================================================
---- taffybar.orig/src/System/Information/Battery.hs	2013-07-16 18:20:24.000000000 +0200
-+++ taffybar/src/System/Information/Battery.hs	2013-07-17 21:24:24.000000000 +0200
-@@ -19,12 +19,14 @@
- import Data.Maybe
- import Data.Word
- import Data.Int
--import DBus.Client.Simple
--import Data.List ( find )
--import Data.Text ( isInfixOf, Text )
-+import DBus
-+import DBus.Client
-+import Data.List ( find, isInfixOf )
-+import Data.Text ( Text )
-+import qualified Data.Text as T
-
- -- | An opaque wrapper around some internal library state
--newtype BatteryContext = BC Proxy
-+data BatteryContext = BC Client ObjectPath
-
- data BatteryType = BatteryTypeUnknown
-                  | BatteryTypeLinePower
-@@ -90,7 +92,7 @@
- -- | Find the first power source that is a battery in the list.  The
- -- simple heuristic is a substring search on 'BAT'
- firstBattery :: [ObjectPath] -> Maybe ObjectPath
--firstBattery = find (isInfixOf "BAT" . objectPathText)
-+firstBattery = find (isInfixOf "BAT" . formatObjectPath)
-
- -- | The name of the power daemon bus
- powerBusName :: BusName
-@@ -128,16 +130,16 @@
- -- If some fields are not actually present, they may have bogus values
- -- here.  Don't bet anything critical on it.
- getBatteryInfo :: BatteryContext -> IO BatteryInfo
--getBatteryInfo (BC batteryProxy) = do
-+getBatteryInfo (BC systemConn battPath) = do
-   -- Grab all of the properties of the battery each call with one
-   -- message.
--  let iface :: Variant
--      iface = toVariant ("org.freedesktop.UPower.Device" :: Text)
--
--  [val] <- call batteryProxy "org.freedesktop.DBus.Properties" "GetAll" [iface]
-+  reply <- call_ systemConn (methodCall battPath "org.freedesktop.DBus.Properties" "GetAll")
-+                             { methodCallDestination = Just "org.freedesktop.UPower"
-+                             , methodCallBody = [toVariant $ T.pack "org.freedesktop.UPower.Device"]
-+                             }
-
-   let dict :: Map Text Variant
--      Just dict = fromVariant val
-+      Just dict = fromVariant (methodReturnBody reply !! 0)
-   return BatteryInfo { batteryNativePath = readDict dict "NativePath" ""
-                      , batteryVendor = readDict dict "Vendor" ""
-                      , batteryModel = readDict dict "Model" ""
-@@ -173,11 +175,12 @@
-
-   -- First, get the list of devices.  For now, we just get the stats
-   -- for the first battery
--  powerProxy <- proxy systemConn powerBusName powerBaseObjectPath
--  [ powerDevicesV ] <- call powerProxy "org.freedesktop.UPower" "EnumerateDevices" []
--  let Just powerDevices = fromVariant powerDevicesV
-+  reply <- call_ systemConn (methodCall powerBaseObjectPath "org.freedesktop.UPower" "EnumerateDevices")
-+        { methodCallDestination = Just powerBusName
-+        }
-+  let Just powerDevices = fromVariant (methodReturnBody reply !! 0)
-+
-   case firstBattery powerDevices of
-     Nothing -> return Nothing
-     Just battPath ->
--      proxy systemConn powerBusName battPath >>= (return . Just . BC)
--
-+      return . Just $ BC systemConn battPath
-Index: taffybar/src/System/Taffybar/FreedesktopNotifications.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/FreedesktopNotifications.hs	2013-07-17 21:01:58.000000000 +0200
-+++ taffybar/src/System/Taffybar/FreedesktopNotifications.hs	2013-07-17 21:24:24.000000000 +0200
-@@ -26,7 +26,8 @@
- import Data.Text ( Text )
- import qualified Data.Text as T
- import Data.Word ( Word32 )
--import DBus.Client.Simple
-+import DBus
-+import DBus.Client
- import Graphics.UI.Gtk hiding ( Variant )
-
- -- | A simple structure representing a Freedesktop notification
-@@ -146,12 +147,12 @@
-
- notificationDaemon onNote onCloseNote = do
-   client <- connectSession
--  _ <- requestName client "org.freedesktop.Notifications" [AllowReplacement, ReplaceExisting]
-+  _ <- requestName client "org.freedesktop.Notifications" [nameAllowReplacement, nameReplaceExisting]
-   export client "/org/freedesktop/Notifications"
--    [ method "org.freedesktop.Notifications" "GetServerInformation" getServerInformation
--    , method "org.freedesktop.Notifications" "GetCapabilities" getCapabilities
--    , method "org.freedesktop.Notifications" "CloseNotification" onCloseNote
--    , method "org.freedesktop.Notifications" "Notify" onNote
-+    [ autoMethod "org.freedesktop.Notifications" "GetServerInformation" getServerInformation
-+    , autoMethod "org.freedesktop.Notifications" "GetCapabilities" getCapabilities
-+    , autoMethod "org.freedesktop.Notifications" "CloseNotification" onCloseNote
-+    , autoMethod "org.freedesktop.Notifications" "Notify" onNote
-     ]
-
- -- When a notification is received, add it to the queue.  Post a token to the channel that the
-Index: taffybar/src/System/Taffybar/MPRIS.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/MPRIS.hs	2013-07-17 21:01:58.000000000 +0200
-+++ taffybar/src/System/Taffybar/MPRIS.hs	2013-07-17 21:24:24.000000000 +0200
-@@ -13,22 +13,20 @@
- import qualified Data.Map as M
- import Data.Text ( Text )
- import qualified Data.Text as T
--import DBus.Client.Simple ( connectSession )
-+import DBus
- import DBus.Client
--import DBus.Types
--import DBus.Message
- import Graphics.UI.Gtk hiding ( Signal, Variant )
- import Text.Printf
-
- setupDBus :: Label -> IO ()
- setupDBus w = do
--  let trackMatcher = MatchRule { matchSender = Nothing
-+  let trackMatcher = matchAny { matchSender = Nothing
-                                , matchDestination = Nothing
-                                , matchPath = Just "/Player"
-                                , matchInterface = Just "org.freedesktop.MediaPlayer"
-                                , matchMember = Just "TrackChange"
-                                }
--      stateMatcher = MatchRule { matchSender = Nothing
-+      stateMatcher = matchAny { matchSender = Nothing
-                                , matchDestination = Nothing
-                                , matchPath = Just "/Player"
-                                , matchInterface = Just "org.freedesktop.MediaPlayer"
-@@ -44,10 +42,11 @@
-   fromVariant val
-
-
--trackCallback :: Label -> BusName -> Signal -> IO ()
--trackCallback w _ Signal { signalBody = [variant] } = do
-+trackCallback :: Label -> Signal -> IO ()
-+trackCallback w s = do
-   let v :: Maybe (M.Map Text Variant)
-       v = fromVariant variant
-+      [variant] = signalBody s
-   case v of
-     Just m -> do
-       let artist = maybe "[unknown]" id (variantDictLookup "artist" m)
-@@ -60,11 +59,10 @@
-         labelSetMarkup w txt
-         widgetShowAll w
-     _ -> return ()
--trackCallback _ _ _ = return ()
-
--stateCallback :: Label -> BusName -> Signal -> IO ()
--stateCallback w _ Signal { signalBody = [bdy] } =
--  case fromVariant bdy of
-+stateCallback :: Label -> Signal -> IO ()
-+stateCallback w s =
-+  case fromVariant (signalBody s !! 0) of
-     Just st -> case structureItems st of
-       (pstate:_) -> case (fromVariant pstate) :: Maybe Int32 of
-         Just 2 -> postGUIAsync $ widgetHideAll w
-@@ -73,7 +71,6 @@
-         _ -> return ()
-       _ -> return ()
-     _ -> return ()
--stateCallback _ _ _ = return ()
-
- mprisNew :: IO Widget
- mprisNew = do
-Index: taffybar/src/System/Taffybar/XMonadLog.hs
-===================================================================
---- taffybar.orig/src/System/Taffybar/XMonadLog.hs	2013-07-17 21:01:58.000000000 +0200
-+++ taffybar/src/System/Taffybar/XMonadLog.hs	2013-07-17 21:24:24.000000000 +0200
-@@ -24,10 +24,8 @@
-   ) where
-
- import Codec.Binary.UTF8.String ( decodeString )
--import DBus.Client.Simple ( connectSession, emit, Client )
--import DBus.Client ( listen, MatchRule(..) )
--import DBus.Types
--import DBus.Message
-+import DBus ( toVariant, fromVariant, Signal(..), signal )
-+import DBus.Client ( listen, matchAny, MatchRule(..), connectSession, emit, Client )
- import Graphics.UI.Gtk hiding ( Signal )
-
- import XMonad
-@@ -79,11 +77,11 @@
-   -- We need to decode the string back into a real String before we
-   -- send it over dbus.
-   let str' = decodeString str
--  emit client "/org/xmonad/Log" "org.xmonad.Log" "Update" [ toVariant str' ]
-+  emit client (signal "/org/xmonad/Log" "org.xmonad.Log" "Update") { signalBody = [ toVariant str' ] }
-
- setupDbus :: Label -> IO ()
- setupDbus w = do
--  let matcher = MatchRule { matchSender = Nothing
-+  let matcher = matchAny { matchSender = Nothing
-                           , matchDestination = Nothing
-                           , matchPath = Just "/org/xmonad/Log"
-                           , matchInterface = Just "org.xmonad.Log"
-@@ -94,8 +92,8 @@
-
-   listen client matcher (callback w)
-
--callback :: Label -> BusName -> Signal -> IO ()
--callback w _ sig = do
-+callback :: Label -> Signal -> IO ()
-+callback w sig = do
-   let [bdy] = signalBody sig
-       Just status = fromVariant bdy
-   postGUIAsync $ labelSetMarkup w status
-Index: taffybar/taffybar.cabal
-===================================================================
---- taffybar.orig/taffybar.cabal	2013-07-17 21:01:58.000000000 +0200
-+++ taffybar/taffybar.cabal	2013-07-17 21:24:24.000000000 +0200
-@@ -59,7 +59,7 @@
-   default-language: Haskell2010
-   build-depends: base > 3 && < 5, time, old-locale, containers, text, HTTP,
-                  parsec >= 3.1, mtl >= 2, network, cairo,
--                 dbus-core >= 0.9.1 && < 1.0, gtk >= 0.12.1, dyre >= 0.8.6,
-+                 dbus >= 0.10.1 && < 1.0, gtk >= 0.12.1, dyre >= 0.8.6,
-                  HStringTemplate, gtk-traymanager >= 0.1.2 && < 0.2, xmonad-contrib, xmonad,
-                  xdg-basedir, filepath, utf8-string, process
-   hs-source-dirs: src
diff --git a/p/taffybar/debian/patches/series b/p/taffybar/debian/patches/series
index db1b3bee8..be62d6fbc 100644
--- a/p/taffybar/debian/patches/series
+++ b/p/taffybar/debian/patches/series
@@ -1,4 +1,2 @@
-eliminate-web-encodings-dependency.patch
-port-from-dbus-core-to-dbus.patch
+no-network-uri
 man-page.patch
-cabal-bug-626.patch