Date: Thursday, June 2, 2016 @ 18:11:36 Author: fyan Revision: 177740
upgpkg: hasktags 0.69.1-3 rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1 Added: hasktags/trunk/ghc8.patch Modified: hasktags/trunk/PKGBUILD ------------+ PKGBUILD | 16 +++++++++++----- ghc8.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-06-02 15:42:12 UTC (rev 177739) +++ PKGBUILD 2016-06-02 16:11:36 UTC (rev 177740) @@ -4,17 +4,23 @@ pkgname=hasktags pkgver=0.69.1 -pkgrel=2 +pkgrel=3 pkgdesc="Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs" url="http://github.com/MarcWeber/hasktags"; license=("custom:BSD3") arch=('i686' 'x86_64') depends=('gmp' 'libffi') -makedepends=("ghc=7.10.3" "haskell-json" "haskell-utf8-string") -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";) -sha256sums=('243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6') +makedepends=("ghc=8.0.1" "haskell-json" "haskell-utf8-string") +source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"; + ghc8.patch) +sha256sums=('243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6' + 'c2213489d358fdaccc7724c8d6bad2c1ce066b421940da582127331a5d1a4ca7') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../ghc8.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" Added: ghc8.patch =================================================================== --- ghc8.patch (rev 0) +++ ghc8.patch 2016-06-02 16:11:36 UTC (rev 177740) @@ -0,0 +1,48 @@ +From 94c9f1e11940384eedf8c4749ffa4045539f9290 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <[email protected]> +Date: Sat, 28 May 2016 21:49:55 +0100 +Subject: [PATCH] src/Hasktags.hs: tweak for ghc-8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +directory-1.2.6.0 (comes with ghc-8.0.1) +now includes 'isSymbolicLink' helper. + +Guard against symbol collisison: + + src/Hasktags.hs:495:5: error: + Ambiguous occurrence ‘isSymbolicLink’ + It could refer to either ‘System.Directory.isSymbolicLink’, + imported from ‘System.Directory’ at src/Hasktags.hs:31:1-23 + or ‘System.Posix.Files.isSymbolicLink’, + imported from ‘System.Posix.Files’ at src/Hasktags.hs:38:1-25 + (and originally defined in ‘unix-2.7.2.0:System.Posix.Files.Common’) + +Signed-off-by: Sergei Trofimovich <[email protected]> +--- + src/Hasktags.hs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Hasktags.hs b/src/Hasktags.hs +index e45bd05..f5abaaf 100644 +--- a/src/Hasktags.hs ++++ b/src/Hasktags.hs +@@ -35,7 +35,7 @@ import Control.Monad + import DebugShow + + #ifdef VERSION_unix +-import System.Posix.Files ++import System.Posix.Files as SPF + #endif + import System.FilePath ((</>)) + +@@ -492,7 +492,7 @@ dirToFiles followSyms suffixes p = do + isD <- doesDirectoryExist p + isSymLink <- + #ifdef VERSION_unix +- isSymbolicLink `fmap` getSymbolicLinkStatus p ++ SPF.isSymbolicLink `fmap` getSymbolicLinkStatus p + #else + return False + #endif
