From a775f0286ca95b65871ec34faf76739c3d2ee831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 14 May 2014 15:41:57 +0300
Subject: [PATCH] main/xulrunner: fix build on 32-bit platforms
---
main/xulrunner/APKBUILD | 6 +++++-
main/xulrunner/fix-media-webrtc.patch | 14 ++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 main/xulrunner/fix-media-webrtc.patch
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 43be2d6cb8cd..f34dfe978815 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -3,7 +3,7 @@
pkgname=xulrunner
pkgver=29.0.1
_ffoxver=$pkgver
-pkgrel=0
+pkgrel=1
pkgdesc="runtime environment for xul-based applications"
url="http://developer.mozilla.org/en/XULRunner"
arch="all"
@@ -57,6 +57,7 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
fix-ipc.patch
fix-media.patch
+ fix-media-webrtc.patch
fix-netwerk.patch
fix-toolkit.patch
fix-tools.patch
@@ -137,6 +138,7 @@ d9a2245b93a7f5855ee029b5fa44e4e9 stat.patch
b18bd948aae828e5c8f5f63e440c96d6 fix-arm-atomics-grsec.patch
38a9c0d5be155164d50a956ac131d991 fix-ipc.patch
960d56439a375998ce4e4597bf245375 fix-media.patch
+ce4839160acf3986a2118326ed2b8444 fix-media-webrtc.patch
e1d52fd12bfcf3142028a9ab547cf8d1 fix-netwerk.patch
781dab1d87caffd53c1e103780261f9c fix-toolkit.patch
0814ecfd471de2263af3dcb2d0997746 fix-tools.patch
@@ -152,6 +154,7 @@ a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc stat.patch
ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5 fix-arm-atomics-grsec.patch
059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980 fix-ipc.patch
d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf fix-media.patch
+3e53af8beff122bcf5790c148fb51f41f44b6fe5dd5799777b70c3542c32cb93 fix-media-webrtc.patch
0cbb512c4526f0881253a38f1cc79061fba0fe6a0d8b321fb506be190a32e571 fix-netwerk.patch
4f42549663dfedf2a1cdc92d64529750b8a7a9deca6ffc8bdfb91d7d33b7d1c5 fix-toolkit.patch
f8a0e40e1b666eaed6c5e94d7521776463293618d15cfdf04fb05fb08191b414 fix-tools.patch
@@ -167,6 +170,7 @@ a74d08b978df2f836b7905fff497304fa189fda22ca070a25b5d4be6e764aa74094a08359dc9a560
4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d fix-arm-atomics-grsec.patch
3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b fix-ipc.patch
58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79 fix-media.patch
+a5d00272fc9e2b3a786f5891bac11b04ffaf6dfcbd2b30cba42286b79d12fefb6cb9c81e6d75987ab3ee19d12af20a074c77edc655bd470be06f5025eb38e609 fix-media-webrtc.patch
38ebf7ae81d4b6dac0b6840a64f86759fc10e4a7ef26f1ebdc2b7c8d4aab3f95ddcb204a743b307e5dad0cd6c04b278c2311b1ac599e7bb287092c552ed26a51 fix-netwerk.patch
e9da57c5b33ddde2ad371f66784f193d96cd57da6170f17e0dbdbd62a300645f815ac8e12995457b7a9e76f267c6f9558fc6e744823209df246cc61b53b243a2 fix-toolkit.patch
7cae3c82c00792011238207a89c76791a03d7fb19460cc465ba3016a1537b901821f5f90bc682cc4413c0a6d626eddbbc7f3dd7878b807d0d490d55760cb7e3b fix-tools.patch
diff --git a/main/xulrunner/fix-media-webrtc.patch b/main/xulrunner/fix-media-webrtc.patch
new file mode 100644
index 000000000000..a173d795dd07
--- /dev/null
+++ b/main/xulrunner/fix-media-webrtc.patch
@@ -0,0 +1,14 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1010194
+
+diff -ru mozilla-release/media.orig/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h mozilla-release/media/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h
+--- mozilla-release/media.orig/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h 2014-05-07 01:56:10.000000000 -0300
++++ mozilla-release/media/webrtc/signaling/src/sipcc/cpr/include/cpr_threads.h 2014-05-14 14:56:45.938648384 -0300
+@@ -30,7 +30,7 @@
+ uint32_t threadId;
+ union {
+ void *handlePtr;
+- uint64_t handleInt;
++ unsigned long handleInt;
+ } u;
+ } cpr_thread_t;
+
--
GitLab