Hello community, here is the log from the commit of package ghc-taggy for openSUSE:Factory checked in at 2017-08-31 20:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-taggy (Old) and /work/SRC/openSUSE:Factory/.ghc-taggy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-taggy" Thu Aug 31 20:49:45 2017 rev:2 rq:513722 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-taggy/ghc-taggy.changes 2017-03-24 01:58:23.785566250 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-taggy.new/ghc-taggy.changes 2017-08-31 20:49:46.447787356 +0200 @@ -1,0 +2,6 @@ +Tue Aug 1 15:14:00 UTC 2017 - psim...@suse.com + +- Apply "fix-lts-9-build.patch" from upstream to add support for + recent versions of blaze-markup. + +------------------------------------------------------------------- Old: ---- 1.cabal New: ---- fix-lts-9-build.patch taggy.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-taggy.spec ++++++ --- /var/tmp/diff_new_pack.aivjT4/_old 2017-08-31 20:49:47.883585814 +0200 +++ /var/tmp/diff_new_pack.aivjT4/_new 2017-08-31 20:49:47.911581884 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-taggy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,8 @@ Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal +Patch1: fix-lts-9-build.patch BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-attoparsec-devel @@ -89,13 +90,14 @@ %prep %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal +%patch1 -p1 %build %ghc_lib_build %install %ghc_lib_install -%ghc_fix_dynamic_rpath %{pkg_name} +%ghc_fix_rpath %{pkg_name}-%{version} %check %cabal_test ++++++ fix-lts-9-build.patch ++++++ >From 5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed Mon Sep 17 00:00:00 2001 From: vi <v...@computational.law> Date: Fri, 28 Jul 2017 19:00:23 +0200 Subject: [PATCH] Build compatability with blaze-markup 0.8.0.0. Resolves #19. Resolves #20. --- src/Text/Taggy/Renderer.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Text/Taggy/Renderer.hs b/src/Text/Taggy/Renderer.hs index d1d3486..a931905 100644 --- a/src/Text/Taggy/Renderer.hs +++ b/src/Text/Taggy/Renderer.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE LambdaCase, RecordWildCards, FlexibleInstances, UndecidableInstances, OverloadedStrings #-} +{-# LANGUAGE CPP, LambdaCase, RecordWildCards, FlexibleInstances, UndecidableInstances, OverloadedStrings #-} -- | -- Module : Text.Taggy.Renderer -- Copyright : (c) 2014 Alp Mestanogullari, Vikram Verma @@ -33,7 +33,13 @@ class AsMarkup a where -- | A 'Node' is convertible to 'Markup' instance AsMarkup Node where toMarkup convertEntities = \case - NodeContent text -> Content $ if convertEntities then Text text else PreEscaped (Text text) +#if MIN_VERSION_blaze_markup(0,8,0) + NodeContent text -> flip Content () $ +#else + NodeContent text -> Content $ +#endif + if convertEntities then Text text else PreEscaped (Text text) + NodeElement elmt -> toMarkup convertEntities elmt -- | An 'Element' is convertible to 'Markup' ++++++ taggy.cabal ++++++ name: taggy version: 0.2.0 x-revision: 1 synopsis: Efficient and simple HTML/XML parsing library description: /taggy/ is a simple package for parsing HTML (and should work with XML) written on top of the <http://hackage.haskell.org/package/attoparsec attoparsec> library, which makes it one of the most efficient (space and time consumption wise) on hackage. . This is the root module of /taggy/. It reexports everything from the package. See each module's docs for details about the functions and types involved in /taggy/. . While we've been testing the parser on /many/ pages, it may still be a bit rough around the edges. Let us know on <http://github.com/alpmestan/taggy/issues github> if you have any problem. . If you like to look at your HTML through various optical instruments, feel free to take a look at the companion <http://hackage.haskell.org/package/taggy-lens taggy-lens> package we've put up together. It makes HTML parsing a piece of cake. . If you want to parse a document as list of tags and go through it as some kind of stream by just picking what you need, head to "Text.Taggy.Parser" and take a look at 'Text.Taggy.Parser.taggyWith' and 'Text.Taggy.Parser.run'. . If you want to parse the document as a DOM tree and traverse it to find the information you need, use 'Text.Taggy.DOM.parseDOM'. This is especially useful when used in conjunction with <http://hackage.haskell.org/package/taggy-lens taggy-lens>. . If you build some HTML manually or just transform some existing DOM tree and want to turn it into a 'Data.Text.Lazy.Text' head to "Text.Taggy.Renderer" and look at 'Text.Taggy.Renderer.render'. homepage: http://github.com/alpmestan/taggy license: BSD3 license-file: LICENSE author: Alp Mestanogullari, Vikram Verma maintainer: alpmes...@gmail.com copyright: 2014 Alp Mestanogullari, Vikram Verma category: Text, Web build-type: Simple extra-source-files: html_files/*.html data-files: html_files/*.html cabal-version: >=1.10 library exposed-modules: Text.Taggy, Text.Taggy.DOM, Text.Taggy.Entities, Text.Taggy.Parser, Text.Taggy.Renderer Text.Taggy.Types other-modules: build-depends: base >=4.6 && <5, blaze-html >= 0.7, blaze-markup >= 0.6, text >= 1, attoparsec >=0.11, vector >=0.7, unordered-containers >= 0.2 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall -O2 -fno-warn-unused-do-bind -funbox-strict-fields ghc-prof-options: -Wall -O2 -fno-warn-unused-do-bind -funbox-strict-fields -prof -auto-all executable taggy main-is: taggy.hs hs-source-dirs: example build-depends: base >=4.5 && <5, text >= 1, attoparsec >=0.12, taggy ghc-options: -Wall -O2 -fno-warn-unused-do-bind ghc-prof-options: -Wall -prof -auto-all -O2 -fno-warn-unused-do-bind -rtsopts "-with-rtsopts=-sstderr -p" default-language: Haskell2010 benchmark taggytagsoup main-is: vs-tagsoup.hs hs-source-dirs: bench ghc-options: -O2 -funbox-strict-fields type: exitcode-stdio-1.0 build-depends: base >= 4 && < 5, text >=1, attoparsec >=0.12, taggy >= 0.1, tagsoup, criterion, vector default-language: Haskell2010 test-suite unit type: exitcode-stdio-1.0 ghc-options: -Wall -O -fno-warn-unused-do-bind hs-source-dirs: src, tests/unit main-is: Spec.hs build-depends: base == 4.* , blaze-html , blaze-markup , text , hspec , hspec-attoparsec , vector , attoparsec , unordered-containers default-language: Haskell2010 test-suite integration type: exitcode-stdio-1.0 ghc-options: -Wall -O -fno-warn-unused-do-bind hs-source-dirs: src, tests/integration main-is: Main.hs build-depends: base == 4.* , blaze-html , blaze-markup , directory , text , hspec >= 1.11 , hspec-attoparsec , vector , attoparsec , unordered-containers other-modules: Paths_taggy default-language: Haskell2010
