[arch-commits] Commit in xulrunner/trunk (PKGBUILD gcc47.patch libvpx.patch mozconfig)

[Ionut Biru]

    Date: Wednesday, April 25, 2012 @ 09:40:56
  Author: ibiru
Revision: 157193

update to 12.0

Added:
  xulrunner/trunk/gcc47.patch
Modified:
  xulrunner/trunk/PKGBUILD
  xulrunner/trunk/mozconfig
Deleted:
  xulrunner/trunk/libvpx.patch

--------------+
 PKGBUILD     |   12 ++++----
 gcc47.patch  |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libvpx.patch |   12 --------
 mozconfig    |    2 -
 4 files changed, 84 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-25 13:19:30 UTC (rev 157192)
+++ PKGBUILD	2012-04-25 13:40:56 UTC (rev 157193)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xulrunner
-pkgver=11.0
+pkgver=12.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
@@ -13,13 +13,13 @@
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
-        libvpx.patch)
+        gcc47.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('4b07acf47857aff72776d805409cdd1b'
-         '8dfb78c5bd0581c8cf4753813132bf0b'
+md5sums=('80c3e5927274de7f181fb5f931ac5fd4'
+         '4afe63440e2f1935ff90de15db3b70f0'
          '27271ce647a83906ef7a24605e840d61'
-         '5d418ecdbdb9f40597df6b978b0b5ee5')
+         '5a8563f8fda7ad30405c86764267a19c')
 
 build() {
   cd "$srcdir/mozilla-release"
@@ -27,7 +27,7 @@
 
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-  patch -Np1 -i "$srcdir/libvpx.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
 
 
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"

Added: gcc47.patch
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2012-04-25 13:40:56 UTC (rev 157193)
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User Martin Stránský <stransky at redhat.com>
+# Date 1328886461 -3600
+# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
+# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
+Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
+
+diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
+--- a/ipc/chromium/src/base/file_util_linux.cc
++++ b/ipc/chromium/src/base/file_util_linux.cc
+@@ -1,15 +1,18 @@
+ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ #include "base/file_util.h"
+ 
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <string>
+ #include <vector>
+ 
+ #include "base/eintr_wrapper.h"
+ #include "base/file_path.h"
+ #include "base/string_util.h"
+ 
+diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
+--- a/ipc/chromium/src/base/message_pump_libevent.cc
++++ b/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -1,16 +1,19 @@
+ // Copyright (c) 2008 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+ #include "base/message_pump_libevent.h"
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+ #include "third_party/libevent/event.h"
+ 
+diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
+--- a/ipc/chromium/src/base/time_posix.cc
++++ b/ipc/chromium/src/base/time_posix.cc
+@@ -8,16 +8,19 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
+ #include <time.h>
+ #endif
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+ 
+ #include <limits>
+ 
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+ 
+ namespace base {
+ 
+

Deleted: libvpx.patch
===================================================================
--- libvpx.patch	2012-04-25 13:19:30 UTC (rev 157192)
+++ libvpx.patch	2012-04-25 13:40:56 UTC (rev 157193)
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
---- mozilla-release.orig/configure.in	2012-02-05 16:01:35.722024142 +0000
-+++ mozilla-release/configure.in	2012-02-05 16:03:34.871064547 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],

Modified: mozconfig
===================================================================
--- mozconfig	2012-04-25 13:19:30 UTC (rev 157192)
+++ mozconfig	2012-04-25 13:40:56 UTC (rev 157193)
@@ -15,7 +15,7 @@
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads