The following commit has been merged in the master branch: commit ecdbb9bddd366893d1d456ca51aa9af94bb4ced7 Author: Rene Engelhard <r...@debian.org> Date: Tue Aug 9 18:08:36 2011 +0000
fix WORDS_BIGENDIAN build diff --git a/changelog b/changelog index ede5eab..3c2e790 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +graphite2 (1.0.1-2) UNRELEASED; urgency=low + + * debian/patches/fix-typedefs.diff: fix Main.h typedefs for + WORDS_BIGENDIAN + + -- Rene Engelhard <r...@debian.org> Tue, 09 Aug 2011 17:47:10 +0000 + graphite2 (1.0.1-1) unstable; urgency=low * New upstream release diff --git a/patches/fix-typedefs.diff b/patches/fix-typedefs.diff new file mode 100644 index 0000000..97d9513 --- /dev/null +++ b/patches/fix-typedefs.diff @@ -0,0 +1,19 @@ +--- graphite2-1.0.1.orig/src/Main.h ++++ graphite2-1.0.1/src/Main.h +@@ -29,8 +29,6 @@ of the License or (at your option) any l + #include <cstdlib> + #include "graphite2/Types.h" + +-#if !defined WORDS_BIGENDIAN || defined PC_OS +- + namespace graphite2 { + + typedef gr_uint8 uint8; +@@ -42,6 +40,7 @@ typedef gr_int16 int16; + typedef gr_int32 int32; + typedef size_t uintptr; + ++#if !defined WORDS_BIGENDIAN || defined PC_OS + inline uint16 swap16(uint16 x) { return (x << 8) | (x >> 8); } + inline int16 swap16(int16 x) { return int16(swap16(uint16(x))); } + inline uint32 swap32(uint32 x) { return (uint32(swap16(uint16(x))) << 16) | swap16(uint16(x >> 16)); } diff --git a/patches/series b/patches/series index 10d55fe..b1e88a2 100644 --- a/patches/series +++ b/patches/series @@ -1 +1,2 @@ include-and-libraries.diff +fix-typedefs.diff -- graphite2 packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qqqjz-0006zc...@vasks.debian.org