public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/wavy/files/, dev-haskell/wavy/
Date: Sun,  9 Aug 2020 18:27:48 +0000 (UTC)	[thread overview]
Message-ID: <1596997657.6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2.slyfox@gentoo> (raw)

commit:     6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 18:27:37 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 <slyfox <AT> 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


             reply	other threads:[~2020-08-09 18:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-09 18:27 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-09-11 10:01 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/wavy/files/, dev-haskell/wavy/ Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1596997657.6bfd43bee6d167c7ebe3f3cc9baa65bc52d75ab2.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox