From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA5EE138359 for ; Fri, 7 Aug 2020 21:17:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 142E2E08E8; Fri, 7 Aug 2020 21:17:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1EF4E08E8 for ; Fri, 7 Aug 2020 21:17:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C637134F40E for ; Fri, 7 Aug 2020 21:17:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D6A7239 for ; Fri, 7 Aug 2020 21:17:38 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1596835052.a61cae65f4cf0813e3efa7eb9ac53b054856e100.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/idiii/, dev-haskell/idiii/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch dev-haskell/idiii/idiii-0.1.3.3.ebuild X-VCS-Directories: dev-haskell/idiii/ dev-haskell/idiii/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: a61cae65f4cf0813e3efa7eb9ac53b054856e100 X-VCS-Branch: master Date: Fri, 7 Aug 2020 21:17:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f70e6e62-f3b4-4c51-ad7b-fa1f150fe2fb X-Archives-Hash: c1372f5db713fc3eb76842aee119d182 commit: a61cae65f4cf0813e3efa7eb9ac53b054856e100 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Aug 7 21:17:20 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Aug 7 21:17:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61cae65 dev-haskell/idiii: tweak for ghc-8.8 Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/736280 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch | 7 +++++++ dev-haskell/idiii/idiii-0.1.3.3.ebuild | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch b/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch new file mode 100644 index 00000000000..0bd0469e53a --- /dev/null +++ b/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch @@ -0,0 +1,7 @@ +--- a/src/ID3/Type/Tag.hs ++++ b/src/ID3/Type/Tag.hs +@@ -89,3 +89,3 @@ getActualSize t = (footerSize t) + (framesSize (t^.frames)) + (extHSize t) + framesSize :: Map FrameID ID3Frame -> FrameSize +-framesSize fs = Map.fold (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs ++framesSize fs = Map.foldr (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs + footerSize :: ID3Tag -> Integer diff --git a/dev-haskell/idiii/idiii-0.1.3.3.ebuild b/dev-haskell/idiii/idiii-0.1.3.3.ebuild index 92147c2965b..874e97f4250 100644 --- a/dev-haskell/idiii/idiii-0.1.3.3.ebuild +++ b/dev-haskell/idiii/idiii-0.1.3.3.ebuild @@ -5,11 +5,11 @@ EAPI=6 # ebuild generated by hackport 0.5.9999 -CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" +CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files inherit haskell-cabal DESCRIPTION="ID3v2 (tagging standard for MP3 files) library" -HOMEPAGE="https://hackage.haskell.org/package/idiii" +HOMEPAGE="http://hackage.haskell.org/package/idiii" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" @@ -28,5 +28,6 @@ RDEPEND="dev-haskell/data-accessor:=[profile?] " DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit ) " + +PATCHES=("${FILESDIR}"/${P}-fold.patch)