Date: Monday, October 17, 2022 @ 19:45:05 Author: felixonmars Revision: 1329714
archrelease: copy trunk to community-staging-x86_64 Added: taffybar/repos/community-staging-x86_64/ taffybar/repos/community-staging-x86_64/PKGBUILD (from rev 1329713, taffybar/trunk/PKGBUILD) taffybar/repos/community-staging-x86_64/taffybar-ghc-9.patch (from rev 1329713, taffybar/trunk/taffybar-ghc-9.patch) ----------------------+ PKGBUILD | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ taffybar-ghc-9.patch | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) Copied: taffybar/repos/community-staging-x86_64/PKGBUILD (from rev 1329713, taffybar/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-10-17 19:45:05 UTC (rev 1329714) @@ -0,0 +1,63 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=taffybar +pkgver=3.3.0 +pkgrel=35 +pkgdesc="A desktop bar similar to xmobar, but with more GUI" +url="http://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') +makedepends=('ghc') +source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + $pkgname-ghc-9.patch) +sha256sums=('f5ad48f04c2a3f24204609787ef6a456352cb4be35adc5980ea1d5e1c366ef9d' + '17085debb88e05077f847e152670fd7e847b9bb1035d40990990915c6e66d439') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../$pkgname-ghc-9.patch +} + +build() { + cd $pkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname --enable-tests \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm \ + --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \ + --ghc-option='-pie' + + runhaskell Setup build $MAKEFLAGS + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +check() { + cd $pkgname-$pkgver + runhaskell Setup test --show-details=direct +} + +package() { + cd $pkgname-$pkgver + + install -D -m744 register.sh "$pkgdir"/usr/share/haskell/register/$pkgname.sh + install -D -m744 unregister.sh "$pkgdir"/usr/share/haskell/unregister/$pkgname.sh + runhaskell Setup copy --destdir="$pkgdir" + install -D -m644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: taffybar/repos/community-staging-x86_64/taffybar-ghc-9.patch (from rev 1329713, taffybar/trunk/taffybar-ghc-9.patch) =================================================================== --- community-staging-x86_64/taffybar-ghc-9.patch (rev 0) +++ community-staging-x86_64/taffybar-ghc-9.patch 2022-10-17 19:45:05 UTC (rev 1329714) @@ -0,0 +1,47 @@ +From 12601373d287f0bf0460b2bc81fda7aa7cee58f2 Mon Sep 17 00:00:00 2001 +From: Joshua Chia <joshc...@gmail.com> +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 +