[arch-commits] Commit in haskell-cmark-gfm/trunk (PKGBUILD system-cmark-gfm.patch)

[Felix Yan]

    Date: Sunday, December 9, 2018 @ 21:37:11
  Author: felixonmars
Revision: 413239

upgpkg: haskell-cmark-gfm 0.1.6-1

rebuild with ghc 8.6.3, cmark-gfm 0.1.6

Modified:
  haskell-cmark-gfm/trunk/PKGBUILD
Deleted:
  haskell-cmark-gfm/trunk/system-cmark-gfm.patch

------------------------+
 PKGBUILD               |   13 +++--------
 system-cmark-gfm.patch |   55 -----------------------------------------------
 2 files changed, 4 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-09 21:36:16 UTC (rev 413238)
+++ PKGBUILD	2018-12-09 21:37:11 UTC (rev 413239)
@@ -3,22 +3,17 @@
 
 _hkgname=cmark-gfm
 pkgname=haskell-cmark-gfm
-pkgver=0.1.5
-pkgrel=4
+pkgver=0.1.6
+pkgrel=1
 pkgdesc="Fast, accurate GitHub Flavored Markdown parser and renderer"
 url="https://github.com/kivikakk/cmark-gfm-hs"
-license=("custom:BSD3")
+license=("BSD")
 arch=('x86_64')
 depends=('ghc-libs' 'cmark-gfm')
 makedepends=('ghc' 'haskell-hunit')
 source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('24887a7217abf02a154b5babb76eb40f5d2b5dbb0631622408f807aaa1f5b6b9dba77e89690bec68262bee1978c51f22a5a51fd643bda17a521b313964de1958')
+sha512sums=('91d4fd86e01e4738a1476242733fa9d2734033c63fa1db394aabdc77047c9a83e9cc561ee3823acd30a93c61c7bc859e2cab1a7fcf131a85af974590f146f35c')
 
-prepare() {
-    cd $_hkgname-$pkgver
-    sed -i 's/cmark-gfmextensions/cmark-gfm-extensions/' $_hkgname.cabal
-}
-
 build() {
     cd $_hkgname-$pkgver
 

Deleted: system-cmark-gfm.patch
===================================================================
--- system-cmark-gfm.patch	2018-12-09 21:36:16 UTC (rev 413238)
+++ system-cmark-gfm.patch	2018-12-09 21:37:11 UTC (rev 413239)
@@ -1,55 +0,0 @@
-commit ff75a191f067ceac00f4edc065cc1317d69d81ba
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Mon Aug 20 14:44:55 2018 +0800
-
-    Fix build with system cmark-gfm (fixes #8)
-    
-    Use the public interface cmark_get_default_mem_allocator instead of
-    private CMARK_DEFAULT_MEM_ALLOCATOR.
-
-diff --git a/CMarkGFM.hsc b/CMarkGFM.hsc
-index 6bd4fce..a39579c 100644
---- a/CMarkGFM.hsc
-+++ b/CMarkGFM.hsc
-@@ -58,7 +58,7 @@ ensurePluginsRegistered = c_core_extensions_ensure_registered
- 
- -- | Frees a cmark linked list, produced by extsToLlist.
- freeLlist :: LlistPtr a -> IO ()
--freeLlist = c_cmark_llist_free c_CMARK_DEFAULT_MEM_ALLOCATOR
-+freeLlist = c_cmark_llist_free c_cmark_mem
- 
- -- | Converts a list of resolved extension pointers to a single cmark
- -- linked list, which can be passed to functions requiring a list of
-@@ -67,7 +67,7 @@ extsToLlist :: [ExtensionPtr] -> IO (LlistPtr ExtensionPtr)
- extsToLlist [] = return nullPtr
- extsToLlist (h:t) = do
-   t' <- extsToLlist t
--  c_cmark_llist_append c_CMARK_DEFAULT_MEM_ALLOCATOR t' (castPtr h)
-+  c_cmark_llist_append c_cmark_mem t' (castPtr h)
- 
- -- | Resolves CMarkExtensions to pointers.
- resolveExts :: [CMarkExtension] -> IO [ExtensionPtr]
-@@ -633,8 +633,8 @@ foreign import ccall "cmark.h cmark_llist_append"
- foreign import ccall "cmark.h cmark_llist_free"
-     c_cmark_llist_free :: MemPtr -> LlistPtr a -> IO ()
- 
--foreign import ccall "cmark.h &CMARK_DEFAULT_MEM_ALLOCATOR"
--    c_CMARK_DEFAULT_MEM_ALLOCATOR :: MemPtr
-+foreign import ccall "cmark.h cmark_get_default_mem_allocator"
-+    c_cmark_mem :: MemPtr
- 
- foreign import ccall "cmark_extension_api.h cmark_parser_attach_syntax_extension"
-     c_cmark_parser_attach_syntax_extension :: ParserPtr -> ExtensionPtr -> IO ()
-diff --git a/cmark-gfm.cabal b/cmark-gfm.cabal
-index afe9d1c..6dec4a8 100644
---- a/cmark-gfm.cabal
-+++ b/cmark-gfm.cabal
-@@ -74,7 +74,7 @@ library
-   default-language:    Haskell2010
-   ghc-options:         -Wall -fno-warn-unused-do-bind
-   if flag(pkgconfig)
--    pkgconfig-depends: libcmark-gfm
-+    Extra-Libraries: cmark-gfm cmark-gfmextensions
-   else
-     cc-options:        -Wall -std=c99
-     Include-dirs:      cbits