Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=914f4efc428aeda6ff400a5332e7827a6370bbd9
commit 914f4efc428aeda6ff400a5332e7827a6370bbd9
Author: Devil505 <devil505li...@gmail.com>
Date: Mon Aug 15 14:37:32 2011 +0200
firefox-6.0-1-i686
* version bump
* removed useless patches
diff --git a/source/xapps/firefox/0583d58b20a3.patch
b/source/xapps/firefox/0583d58b20a3.patch
deleted file mode 100644
index 037422b..0000000
--- a/source/xapps/firefox/0583d58b20a3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozi...@glandium.org>
-# Date 1302680663 -7200
-# Node ID 0583d58b20a3a0789c46f19ed505cb6e96602ec9
-# Parent 0138798a072ad15edce15d614923a03256946218
-Bug 644692 - Fix bsdiff build failure with system bzip2. r=ted
-
-diff --git a/other-licenses/bsdiff/Makefile.in
b/other-licenses/bsdiff/Makefile.in
---- a/other-licenses/bsdiff/Makefile.in
-+++ b/other-licenses/bsdiff/Makefile.in
-@@ -43,17 +43,21 @@ VPATH = @srcdir@
-
- include $(DEPTH)/config/autoconf.mk
-
- # This program is output to dist/host/bin because it is only needed by the
- # build system and is not intended to be included in Mozilla distributions.
- HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
- HOST_CSRCS = bsdiff.c
-
-+ifdef MOZ_NATIVE_BZ2
-+HOST_LIBS += $(BZ2_LIBS)
-+else
- HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
-+endif
-
- ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))
- HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
- endif
-
- LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
-
- include $(topsrcdir)/config/rules.mk
-
diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index 90b61fc..1222f4a 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,12 +3,12 @@
# Contributor: VMiklos <vmik...@frugalware.org>
pkgname=firefox
-pkgver=5.0.1
+pkgver=6.0
pathver=${pkgver} # version used in path names
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.9'
'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.7' \
+depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12.11'
'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.9' \
'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++'
'libxdamage' 'libice' 'bzip2' 'alsa-lib' \
'libnotify' 'wireless_tools' 'cairo')
makedepends=('zip' 'yasm')
@@ -16,12 +16,10 @@ groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest/source | sed
's/.source//g' | Flasttarbz2"
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
\
- 0583d58b20a3.patch \
- ppc_ipc.diff \
ffremote \
$pkgname.desktop \
${pkgname}-safe-mode.desktop)
-signatures=("${source[0]}.asc" '' '' '' '' '')
+signatures=("${source[0]}.asc" '' '' '')
options=('scriptlet')
Fconfopts="${Fconfopts[@]} --with-default-mozilla-five-home=/usr \
diff --git a/source/xapps/firefox/ppc_ipc.diff
b/source/xapps/firefox/ppc_ipc.diff
deleted file mode 100644
index 1f33677..0000000
--- a/source/xapps/firefox/ppc_ipc.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
---- a/ipc/chromium/Makefile.in
-+++ b/ipc/chromium/Makefile.in
-@@ -242,17 +242,16 @@ CPPSRCS += \
-
- endif # } OS_MACOSX
-
- ifdef OS_LINUX # {
-
- CPPSRCS += \
- atomicops_internals_x86_gcc.cc \
- base_paths_linux.cc \
-- data_pack.cc \
- file_util_linux.cc \
- file_version_info_linux.cc \
- idle_timer_none.cc \
- process_util_linux.cc \
- time_posix.cc \
- $(NULL)
-
- ifdef MOZ_ENABLE_GTK2
-diff --git a/ipc/chromium/src/build/build_config.h
b/ipc/chromium/src/build/build_config.h
---- a/ipc/chromium/src/build/build_config.h
-+++ b/ipc/chromium/src/build/build_config.h
-@@ -52,17 +52,17 @@
- #define ARCH_CPU_X86_FAMILY 1
- #define ARCH_CPU_X86 1
- #define ARCH_CPU_32_BITS 1
- #elif defined(__ARMEL__)
- #define ARCH_CPU_ARM_FAMILY 1
- #define ARCH_CPU_ARMEL 1
- #define ARCH_CPU_32_BITS 1
- #define WCHAR_T_IS_UNSIGNED 1
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif
-
- // Type detection for wchar_t.
- #ifndef CHROMIUM_MOZILLA_BUILD
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
