[arch-commits] Commit in haskell-skylighting/trunk (PKGBUILD system-pcre.patch)
Felix Yan
felixonmars at archlinux.org
Fri Nov 3 10:10:41 UTC 2017
Date: Friday, November 3, 2017 @ 10:10:35
Author: felixonmars
Revision: 265294
upgpkg: haskell-skylighting 0.4.3-1
rebuild with pandoc,2.0.1 doctemplates,0.2.1 hslua,0.9.2 skylighting,0.4.3 cmark-gfm,0.1.3
Modified:
haskell-skylighting/trunk/PKGBUILD
Deleted:
haskell-skylighting/trunk/system-pcre.patch
-------------------+
PKGBUILD | 26 +++++++++--------------
system-pcre.patch | 57 ----------------------------------------------------
2 files changed, 10 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-03 10:07:09 UTC (rev 265293)
+++ PKGBUILD 2017-11-03 10:10:35 UTC (rev 265294)
@@ -2,30 +2,24 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
_hkgname=skylighting
-pkgname=haskell-skylighting
-pkgver=0.1.1.5
-pkgrel=34
+pkgname=haskell-skylighting
+pkgver=0.4.3
+pkgrel=1
pkgdesc="Syntax highlighting library"
url="https://github.com/jgm/skylighting"
license=('GPL2')
arch=('i686' 'x86_64')
-depends=('ghc-libs' 'haskell-aeson' 'haskell-blaze-html' 'haskell-case-insensitive' 'haskell-hxt'
- 'haskell-mtl' 'haskell-pretty-show' 'haskell-regex-pcre' 'haskell-safe' 'haskell-text'
+depends=('ghc-libs' 'haskell-aeson' 'haskell-attoparsec' 'haskell-base64-bytestring'
+ 'haskell-blaze-html' 'haskell-case-insensitive' 'haskell-hxt' 'haskell-mtl'
+ 'haskell-pretty-show' 'haskell-regex-pcre' 'haskell-safe' 'haskell-text'
'haskell-utf8-string')
makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
- system-pcre.patch)
-md5sums=('7681c510ab20d79a32a0a54479a2325c'
- '5971978a26d8133df62b803bd67a70b6')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha512sums=('a8085830514b72c58973fe748ca82f2a69fe756e5db065b0b076943e474de6ada127a6980631a269e3e498abdbe81b58a701d5820e18f91051b272a4286366d6')
-prepare() {
+build() {
cd "${srcdir}/${_hkgname}-${pkgver}"
- patch -p1 -i ../system-pcre.patch
-}
-build() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
-
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
@@ -39,7 +33,7 @@
package() {
cd "${srcdir}/${_hkgname}-${pkgver}"
-
+
install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
runhaskell Setup copy --destdir="${pkgdir}"
Deleted: system-pcre.patch
===================================================================
--- system-pcre.patch 2017-11-03 10:07:09 UTC (rev 265293)
+++ system-pcre.patch 2017-11-03 10:10:35 UTC (rev 265294)
@@ -1,57 +0,0 @@
-commit 5fbf9b74c1d34a395a99e61349e3f5f8af0f6140
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Mon Feb 6 11:44:37 2017 +0800
-
- Add a flag to build with system pcre
-
-diff --git a/skylighting.cabal b/skylighting.cabal
-index 83d39aa..f5684bf 100644
---- a/skylighting.cabal
-+++ b/skylighting.cabal
-@@ -228,7 +228,6 @@ library
- mtl,
- text,
- bytestring,
-- regex-pcre-builtin,
- directory,
- filepath,
- aeson,
-@@ -238,6 +237,10 @@ library
- safe,
- blaze-html >= 0.5,
- containers
-+ if flag(system-pcre)
-+ build-depends: regex-pcre
-+ else
-+ build-depends: regex-pcre-builtin
- hs-source-dirs: src
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
-@@ -255,12 +258,15 @@ Flag executable
- Description: Build skylighting CLI tool
- Default: False
-
-+Flag system-pcre
-+ Description: Use regex-pcre instead of regex-pcre-builtin
-+ Default: False
-+
- executable skylighting-extract
- build-depends: base >= 4.7 && < 5.0,
- filepath,
- bytestring,
- text,
-- regex-pcre-builtin,
- safe,
- hxt,
- utf8-string,
-@@ -269,6 +275,10 @@ executable skylighting-extract
- pretty-show,
- containers,
- directory
-+ if flag(system-pcre)
-+ build-depends: regex-pcre
-+ else
-+ build-depends: regex-pcre-builtin
- hs-source-dirs: bin, src
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
More information about the arch-commits
mailing list