Date: Wednesday, October 26, 2022 @ 23:45:07 Author: felixonmars Revision: 1337947
upgpkg: taffybar 4.0.0-1 Modified: taffybar/trunk/PKGBUILD Deleted: taffybar/trunk/taffybar-ghc-9.patch ----------------------+ PKGBUILD | 43 ++++++++++++++++++------------------------- taffybar-ghc-9.patch | 47 ----------------------------------------------- 2 files changed, 18 insertions(+), 72 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-26 23:44:25 UTC (rev 1337946) +++ PKGBUILD 2022-10-26 23:45:07 UTC (rev 1337947) @@ -1,36 +1,29 @@ # Maintainer: Felix Yan <[email protected]> pkgname=taffybar -pkgver=3.3.0 -pkgrel=40 +pkgver=4.0.0 +pkgrel=1 pkgdesc="A desktop bar similar to xmobar, but with more GUI" -url="http://github.com/taffybar/taffybar"; +url="https://github.com/taffybar/taffybar"; license=("BSD") arch=('x86_64') -depends=('ghc-libs' 'haskell-configfile' 'haskell-hstringtemplate' 'haskell-x11' - 'haskell-ansi-terminal' 'haskell-broadcast-chan' 'haskell-dbus' 'haskell-dbus-hslogger' - 'haskell-dyre' 'haskell-either' 'haskell-enclosed-exceptions' 'haskell-gi-cairo' - 'haskell-gi-cairo-connector' 'haskell-gi-cairo-render' 'haskell-gi-gdk3' - 'haskell-gi-gdkpixbuf' 'haskell-gi-gdk3x11' 'haskell-gi-glib' 'haskell-gi-gtk3' - 'haskell-gi-gtk-hs' 'haskell-gi-pango' 'haskell-gtk-sni-tray' 'haskell-gtk-strut' - 'haskell-gi' 'haskell-gi-base' 'haskell-hslogger' 'haskell-http-client' - 'haskell-http-client-tls' 'haskell-http-types' 'haskell-multimap' 'haskell-old-locale' - 'haskell-optparse-applicative' 'haskell-rate-limit' 'haskell-regex-compat' 'haskell-safe' - 'haskell-scotty' 'haskell-split' 'haskell-status-notifier-item' - 'haskell-time-locale-compat' 'haskell-time-units' 'haskell-transformers-base' - 'haskell-tuple' 'haskell-utf8-string' 'haskell-xdg-basedir' 'haskell-xdg-desktop-entry' - 'haskell-xml' 'haskell-xml-helpers' 'xmonad' 'gtk3') +depends=('ghc-libs' 'haskell-configfile' 'haskell-hstringtemplate' 'haskell-x11' 'haskell-aeson' + 'haskell-ansi-terminal' 'haskell-broadcast-chan' 'haskell-conduit' 'haskell-data-default' + 'haskell-dbus' 'haskell-dbus-hslogger' 'haskell-dyre' 'haskell-either' + 'haskell-enclosed-exceptions' 'haskell-gi-cairo' 'haskell-gi-cairo-connector' + 'haskell-gi-cairo-render' 'haskell-gi-gdk3' 'haskell-gi-gdkpixbuf' 'haskell-gi-gdk3x11' + 'haskell-gi-glib' 'haskell-gi-gtk3' 'haskell-gi-gtk-hs' 'haskell-gi-pango' + 'haskell-gtk-sni-tray' 'haskell-gtk-strut' 'haskell-gi' 'haskell-gi-base' + 'haskell-hslogger' 'haskell-http-client' 'haskell-http-client-tls' 'haskell-http-conduit' + 'haskell-http-types' 'haskell-multimap' 'haskell-old-locale' 'haskell-optparse-applicative' + 'haskell-rate-limit' 'haskell-regex-compat' 'haskell-safe' 'haskell-scotty' 'haskell-split' + 'haskell-status-notifier-item' 'haskell-time-locale-compat' 'haskell-time-units' + 'haskell-transformers-base' 'haskell-tuple' 'haskell-utf8-string' 'haskell-xdg-basedir' + 'haskell-xdg-desktop-entry' 'haskell-xml' 'haskell-xml-helpers' 'xmonad' 'gtk3') makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"; - $pkgname-ghc-9.patch) -sha256sums=('f5ad48f04c2a3f24204609787ef6a456352cb4be35adc5980ea1d5e1c366ef9d' - '17085debb88e05077f847e152670fd7e847b9bb1035d40990990915c6e66d439') +source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";) +sha256sums=('8f8b38f406f6fb8fb0518c0fbb887dee1a0b67fa70f54be4137e754c65c891e7') -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../$pkgname-ghc-9.patch -} - build() { cd $pkgname-$pkgver Deleted: taffybar-ghc-9.patch =================================================================== --- taffybar-ghc-9.patch 2022-10-26 23:44:25 UTC (rev 1337946) +++ taffybar-ghc-9.patch 2022-10-26 23:45:07 UTC (rev 1337947) @@ -1,47 +0,0 @@ -From 12601373d287f0bf0460b2bc81fda7aa7cee58f2 Mon Sep 17 00:00:00 2001 -From: Joshua Chia <[email protected]> -Date: Tue, 14 Dec 2021 01:37:41 +0800 -Subject: [PATCH] Fixed compilation errors for GHC-9.0.1 - -Added eta-expansion related to implicit parameters and removed -constraint from Taffy type synonym. ---- - src/System/Taffybar/Context.hs | 4 ++-- - src/System/Taffybar/Widget/Windows.hs | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/System/Taffybar/Context.hs b/src/System/Taffybar/Context.hs -index 184827d7..ab86cf57 100644 ---- a/src/System/Taffybar/Context.hs -+++ b/src/System/Taffybar/Context.hs -@@ -87,7 +87,7 @@ - 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)] -@@ -226,7 +226,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. -diff --git a/src/System/Taffybar/Widget/Windows.hs b/src/System/Taffybar/Widget/Windows.hs -index 9cb43096..1f07e07c 100644 ---- a/src/System/Taffybar/Widget/Windows.hs -+++ b/src/System/Taffybar/Widget/Windows.hs -@@ -79,7 +79,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 -
