summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/xulrunner-libre/PKGBUILD14
-rw-r--r--libre/xulrunner-libre/gcc47.patch89
-rw-r--r--libre/xulrunner-libre/mozconfig6
3 files changed, 73 insertions, 36 deletions
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 0b66880dc..af4b45aae 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,8 +6,8 @@
# We're getting this from Debian Sid
_debname=iceweasel
-_debver=11.0
-_debrel=2
+_debver=12.0
+_debrel=3
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -31,12 +31,12 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('01d9d18909ca9fff2483d8fd779a0f89'
- '59349da94b095fe0623d09ce75696766'
- 'f407208a750cdc9bea3a6a3a3e42dd89'
- '6277c508cf24a78c596decae2e568997'
+md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
+ '2b66fb2e51631ef3b07de89ef9d17d0c'
+ '552adcf5da3b07757e7fe29c8bd2ec2d'
+ 'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
- 'aeaf587f7a962ebcc81515e1f1706cd1')
+ '5a8563f8fda7ad30405c86764267a19c')
dpkg-source() {
# This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch
index 5bdd36c6f..5cea6769d 100644
--- a/libre/xulrunner-libre/gcc47.patch
+++ b/libre/xulrunner-libre/gcc47.patch
@@ -1,44 +1,77 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
---- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
+# HG changeset patch
+# User Martin Stránský <stransky@redhat.com>
+# Date 1328886461 -3600
+# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
+# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049
+Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
---- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300
-@@ -5,6 +5,7 @@
+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>
-
---- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200
-+++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300
-@@ -8,6 +8,7 @@
+
+ #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>
-+#include <unistd.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 {
+
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
index d6cc06648..34c5a6137 100644
--- a/libre/xulrunner-libre/mozconfig
+++ b/libre/xulrunner-libre/mozconfig
@@ -15,11 +15,12 @@ ac_add_options --with-system-libvpx
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
# Features
+ac_add_options --disable-safe-browsing
ac_add_options --enable-startup-notification
ac_add_options --enable-gio
@@ -32,3 +33,6 @@ ac_add_options --disable-installer
# Optimization
ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1