From 781549400233f1e476ff24eee6012d4bef0821b892b28dea8afdb29d10f4b513 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Feb 2022 14:36:54 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-unicode-transforms revision:20, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-unicode-transforms?expand=0&rev=51 --- ghc-unicode-transforms.changes | 11 ++ ghc-unicode-transforms.spec | 10 +- unicode-transforms-0.3.8.tar.gz | 3 - unicode-transforms-0.4.0.tar.gz | 3 + unicode-transforms.cabal | 217 ++++++++++++++++++++++++++++++++ 5 files changed, 236 insertions(+), 8 deletions(-) delete mode 100644 unicode-transforms-0.3.8.tar.gz create mode 100644 unicode-transforms-0.4.0.tar.gz create mode 100644 unicode-transforms.cabal diff --git a/ghc-unicode-transforms.changes b/ghc-unicode-transforms.changes index 575e056..8c862a0 100644 --- a/ghc-unicode-transforms.changes +++ b/ghc-unicode-transforms.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:33 UTC 2022 - psimons@suse.com + +- Update unicode-transforms to version 0.4.0 revision 1. + ## 0.4.0 (November 2021) + + * Bump `unicode-data` to `0.2` + * Allow `text 2.0` + * Update to Unicode version 14.0.0 + * Drop support for GHC 7.10 + ------------------------------------------------------------------- Sun Nov 21 20:08:38 UTC 2021 - Ondřej Súkup diff --git a/ghc-unicode-transforms.spec b/ghc-unicode-transforms.spec index c8b6c99..0e6ad91 100644 --- a/ghc-unicode-transforms.spec +++ b/ghc-unicode-transforms.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-unicode-transforms # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,13 @@ %global pkg_name unicode-transforms %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.8 +Version: 0.4.0 Release: 0 Summary: Unicode normalization License: BSD-3-Clause 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#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros @@ -34,13 +35,12 @@ ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-getopt-generics-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-split-devel %endif %description -Fast Unicode 13.0.0 normalization in Haskell (NFC, NFKC, NFD, NFKD). +Fast Unicode 14.0.0 normalization in Haskell (NFC, NFKC, NFD, NFKD). %package devel Summary: Haskell %{pkg_name} library development files @@ -55,7 +55,7 @@ files. %prep %autosetup -n %{pkg_name}-%{version} -cabal-tweak-dep-ver 'unicode-data' '<0.2' '<0.3' +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/unicode-transforms-0.3.8.tar.gz b/unicode-transforms-0.3.8.tar.gz deleted file mode 100644 index 2b16ebd..0000000 --- a/unicode-transforms-0.3.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4f7aa012c82ec4cbcff518aeb70f302b26e73c81f931b967763aa8ac7e76dc8 -size 644490 diff --git a/unicode-transforms-0.4.0.tar.gz b/unicode-transforms-0.4.0.tar.gz new file mode 100644 index 0000000..7570207 --- /dev/null +++ b/unicode-transforms-0.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3e04fc9c4d653623452e17c814f36c644bb326c0b018f6a4782fe28a1274354 +size 648786 diff --git a/unicode-transforms.cabal b/unicode-transforms.cabal new file mode 100644 index 0000000..5177f2f --- /dev/null +++ b/unicode-transforms.cabal @@ -0,0 +1,217 @@ +cabal-version: 2.2 + +name: unicode-transforms +version: 0.4.0 +x-revision: 1 +synopsis: Unicode normalization +description: Fast Unicode 14.0.0 normalization in Haskell (NFC, NFKC, NFD, NFKD). +category: Data,Text,Unicode +stability: Experimental +homepage: http://github.com/composewell/unicode-transforms +bug-reports: https://github.com/composewell/unicode-transforms/issues +author: Harendra Kumar +maintainer: harendra.kumar@gmail.com +copyright: 2016-2017 Harendra Kumar, + 2014–2015 Antonio Nikishaev +license: BSD-3-Clause +license-file: LICENSE +tested-with: GHC==8.0.2 + , GHC==8.2.2 + , GHC==8.4.4 + , GHC==8.6.5 + , GHC==8.8.4 + , GHC==8.10.7 + , GHC==9.0.1 + , GHC==9.2.1 +build-type: Simple +extra-source-files: + Changelog.md + MAINTAINING.md + NOTES.md + README.md + download-ucd-files.sh + benchmark/README.md + benchmark/NormalizeFile.hs + benchmark/data/AllChars.txt + benchmark/data/Deutsch.txt + benchmark/data/Devanagari.txt + benchmark/data/English.txt + benchmark/data/Japanese.txt + benchmark/data/Korean.txt + benchmark/data/Vietnamese.txt + test/data/NormalizationTest.txt + test/data/extra/NormalizationTest.txt + +source-repository head + type: git + location: https://github.com/composewell/unicode-transforms + +flag dev + description: Developer build + manual: True + default: False + +flag bench-show + description: Use bench-show to compare benchmarks + manual: True + default: False + +flag has-icu + description: Use text-icu for benchmark and test comparisons + manual: True + default: False + +flag has-llvm + description: Use llvm backend (faster) for compilation + manual: True + default: False + +flag use-gauge + description: Use gauge instead of tasty-bench for benchmarking + manual: True + default: False + +library + exposed-modules: + Data.Unicode.Types + Data.Text.Normalize + + -- Deprecated + Data.ByteString.UTF8.Normalize + other-modules: + Data.Unicode.Internal.NormalizeStream + hs-source-dirs: . + ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs + build-depends: + base >= 4.8 && < 4.17 + , unicode-data >= 0.2 && < 0.4 + , bytestring >= 0.9 && < 0.12 + , ghc-prim >= 0.2 && < 0.9 + + -- We depend on a lot of internal modules in text. We keep the upper bound + -- inclusive of the latest stable version. + , text >=1.1.1 && <=1.2.5.0 || >=2.0 && <2.1 + if flag(dev) + ghc-options: -O0 + else + ghc-options: -O2 -funbox-strict-fields -fspec-constr-count=10 + if flag(has-llvm) + ghc-options: -fllvm + default-language: Haskell2010 + +test-suite extras + type: exitcode-stdio-1.0 + main-is: Extra.hs + other-modules: + QuickCheckUtils + hs-source-dirs: + test + ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs + build-depends: + QuickCheck >=2.1 && <2.15 + , base >=4.7 && <4.17 + , deepseq >=1.1 && <1.5 + , text + , unicode-transforms + if flag(dev) + ghc-options: -O0 + else + ghc-options: -O2 -funbox-strict-fields + if flag(has-llvm) + ghc-options: -fllvm + default-language: Haskell2010 + +test-suite quickcheck + type: exitcode-stdio-1.0 + main-is: Properties.hs + other-modules: + QuickCheckUtils + hs-source-dirs: + test + ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs + build-depends: + QuickCheck >= 2.1 && < 2.15 + , unicode-data >= 0.2 && < 0.4 + , base >= 4.7 && < 4.17 + , deepseq >= 1.1 && < 1.5 + , hspec >= 2.0 && < 3 + , text + , unicode-transforms + if flag(dev) + ghc-options: -O0 + else + ghc-options: -O2 -funbox-strict-fields + if flag(has-llvm) + ghc-options: -fllvm + if flag(has-icu) + cpp-options: -DHAS_ICU + build-depends: + text-icu >=0.6.2.1 + default-language: Haskell2010 + +test-suite ucd + type: exitcode-stdio-1.0 + main-is: NormalizationTest.hs + hs-source-dirs: + test + ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs + build-depends: + base >=4.7 && <4.17 + , split >=0.1 && <0.3 + , text + , unicode-transforms + if flag(dev) + ghc-options: -O0 + else + ghc-options: -O2 -funbox-strict-fields + if flag(has-llvm) + ghc-options: -fllvm + default-language: Haskell2010 + +benchmark bench + type: exitcode-stdio-1.0 + main-is: Benchmark.hs + hs-source-dirs: + benchmark + ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs + build-depends: + base >=4.7 && <4.17 + , deepseq >=1.1.0 && <1.5 + , filepath >=1.0 && <2 + , path >=0.0.0 && <0.9 + , path-io >=0.1.0 && <1.7 + , text + , unicode-transforms + if flag(use-gauge) + build-depends: gauge >=0.2.0 && <0.3 + else + build-depends: tasty-bench>= 0.2.5 && <0.4 + mixins: tasty-bench (Test.Tasty.Bench as Gauge.Main) + if flag(dev) + ghc-options: -O0 + else + ghc-options: -O2 -funbox-strict-fields + if flag(has-llvm) + ghc-options: -fllvm + if flag(has-icu) + cpp-options: -DBENCH_ICU + build-depends: + text-icu >=0.6.2.1 && <0.8 + if impl(ghc < 7.10) + build-depends: + path (<0.5.12 || >0.5.12) + default-language: Haskell2010 + +executable chart + default-language: Haskell2010 + hs-source-dirs: benchmark + main-is: Chart.hs + if flag(bench-show) + buildable: True + build-Depends: + base >= 4.8 && < 4.17 + , bench-show >= 0.3 && < 0.4 + , split >= 0.2 && < 0.3 + , transformers >= 0.4 && < 0.6 + else + buildable: False From 993439e66fe91c701c8707b6ceeff844ba9af554262a226265721d418d7e03d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Feb 2022 02:03:04 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-unicode-transforms revision:21, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-unicode-transforms?expand=0&rev=52 --- ghc-unicode-transforms.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-unicode-transforms.changes b/ghc-unicode-transforms.changes index 8c862a0..de1a5fd 100644 --- a/ghc-unicode-transforms.changes +++ b/ghc-unicode-transforms.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 4 12:15:33 UTC 2022 - psimons@suse.com +Sun Jan 9 09:53:23 UTC 2022 - Peter Simons - Update unicode-transforms to version 0.4.0 revision 1. ## 0.4.0 (November 2021)