diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -#### 0.7.1.4 +#### 0.7.1.5 - Relax many version bounds, in the context of GHC 9.4: - `base >= 4.8 && < 4.18` diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015, Dimitri Sabadie +Copyright (c) 2015, 2026, Dimitri Sabadie All rights reserved. @@ -13,7 +13,7 @@ disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Dimitri Sabadie nor the names of other + * Neither the name of Dimitri Sabadie nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/src/Codec/Wavefront.hs b/src/Codec/Wavefront.hs --- a/src/Codec/Wavefront.hs +++ b/src/Codec/Wavefront.hs @@ -2,10 +2,10 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Element.hs b/src/Codec/Wavefront/Element.hs --- a/src/Codec/Wavefront/Element.hs +++ b/src/Codec/Wavefront/Element.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Face.hs b/src/Codec/Wavefront/Face.hs --- a/src/Codec/Wavefront/Face.hs +++ b/src/Codec/Wavefront/Face.hs @@ -2,10 +2,10 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/IO.hs b/src/Codec/Wavefront/IO.hs --- a/src/Codec/Wavefront/IO.hs +++ b/src/Codec/Wavefront/IO.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Lexer.hs b/src/Codec/Wavefront/Lexer.hs --- a/src/Codec/Wavefront/Lexer.hs +++ b/src/Codec/Wavefront/Lexer.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Line.hs b/src/Codec/Wavefront/Line.hs --- a/src/Codec/Wavefront/Line.hs +++ b/src/Codec/Wavefront/Line.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Location.hs b/src/Codec/Wavefront/Location.hs --- a/src/Codec/Wavefront/Location.hs +++ b/src/Codec/Wavefront/Location.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Normal.hs b/src/Codec/Wavefront/Normal.hs --- a/src/Codec/Wavefront/Normal.hs +++ b/src/Codec/Wavefront/Normal.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Object.hs b/src/Codec/Wavefront/Object.hs --- a/src/Codec/Wavefront/Object.hs +++ b/src/Codec/Wavefront/Object.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Point.hs b/src/Codec/Wavefront/Point.hs --- a/src/Codec/Wavefront/Point.hs +++ b/src/Codec/Wavefront/Point.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/TexCoord.hs b/src/Codec/Wavefront/TexCoord.hs --- a/src/Codec/Wavefront/TexCoord.hs +++ b/src/Codec/Wavefront/TexCoord.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- diff --git a/src/Codec/Wavefront/Token.hs b/src/Codec/Wavefront/Token.hs --- a/src/Codec/Wavefront/Token.hs +++ b/src/Codec/Wavefront/Token.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2015 Dimitri Sabadie +-- Copyright : (C) 2015, 2026 Dimitri Sabadie -- License : BSD3 -- --- Maintainer : Dimitri Sabadie +-- Maintainer : Dimitri Sabadie -- Stability : experimental -- Portability : portable -- @@ -127,7 +127,7 @@ skipHSpace pointIndices <- parsePointIndices pts <- case pointIndices of - _:_:_ -> pure $ zipWith Line pointIndices (tail pointIndices) + _:tl@(_:_) -> pure $ zipWith Line pointIndices tl _ -> fail "line doesn't have at least two points" eol pure pts diff --git a/wavefront.cabal b/wavefront.cabal --- a/wavefront.cabal +++ b/wavefront.cabal @@ -1,15 +1,15 @@ name: wavefront -version: 0.7.1.5 +version: 0.7.2.0 synopsis: Wavefront OBJ loader description: A Wavefront OBJ loader. Currently supports polygonal information. More could be added if needed (like curves and surface) if people contribute. Feel free to help! -homepage: https://github.com/phaazon/wavefront -bug-reports: https://github.com/phaazon/wavefront/issues +homepage: https://git.sr.ht/~hadronized/wavefront +bug-reports: https://lists.sr.ht/~hadronized/wavefront license: BSD3 license-file: LICENSE -author: Dimitri Sabadie -maintainer: Dimitri Sabadie +author: Dimitri Sabadie +maintainer: Dimitri Sabadie copyright: Dimitri Sabadie category: Codec @@ -19,7 +19,7 @@ source-repository head type: git - location: git://github.com/phaazon/wavefront.git + location: ssh://git.sr.ht/~hadronized/wavefront library ghc-options: -W -Wall @@ -40,12 +40,12 @@ default-extensions: OverloadedStrings - build-depends: base >= 4.8 && < 4.18 + build-depends: base >= 4.8 && < 4.23 , attoparsec >= 0.13 && < 0.15 , dlist >= 0.7 && < 1.1 - , filepath >= 1.4 && < 1.5 + , filepath >= 1.4 && < 1.6 , mtl >= 2.2 && < 2.4 - , text >= 1.2 && < 2.1 + , text >= 1.2 && < 2.2 , transformers >= 0.4 && < 0.7 , vector >= 0.11 && < 0.14