[arch-commits] Commit in hledger-ui/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Tue Jun 27 13:57:56 UTC 2017
Date: Tuesday, June 27, 2017 @ 13:57:56
Author: felixonmars
Revision: 241190
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
hledger-ui/repos/community-staging-i686/
hledger-ui/repos/community-staging-i686/PKGBUILD
(from rev 241189, hledger-ui/trunk/PKGBUILD)
hledger-ui/repos/community-staging-i686/brick-0.19.patch
(from rev 241189, hledger-ui/trunk/brick-0.19.patch)
hledger-ui/repos/community-staging-x86_64/
hledger-ui/repos/community-staging-x86_64/PKGBUILD
(from rev 241189, hledger-ui/trunk/PKGBUILD)
hledger-ui/repos/community-staging-x86_64/brick-0.19.patch
(from rev 241189, hledger-ui/trunk/brick-0.19.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 43 ++++++++++++++++++++++
community-staging-i686/brick-0.19.patch | 53 ++++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 43 ++++++++++++++++++++++
community-staging-x86_64/brick-0.19.patch | 53 ++++++++++++++++++++++++++++
4 files changed, 192 insertions(+)
Copied: hledger-ui/repos/community-staging-i686/PKGBUILD (from rev 241189, hledger-ui/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-06-27 13:57:56 UTC (rev 241190)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=hledger-ui
+pkgver=1.2
+pkgrel=6
+pkgdesc="Curses-style user interface for the hledger accounting tool"
+url="http://hledger.org"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('ghc' 'hledger' "haskell-hledger-lib" "haskell-ansi-terminal" "haskell-async"
+ "haskell-base-compat" "haskell-cmdargs" "haskell-data-default" "haskell-fsnotify"
+ "haskell-hunit" "haskell-microlens" "haskell-microlens-platform" "haskell-megaparsec"
+ "haskell-pretty-show" "haskell-safe" "haskell-split" "haskell-text" "haskell-text-zipper"
+ "haskell-vector" "haskell-brick" "haskell-vty")
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ brick-0.19.patch)
+sha512sums=('07f571a66e94a34a20cd6145196cd3333137a6281c33c5f917facc3c70d424b01c0f2a3d4d0d0c543b877338a350b5add4d3a5d48bbe28009d5cc42a2c3d3e29'
+ '91cd273625fe4d5863bfa5602b9147ede04b6e83e125f26974877231cc02418e7e76236ba2cdc687dd20bb3b67cf769d34f10d8296c2a8f035a79f3695187627')
+
+prepare() {
+ # It does nothing
+ sed -e '/mtl-compat/d' \
+ -e 's/megaparsec >=5.0 && < 5.3/megaparsec >=5.0 \&\& < 5.4/' \
+ -e 's/brick >= 0.12 && < 0.18/brick >= 0.12 \&\& < 0.19/' \
+ -i ${pkgname}-${pkgver}/${pkgname}.cabal
+ (cd ${pkgname}-${pkgver}; patch -p2 -i ../brick-0.19.patch)
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup configure -O --enable-executable-dynamic \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
+ -f-oldtime -fthreaded
+ runhaskell Setup build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: hledger-ui/repos/community-staging-i686/brick-0.19.patch (from rev 241189, hledger-ui/trunk/brick-0.19.patch)
===================================================================
--- community-staging-i686/brick-0.19.patch (rev 0)
+++ community-staging-i686/brick-0.19.patch 2017-06-27 13:57:56 UTC (rev 241190)
@@ -0,0 +1,53 @@
+commit 46f08625416d79fbc319b42f8a361f69c3e7a315
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Tue Jun 27 21:47:54 2017 +0800
+
+ Update brick to 0.19
+
+diff --git a/hledger-ui/Hledger/UI/UIState.hs b/hledger-ui/Hledger/UI/UIState.hs
+index 1968d978..1e2ac939 100644
+--- a/hledger-ui/Hledger/UI/UIState.hs
++++ b/hledger-ui/Hledger/UI/UIState.hs
+@@ -6,7 +6,6 @@
+ module Hledger.UI.UIState
+ where
+
+-import Brick
+ import Brick.Widgets.Edit
+ import Data.List
+ import Data.Text.Zipper (gotoEOL)
+@@ -235,7 +234,7 @@ getDepth UIState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=ropts}}} = depth_ rop
+ showMinibuffer :: UIState -> UIState
+ showMinibuffer ui = setMode (Minibuffer e) ui
+ where
+- e = applyEdit gotoEOL $ editor MinibufferEditor (str . unlines) (Just 1) oldq
++ e = applyEdit gotoEOL $ editor MinibufferEditor (Just 1) oldq
+ oldq = query_ $ reportopts_ $ cliopts_ $ aopts ui
+
+ -- | Close the minibuffer, discarding any edit in progress.
+diff --git a/hledger-ui/Hledger/UI/UIUtils.hs b/hledger-ui/Hledger/UI/UIUtils.hs
+index 48afeccc..a4e39b79 100644
+--- a/hledger-ui/Hledger/UI/UIUtils.hs
++++ b/hledger-ui/Hledger/UI/UIUtils.hs
+@@ -136,7 +136,7 @@ minibuffer :: Editor String Name -> Widget Name
+ minibuffer ed =
+ forceAttr (borderAttr <> "minibuffer") $
+ hBox $
+- [txt "filter: ", renderEditor True ed]
++ [txt "filter: ", renderEditor (str . unlines) True ed]
+
+ -- | Wrap a widget in the default hledger-ui screen layout.
+ defaultLayout :: Widget Name -> Widget Name -> Widget Name -> Widget Name
+diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
+index 9c148e95..cc8e9a35 100644
+--- a/hledger-ui/hledger-ui.cabal
++++ b/hledger-ui/hledger-ui.cabal
+@@ -85,7 +85,7 @@ executable hledger-ui
+ buildable: False
+ else
+ build-depends:
+- brick >= 0.12 && < 0.19
++ brick >= 0.19 && < 0.20
+ , vty >= 5.5 && < 5.16
+ if flag(threaded)
+ ghc-options: -threaded
Copied: hledger-ui/repos/community-staging-x86_64/PKGBUILD (from rev 241189, hledger-ui/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-06-27 13:57:56 UTC (rev 241190)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=hledger-ui
+pkgver=1.2
+pkgrel=6
+pkgdesc="Curses-style user interface for the hledger accounting tool"
+url="http://hledger.org"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('ghc' 'hledger' "haskell-hledger-lib" "haskell-ansi-terminal" "haskell-async"
+ "haskell-base-compat" "haskell-cmdargs" "haskell-data-default" "haskell-fsnotify"
+ "haskell-hunit" "haskell-microlens" "haskell-microlens-platform" "haskell-megaparsec"
+ "haskell-pretty-show" "haskell-safe" "haskell-split" "haskell-text" "haskell-text-zipper"
+ "haskell-vector" "haskell-brick" "haskell-vty")
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ brick-0.19.patch)
+sha512sums=('07f571a66e94a34a20cd6145196cd3333137a6281c33c5f917facc3c70d424b01c0f2a3d4d0d0c543b877338a350b5add4d3a5d48bbe28009d5cc42a2c3d3e29'
+ '91cd273625fe4d5863bfa5602b9147ede04b6e83e125f26974877231cc02418e7e76236ba2cdc687dd20bb3b67cf769d34f10d8296c2a8f035a79f3695187627')
+
+prepare() {
+ # It does nothing
+ sed -e '/mtl-compat/d' \
+ -e 's/megaparsec >=5.0 && < 5.3/megaparsec >=5.0 \&\& < 5.4/' \
+ -e 's/brick >= 0.12 && < 0.18/brick >= 0.12 \&\& < 0.19/' \
+ -i ${pkgname}-${pkgver}/${pkgname}.cabal
+ (cd ${pkgname}-${pkgver}; patch -p2 -i ../brick-0.19.patch)
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup configure -O --enable-executable-dynamic \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
+ -f-oldtime -fthreaded
+ runhaskell Setup build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: hledger-ui/repos/community-staging-x86_64/brick-0.19.patch (from rev 241189, hledger-ui/trunk/brick-0.19.patch)
===================================================================
--- community-staging-x86_64/brick-0.19.patch (rev 0)
+++ community-staging-x86_64/brick-0.19.patch 2017-06-27 13:57:56 UTC (rev 241190)
@@ -0,0 +1,53 @@
+commit 46f08625416d79fbc319b42f8a361f69c3e7a315
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Tue Jun 27 21:47:54 2017 +0800
+
+ Update brick to 0.19
+
+diff --git a/hledger-ui/Hledger/UI/UIState.hs b/hledger-ui/Hledger/UI/UIState.hs
+index 1968d978..1e2ac939 100644
+--- a/hledger-ui/Hledger/UI/UIState.hs
++++ b/hledger-ui/Hledger/UI/UIState.hs
+@@ -6,7 +6,6 @@
+ module Hledger.UI.UIState
+ where
+
+-import Brick
+ import Brick.Widgets.Edit
+ import Data.List
+ import Data.Text.Zipper (gotoEOL)
+@@ -235,7 +234,7 @@ getDepth UIState{aopts=UIOpts{cliopts_=CliOpts{reportopts_=ropts}}} = depth_ rop
+ showMinibuffer :: UIState -> UIState
+ showMinibuffer ui = setMode (Minibuffer e) ui
+ where
+- e = applyEdit gotoEOL $ editor MinibufferEditor (str . unlines) (Just 1) oldq
++ e = applyEdit gotoEOL $ editor MinibufferEditor (Just 1) oldq
+ oldq = query_ $ reportopts_ $ cliopts_ $ aopts ui
+
+ -- | Close the minibuffer, discarding any edit in progress.
+diff --git a/hledger-ui/Hledger/UI/UIUtils.hs b/hledger-ui/Hledger/UI/UIUtils.hs
+index 48afeccc..a4e39b79 100644
+--- a/hledger-ui/Hledger/UI/UIUtils.hs
++++ b/hledger-ui/Hledger/UI/UIUtils.hs
+@@ -136,7 +136,7 @@ minibuffer :: Editor String Name -> Widget Name
+ minibuffer ed =
+ forceAttr (borderAttr <> "minibuffer") $
+ hBox $
+- [txt "filter: ", renderEditor True ed]
++ [txt "filter: ", renderEditor (str . unlines) True ed]
+
+ -- | Wrap a widget in the default hledger-ui screen layout.
+ defaultLayout :: Widget Name -> Widget Name -> Widget Name -> Widget Name
+diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
+index 9c148e95..cc8e9a35 100644
+--- a/hledger-ui/hledger-ui.cabal
++++ b/hledger-ui/hledger-ui.cabal
+@@ -85,7 +85,7 @@ executable hledger-ui
+ buildable: False
+ else
+ build-depends:
+- brick >= 0.12 && < 0.19
++ brick >= 0.19 && < 0.20
+ , vty >= 5.5 && < 5.16
+ if flag(threaded)
+ ghc-options: -threaded
More information about the arch-commits
mailing list