[Git][haskell-team/DHG_packages][master] taffybar: ghc 9 fix

[Clint Adams (@clint)]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
305093bc by Clint Adams at 2022-08-12T09:32:14-04:00
taffybar: ghc 9 fix

- - - - -


3 changed files:

- p/taffybar/debian/changelog
- + p/taffybar/debian/patches/ghc-9
- + p/taffybar/debian/patches/series


Changes:

=====================================
p/taffybar/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+taffybar (3.3.0-2) unstable; urgency=medium
+
+  * Upstream patch for GHC 9.
+
+ -- Clint Adams <clint at debian.org>  Fri, 12 Aug 2022 09:24:01 -0400
+
 taffybar (3.3.0-1) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/taffybar/debian/patches/ghc-9
=====================================
@@ -0,0 +1,31 @@
+--- a/src/System/Taffybar/Context.hs
++++ b/src/System/Taffybar/Context.hs
+@@ -56,7 +56,7 @@ logIO = logM "System.Taffybar.Context"
+ logC :: MonadIO m => System.Log.Logger.Priority -> String -> m ()
+ logC p = liftIO . logIO p
+ 
+-type Taffy m v = MonadIO m => ReaderT Context m v
++type Taffy m v = ReaderT Context m v
+ type TaffyIO v = ReaderT Context IO v
+ type Listener = Event -> Taffy IO ()
+ type SubscriptionList = [(Unique, Listener)]
+@@ -163,7 +163,7 @@ buildContext TaffybarConfig
+                 }
+   _ <- runMaybeT $ MaybeT GI.Gdk.displayGetDefault >>=
+               (lift . GI.Gdk.displayGetDefaultScreen) >>=
+-              (lift . flip GI.Gdk.afterScreenMonitorsChanged
++              (lift . (\x y -> GI.Gdk.afterScreenMonitorsChanged y x)
+                -- XXX: We have to do a force refresh here because there is no
+                -- way to reliably move windows, since the window manager can do
+                -- whatever it pleases.
+--- a/src/System/Taffybar/Widget/Windows.hs
++++ b/src/System/Taffybar/Widget/Windows.hs
+@@ -74,7 +74,7 @@ windowsNew config = do
+   subscription <-
+     subscribeToPropertyEvents [ewmhActiveWindow, ewmhWMName, ewmhWMClass]
+                       activeWindowUpdatedCallback
+-  _ <- liftReader (Gtk.onWidgetUnrealize label) (unsubscribe subscription)
++  _ <- liftReader (\x -> Gtk.onWidgetUnrealize label x) (unsubscribe subscription)
+ 
+   context <- ask
+ 


=====================================
p/taffybar/debian/patches/series
=====================================
@@ -0,0 +1 @@
+ghc-9



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/305093bc854106f6c00fd16f5c7aa998846f1642

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/305093bc854106f6c00fd16f5c7aa998846f1642
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220812/ac8473ac/attachment-0001.htm>