[Pkg-haskell-commits] darcs: haskell-charsetdetect-ae: Apply patches by Edmund Grimley Evans to fix the build on arm64 and kfreebsd-*

[Joachim Breitner]

Wed Jun 17 08:38:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply patches by Edmund Grimley Evans to fix the build on arm64 and kfreebsd-*

    M ./changelog +7
    A ./patches/
    A ./patches/arm64.patch
    A ./patches/kfreebsd
    A ./patches/series

Wed Jun 17 08:38:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply patches by Edmund Grimley Evans to fix the build on arm64 and kfreebsd-*
diff -rN -u old-haskell-charsetdetect-ae/changelog new-haskell-charsetdetect-ae/changelog
--- old-haskell-charsetdetect-ae/changelog	2015-06-17 08:40:49.372186666 +0000
+++ new-haskell-charsetdetect-ae/changelog	2015-06-17 08:40:49.380186663 +0000
@@ -1,3 +1,10 @@
+haskell-charsetdetect-ae (1.0.1-2) UNRELEASED; urgency=medium
+
+  * Apply patches by Edmund Grimley Evans to fix the build on arm64 and
+    kfreebsd-*
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 17 Jun 2015 10:37:50 +0200
+
 haskell-charsetdetect-ae (1.0.1-1) unstable; urgency=low
 
   [ Marcel Fourné ]
diff -rN -u old-haskell-charsetdetect-ae/patches/arm64.patch new-haskell-charsetdetect-ae/patches/arm64.patch
--- old-haskell-charsetdetect-ae/patches/arm64.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-charsetdetect-ae/patches/arm64.patch	2015-06-17 08:40:49.376186664 +0000
@@ -0,0 +1,68 @@
+Provided by Edmund Grimley Evans and obtained from
+https://chromium.googlesource.com/chromium/src/+/2c03ccaa0ef2f8faa77254f93795df4a639a57ec%5E!/
+
+
+Index: charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg_linux.h
+===================================================================
+--- charsetdetect-ae-1.0.1.orig/libcharsetdetect/nspr-emu/prcpucfg_linux.h	2015-06-17 10:36:01.106498119 +0200
++++ charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg_linux.h	2015-06-17 10:36:01.102498065 +0200
+@@ -509,6 +509,59 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(__aarch64__)
++
++#ifdef __AARCH64EB__
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#elif defined(__AARCH64EL__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
++#error "Unknown Aarch64 endianness."
++#endif
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #elif defined(__hppa__)
+ 
+ #undef  IS_LITTLE_ENDIAN
diff -rN -u old-haskell-charsetdetect-ae/patches/kfreebsd new-haskell-charsetdetect-ae/patches/kfreebsd
--- old-haskell-charsetdetect-ae/patches/kfreebsd	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-charsetdetect-ae/patches/kfreebsd	2015-06-17 08:40:49.376186664 +0000
@@ -0,0 +1,15 @@
+As suggested by Edmund Grimley Evans
+
+Index: charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg.h
+===================================================================
+--- charsetdetect-ae-1.0.1.orig/libcharsetdetect/nspr-emu/prcpucfg.h	2015-06-17 10:35:16.813934265 +0200
++++ charsetdetect-ae-1.0.1/libcharsetdetect/nspr-emu/prcpucfg.h	2015-06-17 10:37:24.203688373 +0200
+@@ -34,7 +34,7 @@
+ #include "prcpucfg_win.h"
+ #elif defined(__APPLE__)
+ #include "prcpucfg_mac.h"
+-#elif defined(__linux__)
++#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+ #include "prcpucfg_linux.h"
+ #elif defined(__FreeBSD__)
+ #include "prcpucfg_freebsd.h"
diff -rN -u old-haskell-charsetdetect-ae/patches/series new-haskell-charsetdetect-ae/patches/series
--- old-haskell-charsetdetect-ae/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-charsetdetect-ae/patches/series	2015-06-17 08:40:49.376186664 +0000
@@ -0,0 +1,2 @@
+arm64.patch
+kfreebsd