From 60a4a411107ea85ae1c88ed4b1a3bec5840dfad0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 17 Dec 2012 15:03:52 +0000
Subject: main/xulrunner: upgrade to 17.0.1

---
 main/xulrunner/APKBUILD                        | 14 +++++++----
 main/xulrunner/getchar.patch                   | 14 +++++++++++
 main/xulrunner/sysconf.patch                   | 10 ++++++++
 main/xulrunner/uclibc-malloc_usable_size.patch | 34 +++++++++++++-------------
 4 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 main/xulrunner/getchar.patch
 create mode 100644 main/xulrunner/sysconf.patch

(limited to 'main/xulrunner')

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index aa238b8d3..9f35d1fef 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xulrunner
-pkgver=16.0.2
+pkgver=17.0.1
 _ffoxver=$pkgver
-pkgrel=2
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -54,6 +54,8 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
 	0003-xulrunner-jemalloc-aslr.patch
 	uclibc-malloc_usable_size.patch
 	cairo.patch
+	getchar.patch
+	sysconf.patch
 	"
 # help our shared-object scanner to find the libs
 ldpath="/usr/lib/xulrunner-$pkgver"
@@ -114,9 +116,11 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="1b360968ab05b2a59757d33514897915  firefox-16.0.2.source.tar.bz2
+md5sums="13d616028eb77de927c29b6655c832c9  firefox-17.0.1.source.tar.bz2
 36d8d42ae4375f1190c9558bb0d10fa7  mozconfig
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
-1ce894c4f6a4541fdccf0b4a8b1dd95b  uclibc-malloc_usable_size.patch
-6a3942d96c7ce3c63251761cc12c8349  cairo.patch"
+998b48fe73dc642065ab25230d739b2c  uclibc-malloc_usable_size.patch
+6a3942d96c7ce3c63251761cc12c8349  cairo.patch
+a7b33d8b75306f225e3a8d1a8a403736  getchar.patch
+090ea4daeedfff2915da62a738c7e81d  sysconf.patch"
diff --git a/main/xulrunner/getchar.patch b/main/xulrunner/getchar.patch
new file mode 100644
index 000000000..f50db879c
--- /dev/null
+++ b/main/xulrunner/getchar.patch
@@ -0,0 +1,14 @@
+--- ./media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig
++++ ./media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
+@@ -21,6 +21,11 @@
+ #include "constants.hpp"
+ #include <cstring>
+ 
++/* prevent the getchar macro from stdio to take preference over the local var */
++#if defined(__UCLIBC__)
++#undef getchar
++#endif
++
+ namespace boost {
+   namespace detail {
+   	//This only works on unsigned data types
diff --git a/main/xulrunner/sysconf.patch b/main/xulrunner/sysconf.patch
new file mode 100644
index 000000000..b715f2173
--- /dev/null
+++ b/main/xulrunner/sysconf.patch
@@ -0,0 +1,10 @@
+--- ./media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc.orig
++++ ./media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
+@@ -21,6 +21,7 @@
+ // Not implemented yet, might be possible to use Linux implementation
+ #else // defined(WEBRTC_LINUX)
+ #include <sys/sysinfo.h>
++#include <unistd.h>
+ #endif
+ 
+ #include "trace.h"
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index 4d088787c..49b5a6430 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -1,6 +1,19 @@
+--- mozilla-release-old/memory/mozalloc/Makefile.in
++++ mozilla-release/memory/mozalloc/Makefile.in
+@@ -43,6 +43,10 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++ifdef MOZ_MEMORY
++SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
++endif
++
+ VISIBILITY_FLAGS=
+ STL_FLAGS	=
+ ifdef _MSC_VER
 --- ./memory/mozalloc/mozalloc.cpp.orig
 +++ ./memory/mozalloc/mozalloc.cpp
-@@ -63,7 +63,7 @@
+@@ -33,7 +33,7 @@
  #include "mozilla/mozalloc_oom.h"  // for mozalloc_handle_oom
  
  /* Windows doesn't have malloc_usable_size, but jemalloc has */
@@ -9,12 +22,12 @@
  extern "C" size_t malloc_usable_size(const void *ptr);
  #endif
  
-@@ -243,10 +243,10 @@
+@@ -213,10 +213,10 @@
  
  #if defined(XP_MACOSX)
      return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID) &&!defined(__UCLIBC__))
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) && !defined(__UCLIBC__) || defined(__FreeBSD__)
      // Android bionic libc doesn't have malloc_usable_size.
      return malloc_usable_size(ptr);
 -#elif defined(XP_WIN)
@@ -22,16 +35,3 @@
      return _msize(ptr);
  #else
      return 0;
---- mozilla-release-old/memory/mozalloc/Makefile.in
-+++ mozilla-release/memory/mozalloc/Makefile.in
-@@ -43,6 +43,10 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+ifdef MOZ_MEMORY
-+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
-+endif
-+
- VISIBILITY_FLAGS=
- STL_FLAGS	=
- ifdef _MSC_VER
-- 
cgit v1.2.3