[arch-commits] Commit in haskell-libmpd/trunk (PKGBUILD ghc-8.6.patch)

Felix Yan felixonmars at archlinux.org
Fri Aug 16 05:51:38 UTC 2019


    Date: Friday, August 16, 2019 @ 05:51:38
  Author: felixonmars
Revision: 499706

upgpkg: haskell-libmpd 0.9.0.9-1

rebuild with libmpd 0.9.0.9

Modified:
  haskell-libmpd/trunk/PKGBUILD
Deleted:
  haskell-libmpd/trunk/ghc-8.6.patch

---------------+
 PKGBUILD      |   15 ++++-----------
 ghc-8.6.patch |   36 ------------------------------------
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-16 05:50:51 UTC (rev 499705)
+++ PKGBUILD	2019-08-16 05:51:38 UTC (rev 499706)
@@ -6,8 +6,8 @@
 
 _hkgname=libmpd
 pkgname=haskell-libmpd
-pkgver=0.9.0.8
-pkgrel=70
+pkgver=0.9.0.9
+pkgrel=1
 pkgdesc='Client library for MPD, the Music Player Daemon'
 url='https://hackage.haskell.org/package/libmpd'
 license=('MIT')
@@ -16,16 +16,9 @@
          'haskell-filepath' 'haskell-network' 'haskell-time' 'haskell-utf8-string'
          'haskell-primitive')
 makedepends=('ghc')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vimus/libmpd-haskell/archive/v${pkgver}.tar.gz
-        ghc-8.6.patch)
-sha512sums=('5cc24fe3a81f59b9a7dff96771e9e5312a5e64e0947e191439447838f00f176fc5dbe086fb8fc774dd4896480eb552640e4f0d93ab947f78bf01c72aa93f6907'
-            '9b3f4a2ff5859f100468d0da0ceb78e0affd4fd48e8c0f221f6435f1fa13bbf815f654909ace0c737fc4a3a1d9208b269b7d9a16e731eb37fc4d61e09feaab9b')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vimus/libmpd-haskell/archive/v${pkgver}.tar.gz)
+sha512sums=('06838c27dfc8af54a8ea711828ac7df480a0235addcd9ff42a8cd3daa4d35b7d8846de15e28ec83998ed464d38558a7d74680de032f4a7a343bb8208c3753ba9')
 
-prepare() {
-  cd $_hkgname-haskell-$pkgver
-  patch -p1 -i ../ghc-8.6.patch
-}
-
 build() {
   cd ${_hkgname}-haskell-${pkgver}
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \

Deleted: ghc-8.6.patch
===================================================================
--- ghc-8.6.patch	2019-08-16 05:50:51 UTC (rev 499705)
+++ ghc-8.6.patch	2019-08-16 05:51:38 UTC (rev 499706)
@@ -1,36 +0,0 @@
-diff --git a/src/Network/MPD/Commands/Types.hs b/src/Network/MPD/Commands/Types.hs
-index 699821a..b12e68e 100644
---- a/src/Network/MPD/Commands/Types.hs
-+++ b/src/Network/MPD/Commands/Types.hs
-@@ -44,6 +44,7 @@ import           Network.MPD.Commands.Arg (MPDArg(prep), Args(Args))
- import           Data.Default.Class
- 
- import qualified Data.Map as M
-+import           Data.Map.Strict (insertWith)
- import           Data.Time.Clock (UTCTime)
- import           Data.String
- 
-@@ -263,7 +264,7 @@ sgGetTag meta s = M.lookup meta $ sgTags s
- 
- -- | Add metadata tag value.
- sgAddTag :: Metadata -> Value -> Song -> Song
--sgAddTag meta value s = s { sgTags = M.insertWith' (++) meta [value] (sgTags s) }
-+sgAddTag meta value s = s { sgTags = insertWith (++) meta [value] (sgTags s) }
- 
- defaultSong :: Path -> Song
- defaultSong path =
-diff --git a/src/Network/MPD/Core.hs b/src/Network/MPD/Core.hs
-index 29f7101..e4d4c1d 100644
---- a/src/Network/MPD/Core.hs
-+++ b/src/Network/MPD/Core.hs
-@@ -117,7 +117,8 @@ mpdOpen = MPD $ do
-             (Just <$> connectTo host (PortNumber $ fromInteger port))
-             `catchAny` const (return Nothing)
-         checkConn = do
--            [msg] <- send ""
-+            singleMsg <- send ""
-+            let [msg] = singleMsg
-             if "OK MPD" `isPrefixOf` msg
-                 then MPD $ checkVersion $ parseVersion msg
-                 else return False
-


More information about the arch-commits mailing list