diff options
Diffstat (limited to 'dev-haskell/lvmlib')
| -rw-r--r-- | dev-haskell/lvmlib/Manifest | 4 | ||||
| -rw-r--r-- | dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch | 15 | ||||
| -rw-r--r-- | dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch | 14 | ||||
| -rw-r--r-- | dev-haskell/lvmlib/lvmlib-1.1.ebuild | 12 |
4 files changed, 39 insertions, 6 deletions
diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest index 7edb7d1e2280..0e35466da02f 100644 --- a/dev-haskell/lvmlib/Manifest +++ b/dev-haskell/lvmlib/Manifest @@ -1,4 +1,6 @@ AUX lvmlib-1.1-ghc-7.10.patch 2590 BLAKE2B 165938d0813dbf6806068ffa4e72c695d1a56eac4a7c2ba31a2dab12fca0549ff7210273eaa23039ad2f0d794727d541d0520609745e9bdcbcedcf8538c45931 SHA512 a645db9a37614752afa29d176133ee237511773e1d7c8d2f5959828264ad909360f441673b3e6bef5137bb0deb2f1eb108371032fafaa77a86d5a7be5fec2867 +AUX lvmlib-1.1-ghc-8.8.patch 547 BLAKE2B da9cb3500669435cef400e58c9f0bbbceb5d0e1a7a47d36c3437ef1b9b571884e9330a8d1043536ce196be4065517aac0dea9f1a4f4740c3e64077b6134d8619 SHA512 ce89864d5ff457774fe495fc4cde899b0e1903993288926f83dcc237da9fd72300d5989c0b5bcb76390fccb3d41364e969a8b6f3edf9079e9f4b7e448e31b35f +AUX lvmlib-1.1-ghc84.patch 352 BLAKE2B 62c3937287a1c6af5696b879249e560bab9757c71ec2c6aff8d19a0b064c88fce319c02fa2d8decbc30fe217fef5e263ca583ca9261150bfb536d887d2effad3 SHA512 a639d7686f6e6c8d5798b31e656a4293c58c5f830b366f521a5b95ed5cfbb3962ade71d625cea16651f1eab81a8e6530c0ac910ed19df2abd107943642345ed3 DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861 -EBUILD lvmlib-1.1.ebuild 691 BLAKE2B e51b2dd6275da76f1ab962e22991a76c8355c4bdeb08c14f50095de5b9538c89622c7c8972e5ae5c9e393d59424c2771e50a16f06896e584a35bfc2b05c9be76 SHA512 f346cceed684f2e31cd822b5e770b10b96e9dad626fe752ac1990d41fa71da2a60288deae3492abaa252c2509479b305516fe8dedc228520f89952750fc8b685 +EBUILD lvmlib-1.1.ebuild 754 BLAKE2B 014580976485b6e43773a31d9669c8b6d8e62a0d1bb00ddaeec04d9670ae288afc38cfd652909755d1a2dfb9230087daafdd9e7ef1dc14f3ebfecba8fe16706b SHA512 b1853f8811e22c33b227b8c996f4691b2e207a64e20b13f9e2bdaa2f4527f1641aa3b13c042f60fe09365613e5212d4136339534b143b6b2403a5f5f132d1384 MISC metadata.xml 822 BLAKE2B 6c75a01261fb049e7b175c7f4b8de7da8978bca198f5a55581630087682920da280185d6c1512a81a0e05bbe02b8728b8261564c4d7d6a15db67218baa47f5b6 SHA512 95c53741b0af7d02006f5715e9468b01d984c5145a4f0582f268da5c3ef19c7902d7a9fe48a8b07c1825dbe9a8e09cc03c208a405218ec930b72ddd9e9d31219 diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch new file mode 100644 index 000000000000..36d680794f07 --- /dev/null +++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch @@ -0,0 +1,15 @@ +--- a/Lvm/Common/IdMap.hs ++++ b/Lvm/Common/IdMap.hs +@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a + unionMaps = foldr unionMap emptyMap + + foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b +-foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m ++foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m + + foldMap :: (a -> b -> b) -> b -> IdMap a -> b +-foldMap f z (IdMap m) = IntMap.fold f z m ++foldMap f z (IdMap m) = IntMap.foldr f z m + + sizeMap :: IdMap a -> Int + sizeMap (IdMap m) = IntMap.size m diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch new file mode 100644 index 000000000000..8f9e85402f9c --- /dev/null +++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch @@ -0,0 +1,14 @@ +--- a/Lvm/Common/Byte.hs ++++ b/Lvm/Common/Byte.hs +@@ -19,2 +19,3 @@ import System.Exit + import System.IO ++import qualified Data.Semigroup as S + +@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check) + ++instance S.Semigroup Bytes where ++ (<>) bs Nil = bs ++ (<>) Nil cs = cs ++ (<>) bs cs = Cat bs cs ++ + instance Monoid Bytes where diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild index 9512fb153ec8..7184d226bf02 100644 --- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild +++ b/dev-haskell/lvmlib/lvmlib-1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.4.4.9999 @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10.1.0 " -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch + "${FILESDIR}"/${PN}-1.1-ghc84.patch + "${FILESDIR}"/${PN}-1.1-ghc-8.8.patch +) |