[xulrunner] chromium_types.h patch fix for second arches

[Martin Stransky]

commit 37ba0418d62b054e00707629ca2acc49e300857e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Thu Jun 30 10:09:43 2011 +0200

    chromium_types.h patch fix for second arches

 xulrunner-2.0-chromium-types.patch |   34 ++++++++++++++++++----------------
 xulrunner-5.0-secondary-ipc.patch  |   11 +++++++----
 2 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/xulrunner-2.0-chromium-types.patch b/xulrunner-2.0-chromium-types.patch
index 65dbc59..dfc82cc 100644
--- a/xulrunner-2.0-chromium-types.patch
+++ b/xulrunner-2.0-chromium-types.patch
@@ -1,31 +1,33 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=627669
+Bug 627669 - add support for s390(x) and ppc(64)
 
-diff -up xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h
---- xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h.chromium-types	2010-11-04 21:05:47.000000000 +0100
-+++ xulrunner-2.0/mozilla-central/gfx/ycbcr/chromium_types.h	2010-11-15 14:20:12.000000000 +0100
-@@ -64,6 +64,10 @@ typedef PRInt16 int16;
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC 1
+diff -up mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types mozilla-release/gfx/ycbcr/chromium_types.h
+--- mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types	2011-06-15 23:57:26.000000000 +0200
++++ mozilla-release/gfx/ycbcr/chromium_types.h	2011-06-30 10:04:25.105032221 +0200
+@@ -61,7 +61,11 @@ typedef PRInt16 int16;
+ #define ARCH_CPU_ARM_FAMILY 1
+ #define ARCH_CPU_ARMEL 1
  #define ARCH_CPU_32_BITS 1
-+#elif defined(__ppc64__)
+-#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__)
++#elif defined(__ppc64__) || defined(__powerpc64__)
 +#define ARCH_CPU_PPC_FAMILY 1
 +#define ARCH_CPU_PPC 1
 +#define ARCH_CPU_64_BITS 1
- #elif defined(__sparc)
- #define ARCH_CPU_SPARC_FAMILY 1
- #define ARCH_CPU_SPARC 1
-@@ -72,6 +76,14 @@ typedef PRInt16 int16;
++#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
+ #define ARCH_CPU_PPC_FAMILY 1
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
+@@ -73,6 +77,14 @@ typedef PRInt16 int16;
  #define ARCH_CPU_SPARC_FAMILY 1
  #define ARCH_CPU_SPARC 1
  #define ARCH_CPU_64_BITS 1
-+#elif defined(__s390__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390 1
-+#define ARCH_CPU_32_BITS 1
 +#elif defined(__s390x__)
 +#define ARCH_CPU_S390_FAMILY 1
 +#define ARCH_CPU_S390 1
 +#define ARCH_CPU_64_BITS 1
++#elif defined(__s390__)
++#define ARCH_CPU_S390_FAMILY 1
++#define ARCH_CPU_S390 1
++#define ARCH_CPU_32_BITS 1
  #else
  #warning Please add support for your architecture in chromium_types.h
  #endif
diff --git a/xulrunner-5.0-secondary-ipc.patch b/xulrunner-5.0-secondary-ipc.patch
index dfe95a5..a64dc4e 100644
--- a/xulrunner-5.0-secondary-ipc.patch
+++ b/xulrunner-5.0-secondary-ipc.patch
@@ -1,6 +1,8 @@
+Bug 668460 - Adds IPC build config for s390(x) and powerpc(64)
+
 diff -up xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc
 --- xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc	2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc	2011-06-29 11:37:06.984946864 +0200
++++ xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc	2011-06-30 09:08:26.777844341 +0200
 @@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
  bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
    // It won't be hard to make this endian-agnostic, but it's not worth
@@ -19,7 +21,7 @@ diff -up xulrunner-5.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.second
        bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
 diff -up xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h
 --- xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc	2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h	2011-06-29 11:44:13.924217693 +0200
++++ xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h	2011-06-30 09:08:26.777844341 +0200
 @@ -57,9 +57,24 @@
  #define ARCH_CPU_ARMEL 1
  #define ARCH_CPU_32_BITS 1
@@ -48,12 +50,13 @@ diff -up xulrunner-5.0/mozilla-release/ipc/chromium/src/build/build_config.h.sec
  #endif
 diff -up xulrunner-5.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-5.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h
 --- xulrunner-5.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc	2011-06-15 23:57:27.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h	2011-06-29 11:37:06.987946885 +0200
-@@ -219,7 +219,7 @@ struct ParamTraits<unsigned long> {
++++ xulrunner-5.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h	2011-06-30 09:47:16.629029528 +0200
+@@ -219,7 +219,8 @@ struct ParamTraits<unsigned long> {
    }
  };
  
 -#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
++// Although s390 is a 32-bit system it defines size_t as unsigned long
 +#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && (defined(ARCH_CPU_64_BITS) || defined(ARCH_CPU_S390))))
  // There size_t is a synonym for |unsigned long| ...
  template <>