Dear maintainer,
since this package is currently involved in the icu transition, I've
prepared an NMU for haskell-text-icu (versioned as 0.7.0.1-14.1). The
diff is attached to this message.
Cheers
--
Sebastian Ramacher
diff -Nru haskell-text-icu-0.7.0.1/debian/changelog haskell-text-icu-0.7.0.1/debian/changelog
--- haskell-text-icu-0.7.0.1/debian/changelog 2020-08-19 12:06:30.000000000 +0200
+++ haskell-text-icu-0.7.0.1/debian/changelog 2022-04-26 23:04:25.000000000 +0200
@@ -1,3 +1,11 @@
+haskell-text-icu (0.7.0.1-14.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch from László Böszörményi to build with icu 70.1 (Closes:
+ #1004093)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Tue, 26 Apr 2022 23:04:25 +0200
+
haskell-text-icu (0.7.0.1-14) unstable; urgency=medium
* Patch for Unicode 11.0, 12.0, and 13.0 (Closes: #962402)
diff -Nru haskell-text-icu-0.7.0.1/debian/patches/lowercase_true.patch haskell-text-icu-0.7.0.1/debian/patches/lowercase_true.patch
--- haskell-text-icu-0.7.0.1/debian/patches/lowercase_true.patch 1970-01-01 01:00:00.000000000 +0100
+++ haskell-text-icu-0.7.0.1/debian/patches/lowercase_true.patch 2022-04-26 23:04:13.000000000 +0200
@@ -0,0 +1,19 @@
+Description: since ICU 68.1 TRUE and FALSE are no longer defined
+ Use their C99 / C++ analogues, ie use them in lowercase.
+Author: Laszlo Boszormenyi (GCS) <g...@debian.org>
+Forwarded: no
+Last-Update: 2022-01-20
+
+---
+
+--- haskell-text-icu-0.7.0.1.orig/cbits/text_icu.c
++++ haskell-text-icu-0.7.0.1/cbits/text_icu.c
+@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest,
+
+ int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2)
+ {
+- return u_strCompareIter(iter1, iter2, TRUE);
++ return u_strCompareIter(iter1, iter2, true);
+ }
+
+ UBlockCode __hs_ublock_getCode(UChar32 c)
diff -Nru haskell-text-icu-0.7.0.1/debian/patches/newer-icu haskell-text-icu-0.7.0.1/debian/patches/newer-icu
--- haskell-text-icu-0.7.0.1/debian/patches/newer-icu 2020-08-19 12:06:30.000000000 +0200
+++ haskell-text-icu-0.7.0.1/debian/patches/newer-icu 2022-04-26 23:04:13.000000000 +0200
@@ -1,17 +1,22 @@
--- a/Data/Text/ICU/Char.hsc
+++ b/Data/Text/ICU/Char.hsc
-@@ -129,6 +129,10 @@
- | PopDirectionalFormat
- | DirNonSpacingMark
- | BoundaryNeutral
-+ | FirstStrongIsolate
-+ | LeftToRightIsolate
-+ | RightToLeftIsolate
-+ | PopDirectionalIsolate
- deriving (Eq, Enum, Show, Typeable)
-
- instance NFData Direction where
-@@ -357,6 +361,94 @@
+@@ -51,6 +51,7 @@ module Data.Text.ICU.Char
+ , LineBreak_(..)
+ , SentenceBreak_(..)
+ , WordBreak_(..)
++ , BidiPairedBracketType_(..)
+ -- * Property value types
+ , BlockCode(..)
+ , Direction(..)
+@@ -66,6 +67,7 @@ module Data.Text.ICU.Char
+ , LineBreak(..)
+ , SentenceBreak(..)
+ , WordBreak(..)
++ , BidiPairedBracketType(..)
+ -- * Functions
+ , blockCode
+ , charFullName
+@@ -357,6 +359,48 @@ data BlockCode =
| SoraSompeng
| SundaneseSupplement
| Takri
@@ -57,52 +62,108 @@
+ | OldHungarian
+ | SupplementalSymbolsAndPictographs
+ | SuttonSignwriting
-+ | Adlam
-+ | Bhaiksuki
-+ | CyrillicExtendedC
-+ | GlagoliticSupplement
-+ | IdeographicSymbolsAndPunctuation
-+ | Marchen
-+ | MongolianSupplement
-+ | Newa
-+ | Osage
-+ | Tangut
-+ | TangutComponents
-+ | CJKUnifiedIdeographsExtensionF
-+ | KanaExtendedA
-+ | MasaramGondi
-+ | Nushu
-+ | Soyombo
-+ | SyriacSupplement
-+ | ZanabazarSquare
-+ | ChessSymbols
-+ | Dogra
-+ | GeorgianExtended
-+ | GunjalaGondi
-+ | HanifiRohingya
-+ | IndicSiyaqNumbers
-+ | Makasar
-+ | MayanNumerals
-+ | Medefaidrin
-+ | OldSogdian
-+ | Sogdian
-+ | EgyptianHieroglyphFormatControls
-+ | Elymaic
-+ | Nandinagari
-+ | NyiakengPuachueHmong
-+ | OttomanSiyaqNumbers
-+ | SmallKanaExtension
-+ | SymbolsAndPictographsExtendedA
-+ | TamilSupplement
-+ | Wancho
-+ | Chorasmian
-+ | CjkUnifiedIdeographsExtensionG
-+ | DivesAkuru
-+ | KhitanSmallScript
-+ | LisuSupplement
-+ | SymbolsForLegacyComputing
-+ | TangutSupplement
-+ | Yezidi
deriving (Eq, Enum, Bounded, Show, Typeable)
instance NFData BlockCode where
+@@ -475,6 +519,16 @@ data Bool_ =
+ -- ^ Printable character class.
+ | POSIXXDigit
+ -- ^ Hex digit character class.
++ | Cased
++ -- ^ Cased character class. For lowercase, uppercase and titlecase characters.
++ | CaseIgnorable
++ -- ^ Used in context-sensitive case mappings.
++ | ChangesWhenLowercased
++ | ChangesWhenUppercased
++ | ChangesWhenTitlecased
++ | ChangesWhenCasefolded
++ | ChangesWhenCasemapped
++ | ChangesWhenNFKCCasefolded
+ deriving (Eq, Enum, Show, Typeable)
+
+ instance NFData Bool_ where
+@@ -678,6 +732,37 @@ data JoiningGroup =
+ | Khaph
+ | Zhain
+ | BurushaskiYehBarree
++ | FarsiYeh
++ | Nya
++ | RohingyaYeh
++ | ManichaeanAleph
++ | ManichaeanAyin
++ | ManichaeanBeth
++ | ManichaeanDaleth
++ | ManichaeanDhamedh
++ | ManichaeanFive
++ | ManichaeanGimel
++ | ManichaeanHeth
++ | ManichaeanHundred
++ | ManichaeanKaph
++ | ManichaeanLamedh
++ | ManichaeanMem
++ | ManichaeanNun
++ | ManichaeanOne
++ | ManichaeanPe
++ | ManichaeanQoph
++ | ManichaeanResh
++ | ManichaeanSadhe
++ | ManichaeanSamekh
++ | ManichaeanTaw
++ | ManichaeanTen
++ | ManichaeanTeth
++ | ManichaeanThamedh
++ | ManichaeanTwenty
++ | ManichaeanWaw
++ | ManichaeanYodh
++ | ManichaeanZayin
++ | StraightWaw
+ deriving (Eq, Enum, Show, Typeable)
+
+ instance NFData JoiningGroup where
+@@ -748,6 +833,10 @@ data LineBreak =
+ | JL
+ | JT
+ | JV
++ | CloseParenthesis
++ | ConditionalJapaneseStarter
++ | LBHebrewLetter
++ | LBRegionalIndicator
+ deriving (Eq, Enum, Show, Typeable)
+
+ instance NFData LineBreak where
+@@ -918,6 +1007,10 @@ data WordBreak =
+ | WBLF
+ | WBMidNumLet
+ | WBNewline
++ | RegionalIndicator
++ | HebrewLetter
++ | SingleQuote
++ | DoubleQuote
+ deriving (Eq, Enum, Show, Typeable)
+
+ instance NFData WordBreak where
+@@ -927,6 +1020,24 @@ instance Property WordBreak_ (Maybe Word
+ fromNative _ = maybeEnum
+ toUProperty _ = (#const UCHAR_WORD_BREAK)
+
++data BidiPairedBracketType_ = BidiPairedBracketType deriving (Show, Typeable)
++
++instance NFData BidiPairedBracketType_ where
++ rnf !_ = ()
++
++data BidiPairedBracketType =
++ BPTNone
++ | BPTOpen
++ | BPTClose
++ deriving (Eq, Enum, Show, Typeable)
++
++instance NFData BidiPairedBracketType where
++ rnf !_ = ()
++
++instance Property BidiPairedBracketType_ (Maybe BidiPairedBracketType) where
++ fromNative _ = maybeEnum
++ toUProperty _ = (#const UCHAR_BIDI_PAIRED_BRACKET_TYPE)
++
+ property :: Property p v => p -> Char -> v
+ property p c = fromNative p . u_getIntPropertyValue (fromIntegral (ord c)) .
+ toUProperty $ p
diff -Nru haskell-text-icu-0.7.0.1/debian/patches/series haskell-text-icu-0.7.0.1/debian/patches/series
--- haskell-text-icu-0.7.0.1/debian/patches/series 2018-07-04 16:04:33.000000000 +0200
+++ haskell-text-icu-0.7.0.1/debian/patches/series 2022-04-26 23:04:13.000000000 +0200
@@ -1,2 +1,3 @@
newer-deepseq
newer-icu
+lowercase_true.patch
