From d6ed8ac30515a8dcae3ca97ca927190e35fe79b7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 23 Apr 2012 14:53:28 +0200 Subject: [PATCH] firefox: update to 12.0. --- srcpkgs/firefox/files/mozconfig | 3 ++- srcpkgs/firefox/firefox.rshlibs | 2 +- .../ipc_chromium_src_base_file_util_linux.cc.patch | 12 ++++++++++++ ...c_chromium_src_base_message_pump_lievent.cc.patch | 12 ++++++++++++ .../ipc_chromium_src_base_time_posix.cc.patch | 12 ++++++++++++ srcpkgs/firefox/template | 12 ++++++------ 6 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch create mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch create mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 9cb627d1645..b8c491cd3ce 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -15,7 +15,8 @@ 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 +# Disable system cairo for now, random crashes with cairo-1.12. +ac_add_options --disable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads diff --git a/srcpkgs/firefox/firefox.rshlibs b/srcpkgs/firefox/firefox.rshlibs index 09b8bd4755d..ef73ac3714e 100644 --- a/srcpkgs/firefox/firefox.rshlibs +++ b/srcpkgs/firefox/firefox.rshlibs @@ -43,7 +43,7 @@ libm.so.6 libgcc_s.so.1 ld-linux-x86-64.so.2 libdbus-glib-1.so.2 -libgconf-2.so.4 libnotify.so.4 ld-linux.so.2 libvpx.so.1 +libbz2.so.1 diff --git a/srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch b/srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch new file mode 100644 index 00000000000..8030f8e8688 --- /dev/null +++ b/srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch @@ -0,0 +1,12 @@ +Missing unistd header for read(2) and close(2). + +--- ipc/chromium/src/base/file_util_linux.cc.orig 2012-04-23 14:10:57.674067160 +0200 ++++ ipc/chromium/src/base/file_util_linux.cc 2012-04-23 14:11:10.376767750 +0200 +@@ -5,6 +5,7 @@ + #include "base/file_util.h" + + #include ++#include + + #include + #include diff --git a/srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch b/srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch new file mode 100644 index 00000000000..af4655941e4 --- /dev/null +++ b/srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch @@ -0,0 +1,12 @@ +Missing unistd header for read(2) and close(2). + +--- ipc/chromium/src/base/message_pump_libevent.cc.orig 2012-04-23 13:20:27.480505425 +0200 ++++ ipc/chromium/src/base/message_pump_libevent.cc 2012-04-23 13:20:40.015211284 +0200 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "eintr_wrapper.h" + #include "base/logging.h" diff --git a/srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch b/srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch new file mode 100644 index 00000000000..55cb2a9402a --- /dev/null +++ b/srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch @@ -0,0 +1,12 @@ +Missing unistd.h header for _POSIX_MONOTONIC_CLOCK definition. + +--- ipc/chromium/src/base/time_posix.cc.orig 2012-04-23 14:19:14.797094233 +0200 ++++ ipc/chromium/src/base/time_posix.cc 2012-04-23 14:19:23.067898688 +0200 +@@ -11,6 +11,7 @@ + #ifdef ANDROID + #include + #else ++#include + #include + #endif + diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index d6a32dfca80..0fa86f22e1c 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=11.0 +version=12.0 wrksrc=mozilla-release distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " homepage="http://www.mozilla.org/projects/firefox" license="MPL-1.1, GPL-2, LGPL-2.1" -checksum=2fda6bcfe455c2449a8a69bc16bf13f6ea6006badb0657dae63107e52f051701 +checksum=9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d long_desc=" Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is @@ -21,9 +21,6 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" -Add_dependency run desktop-file-utils -Add_dependency run hicolor-icon-theme - Add_dependency build unzip Add_dependency build zip Add_dependency build perl ">=0" @@ -48,11 +45,14 @@ Add_dependency build alsa-lib-devel Add_dependency build hunspell-devel Add_dependency build wireless_tools-devel +Add_dependency run desktop-file-utils +Add_dependency run hicolor-icon-theme + do_build() { # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in cp -f ${FILESDIR}/mozconfig .mozconfig - export LDFLAGS="$XBPS_LDFLAGS -Wl,-R/usr/lib/firefox" + export LDFLAGS="-Wl,-R/usr/lib/firefox" # Fix for libvpx-1.0.0 detection. sed -i -e "s|VPX_CODEC_USE_INPUT_PARTITION|VPX_CODEC_USE_INPUT_FRAGMENTS|g" configure