[Frugalware-git] frugalware-current: firefox-3.6.4-1-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aec378dfe7e8055847e7912f174cc06f1d246e01

commit aec378dfe7e8055847e7912f174cc06f1d246e01
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Jun 23 18:30:22 2010 +0200

firefox-3.6.4-1-i686

- version bump

diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index 1d90bce..f061fdf 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,9 +3,9 @@
# Contributor: VMiklos <vmiklos at frugalware.org>

pkgname=firefox
-pkgver=3.6.3
+pkgver=3.6.4
pathver=${pkgver} # version used in path names
-pkgrel=2
+pkgrel=1
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/"
depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.7.1' \
@@ -18,9 +18,8 @@ up2date="lynx -dump ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/lates
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 \
ffremote \
$pkgname.desktop \
-	${pkgname}-safe-mode.desktop \
-	firefox-3.0.10-gcc44.patch)
-signatures=("${source[0]}.asc" '' '' '' '')
+	${pkgname}-safe-mode.desktop)
+signatures=("${source[0]}.asc" '' '' '')
options=('scriptlet')

build() {
@@ -33,6 +32,9 @@ build() {
## broken sqlite3 pc file
Fsed 'SQLITE_VERSION=3.5.9' 'SQLITE_VERSION=3.5' configure

+	# fix nspr as well
+	Fsed '"nspr/' '"nspr4/' ipc/chromium/src/base/basictypes.h
+
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1

diff --git a/source/xapps/firefox/firefox-3.0.10-gcc44.patch b/source/xapps/firefox/firefox-3.0.10-gcc44.patch
deleted file mode 100644
index adbeabf..0000000
--- a/source/xapps/firefox/firefox-3.0.10-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.orig	2009-06-10 00:17:41.000000000 +0200
-+++ mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2009-06-10 00:17:52.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdio.h>
-
- #include <cassert>
- #include <cstdlib>
---- mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.orig	2009-06-10 00:18:06.000000000 +0200
-+++ mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc	2009-06-10 00:18:19.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <cstdlib>
- #include <ctime>
- #include <string.h>
-+#include <stdio.h>
-
- #include "common/linux/file_id.h"
- #include "client/linux/handler/linux_thread.h"
---- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.orig	2009-06-10 00:15:23.000000000 +0200
-+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2009-06-10 00:16:06.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <functional>
- #include <vector>
- #include <string.h>
-+#include <stdio.h>
-
- #include "common/linux/dump_symbols.h"
- #include "common/linux/file_id.h"