From 03c729fc9ec61652f0cbaa9577291c9dd4481f98 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 3 Sep 2015 18:11:38 +0900 Subject: [PATCH] fix shakespeare patch to build without shakespeare-text --- hledger-0.24-req-new-shakespeare.patch | 31 +++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/hledger-0.24-req-new-shakespeare.patch b/hledger-0.24-req-new-shakespeare.patch index a3cada4..5b5ca2e 100644 --- a/hledger-0.24-req-new-shakespeare.patch +++ b/hledger-0.24-req-new-shakespeare.patch @@ -1,9 +1,6 @@ -diff -u -r -U5 hledger-0.24/hledger.cabal hledger-0.24.req-new-shakespeare/hledger.cabal ---- hledger-0.24/hledger.cabal 2014-12-25 14:40:58.000000000 -0500 -+++ hledger-0.24.req-new-shakespeare/hledger.cabal 2015-03-01 22:37:43.764811863 -0500 -@@ -82,20 +82,11 @@ - ,parsec >= 3 - ,process +--- hledger-0.24/hledger.cabal~ 2015-09-03 18:08:49.256055251 +0900 ++++ hledger-0.24/hledger.cabal 2015-09-03 18:09:14.827088132 +0900 +@@ -84,16 +84,7 @@ ,regex-tdfa ,regexpr >= 0.5.1 ,safe >= 0.2 @@ -21,5 +18,23 @@ diff -u -r -U5 hledger-0.24/hledger.cabal hledger-0.24.req-new-shakespeare/hledg ,split >= 0.1 && < 0.3 ,text >= 0.11 ,tabular >= 0.2 && < 0.3 - ,time - ,utf8-string >= 0.3.5 && < 0.4 +@@ -132,8 +123,7 @@ + ,regex-tdfa + ,regexpr >= 0.5.1 + ,safe >= 0.2 +- ,shakespeare-text >= 1.0 && < 1.2 +- ,shakespeare >= 1.0 && < 2.1 ++ ,shakespeare >= 2.0 && < 2.1 + ,split >= 0.1 && < 0.3 + ,tabular >= 0.2 && < 0.3 + ,text >= 0.11 +@@ -169,8 +159,7 @@ + , regex-tdfa + , regexpr + , safe +- , shakespeare-text >= 1.0 && < 1.2 +- , shakespeare >= 1.0 && < 2.1 ++ , shakespeare >= 2.0 && < 2.1 + , split + ,tabular >= 0.2 && < 0.3 + , test-framework