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 58C2B138359 for ; Sun, 9 Aug 2020 18:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B02FE084E; Sun, 9 Aug 2020 18:27:51 +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 5C699E084E for ; Sun, 9 Aug 2020 18:27:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6276A34F423 for ; Sun, 9 Aug 2020 18:27:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6A302CE for ; Sun, 9 Aug 2020 18:27:48 +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: <1596997657.6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/wavy/files/, dev-haskell/wavy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch dev-haskell/wavy/wavy-0.1.0.0.ebuild X-VCS-Directories: dev-haskell/wavy/ dev-haskell/wavy/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2 X-VCS-Branch: master Date: Sun, 9 Aug 2020 18:27:48 +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: 639b3e90-28e9-46f8-a23d-bb39a3ddb7a0 X-Archives-Hash: 661e6dbd5683b54f9eba12f78b8891ff commit: 6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 9 18:27:37 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 9 18:27:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfd43be dev-haskell/wavy: tweak for ghc-8.8 Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/736444 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch | 11 +++++++++++ dev-haskell/wavy/wavy-0.1.0.0.ebuild | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch new file mode 100644 index 00000000000..5d5fdee9bd2 --- /dev/null +++ b/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch @@ -0,0 +1,11 @@ +--- a/Sound/Wav/ChannelData.hs ++++ b/Sound/Wav/ChannelData.hs +@@ -111,7 +111,7 @@ wordPutter 1 = putInt8 . zeroStable (0 :: Int8) + wordPutter 2 = putInt16le . zeroStable (0 :: Int16) + wordPutter 3 = putInt32le . zeroStable (0 :: Int32) + wordPutter 4 = putInt64le +-wordPutter x = \_ -> fail $ "The is no word putter for byte size " ++ show x ++wordPutter x = \_ -> error $ "The is no word putter for byte size " ++ show x + + wordGetter :: (Num a, Show a, Eq a) => a -> Get Int64 + wordGetter 1 = fmap zeroStable64 getInt8 diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild index 92dff555260..bfc61294c40 100644 --- a/dev-haskell/wavy/wavy-0.1.0.0.ebuild +++ b/dev-haskell/wavy/wavy-0.1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Process WAVE files in Haskell" -HOMEPAGE="https://bitbucket.org/robertmassaioli/wavy" +HOMEPAGE="http://bitbucket.org/robertmassaioli/wavy" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" @@ -27,7 +27,10 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.18.1.3 " -PATCHES=("${FILESDIR}"/${P}-binary-0.8.patch) +PATCHES=( + "${FILESDIR}"/${P}-binary-0.8.patch + "${FILESDIR}"/${P}-ghc-8.8.patch +) src_prepare() { default