[arch-commits] Commit in hledger-ui/trunk (PKGBUILD brick-0.19.patch)

Felix Yan felixonmars at archlinux.org
Sat Jul 1 08:27:54 UTC 2017


    Date: Saturday, July 1, 2017 @ 08:27:53
  Author: felixonmars
Revision: 241976

upgpkg: hledger-ui 1.3-1

rebuild with hledger,1.3 hledger-api,1.3 hledger-lib,1.3 hledger-ui,1.3 hledger-web,1.3

Modified:
  hledger-ui/trunk/PKGBUILD
Deleted:
  hledger-ui/trunk/brick-0.19.patch

------------------+
 PKGBUILD         |   13 ++++---------
 brick-0.19.patch |   53 -----------------------------------------------------
 2 files changed, 4 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-01 08:26:03 UTC (rev 241975)
+++ PKGBUILD	2017-07-01 08:27:53 UTC (rev 241976)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hledger-ui
-pkgver=1.2
-pkgrel=7
+pkgver=1.3
+pkgrel=1
 pkgdesc="Curses-style user interface for the hledger accounting tool"
 url="http://hledger.org"
 license=("GPL")
@@ -14,18 +14,13 @@
          "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')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('b96c12537b50a02ffaa30fb2f9c291afb4a1eb1ecff99b372367c1f985575f44941c93d86c0cfee83a570756311b35b5779cfbcea430ad11c575cef16d07f187')
 
 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() {

Deleted: brick-0.19.patch
===================================================================
--- brick-0.19.patch	2017-07-01 08:26:03 UTC (rev 241975)
+++ brick-0.19.patch	2017-07-01 08:27:53 UTC (rev 241976)
@@ -1,53 +0,0 @@
-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