From 6df612268611b26e2b3559df04435786212821b8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Jun 2012 21:19:58 +0200 Subject: [PATCH] firefox: update to 13.0. --- srcpkgs/firefox/firefox.rshlibs | 2 +- ...chromium_src_base_file_util_linux.cc.patch | 12 ------------ ...ium_src_base_message_pump_lievent.cc.patch | 12 ------------ .../ipc_chromium_src_base_time_posix.cc.patch | 12 ------------ srcpkgs/firefox/template | 19 +++++++------------ 5 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch delete mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch delete mode 100644 srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch diff --git a/srcpkgs/firefox/firefox.rshlibs b/srcpkgs/firefox/firefox.rshlibs index ef73ac3714e..9a178a9a8f7 100644 --- a/srcpkgs/firefox/firefox.rshlibs +++ b/srcpkgs/firefox/firefox.rshlibs @@ -1,7 +1,7 @@ libpthread.so.0 libc.so.6 libjpeg.so.8 -libpng14.so.14 +libpng15.so.15 libffi.so.5 libssl3.so libsmime3.so 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 deleted file mode 100644 index 8030f8e8688..00000000000 --- a/srcpkgs/firefox/patches/ipc_chromium_src_base_file_util_linux.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index af4655941e4..00000000000 --- a/srcpkgs/firefox/patches/ipc_chromium_src_base_message_pump_lievent.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 55cb2a9402a..00000000000 --- a/srcpkgs/firefox/patches/ipc_chromium_src_base_time_posix.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 efe30a53284..aee5d15a40f 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,16 +1,17 @@ # Template build file for 'firefox'. pkgname=firefox -version=12.0 -wrksrc=mozilla-release -distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" -depends="desktop-file-utils hicolor-icon-theme" -makedepends="unzip zip perl>=0 python>=2.7.2_3 yasm jpeg-devel libpng-devel pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel libXScrnSaver-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel wireless_tools-devel" +version=13.0 revision=1 +wrksrc=mozilla-release +depends="desktop-file-utils hicolor-icon-theme" +makedepends="unzip zip perl python yasm jpeg-devel libpng-devel>=1.5.10 pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel libXScrnSaver-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel wireless_tools-devel" +gtk_iconcache_dirs="/usr/share/icons/hicolor" 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=9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d +distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" +checksum=dc801286e752ba3c2006caa0728024cb5b92460d9a3a1636c111c1f4f4f50b55 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 @@ -22,17 +23,11 @@ long_desc=" can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available." -gtk_iconcache_dirs="/usr/share/icons/hicolor" - - - do_build() { # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in cp -f ${FILESDIR}/mozconfig .mozconfig 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 make ${makejobs} -f client.mk MOZ_MAKE_FLAGS="${makejobs}" }