[Git][haskell-team/DHG_packages][master] unicode-data: Fix FTBFS on s390x (Closes: #1024807)

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
5e62c444 by Scott Talbert at 2022-12-01T16:25:08-05:00
unicode-data: Fix FTBFS on s390x (Closes: #1024807)

- - - - -


3 changed files:

- p/haskell-unicode-data/debian/changelog
- + p/haskell-unicode-data/debian/patches/fix-ftbfs-s390x
- + p/haskell-unicode-data/debian/patches/series


Changes:

=====================================
p/haskell-unicode-data/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-unicode-data (0.3.1-2) unstable; urgency=medium
+
+  * Fix FTBFS on s390x (Closes: #1024807)
+
+ -- Scott Talbert <swt at techie.net>  Thu, 01 Dec 2022 16:23:19 -0500
+
 haskell-unicode-data (0.3.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
p/haskell-unicode-data/debian/patches/fix-ftbfs-s390x
=====================================
@@ -0,0 +1,58 @@
+--- a/exe/Parser/Text.hs
++++ b/exe/Parser/Text.hs
+@@ -318,6 +318,8 @@ genBlocksModule moduleName = done <$> Fo
+         , "(Block(..), BlockDefinition(..), block, blockDefinition)"
+         , "where"
+         , ""
++        , "#include \"MachDeps.h\""
++        , ""
+         , "import Data.Ix (Ix)"
+         , "import GHC.Exts"
+         , ""
+@@ -381,9 +383,9 @@ genBlocksModule moduleName = done <$> Fo
+         , "    getRawCodePoint# k# ="
+         , "#ifdef WORDS_BIGENDIAN"
+         , "#if MIN_VERSION_base(4,16,0)"
+-        , "        byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#))"
++        , "        narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# ranges# k#)))"
+         , "#else"
+-        , "        byteSwap32# (indexWord32OffAddr# ranges# k#)"
++        , "        narrow32Word# (byteSwap32# (indexWord32OffAddr# ranges# k#))"
+         , "#endif"
+         , "#elif MIN_VERSION_base(4,16,0)"
+         , "        word32ToWord# (indexWord32OffAddr# ranges# k#)"
+@@ -1279,9 +1281,9 @@ genNamesModule moduleName =
+         , "    indexInt32OffAddr'# k# ="
+         , "#ifdef WORDS_BIGENDIAN"
+         , "#if MIN_VERSION_base(4,16,0)"
+-        , "        word2Int# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#)))"
++        , "        word2Int# (narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# offsets# k#))))"
+         , "#else"
+-        , "        word2Int# (byteSwap32# (indexWord32OffAddr# offsets# k#))"
++        , "        word2Int# (narrow32Word# (byteSwap32# (indexWord32OffAddr# offsets# k#)))"
+         , "#endif"
+         , "#elif MIN_VERSION_base(4,16,0)"
+         , "        int32ToInt# (indexInt32OffAddr# offsets# k#)"
+--- a/lib/Unicode/Internal/Char/Blocks.hs
++++ b/lib/Unicode/Internal/Char/Blocks.hs
+@@ -13,6 +13,8 @@ module Unicode.Internal.Char.Blocks
+ (Block(..), BlockDefinition(..), block, blockDefinition)
+ where
+ 
++#include "MachDeps.h"
++
+ import Data.Ix (Ix)
+ import GHC.Exts
+ 
+@@ -715,9 +717,9 @@ block (C# c#) = getBlock 0# 319#
+     getRawCodePoint# k# =
+ #ifdef WORDS_BIGENDIAN
+ #if MIN_VERSION_base(4,16,0)
+-        byteSwap32# (word32ToWord# (indexWord32OffAddr# addr# k#))
++        narrow32Word# (byteSwap32# (word32ToWord# (indexWord32OffAddr# ranges# k#)))
+ #else
+-        byteSwap32# (indexWord32OffAddr# ranges# k#)
++        narrow32Word# (byteSwap32# (indexWord32OffAddr# ranges# k#))
+ #endif
+ #elif MIN_VERSION_base(4,16,0)
+         word32ToWord# (indexWord32OffAddr# ranges# k#)


=====================================
p/haskell-unicode-data/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-ftbfs-s390x



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5e62c444563365ea3fb5d3379457ac30aaa8a293

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5e62c444563365ea3fb5d3379457ac30aaa8a293
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20221201/f54fc544/attachment-0001.htm>