[csw-devel] SF.net SVN: gar:[6141] csw/mgar/pkg/firefox/trunk
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sat Aug 29 23:37:41 CEST 2009
Revision: 6141
http://gar.svn.sourceforge.net/gar/?rev=6141&view=rev
Author: wbonnet
Date: 2009-08-29 21:37:39 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Upgrade to Firefox 3.0.13. Firefox2 package is moved to a maintenance branch
Modified Paths:
--------------
csw/mgar/pkg/firefox/trunk/Makefile
csw/mgar/pkg/firefox/trunk/checksums
csw/mgar/pkg/firefox/trunk/files/autoconf.mk.in.diff
csw/mgar/pkg/firefox/trunk/removeBuildPathFromJar.sh
Added Paths:
-----------
csw/mgar/pkg/firefox/trunk/files/SunOS5.mk.diff
csw/mgar/pkg/firefox/trunk/files/autoconf.mk.diff
csw/mgar/pkg/firefox/trunk/files/configure.diff
csw/mgar/pkg/firefox/trunk/files/file_id.cc.diff
csw/mgar/pkg/firefox/trunk/files/firefox.diff
csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff
csw/mgar/pkg/firefox/trunk/files/md5.h.diff
csw/mgar/pkg/firefox/trunk/files/nsExceptionHandler.cpp.diff
csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff
csw/mgar/pkg/firefox/trunk/files/nsNativeApSuportUnix.cpp.diff
csw/mgar/pkg/firefox/trunk/files/nsPluginsDirUnix.cpp.diff
csw/mgar/pkg/firefox/trunk/files/packager.mk.diff
csw/mgar/pkg/firefox/trunk/files/solaris_lwp.h.diff
csw/mgar/pkg/firefox/trunk/files/stdbool.h
Removed Paths:
-------------
csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec
csw/mgar/pkg/firefox/trunk/files/CSWfirefox.prototype
Modified: csw/mgar/pkg/firefox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/firefox/trunk/Makefile 2009-08-29 21:34:07 UTC (rev 6140)
+++ csw/mgar/pkg/firefox/trunk/Makefile 2009-08-29 21:37:39 UTC (rev 6141)
@@ -1,69 +1,94 @@
GARNAME = firefox
-GARVERSION = 2.0.0.20
-CATEGORIES = apps
+GARVERSION = 3.0.13
+CATEGORIES = x11
DISTNAME = $(GARNAME)
DESCRIPTION = Firefox Community Edition web browser
define BLURB
-The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web.
+ The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web.
endef
DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2
-DISTFILES += $(call admfiles,CSWfirefox, postinstall postremove )
+DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall autoconf.mk.diff
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = (\d+(?:\.\d+)*)
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/
UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/
-PERL="/opt/csw/bin/perl"
-CFLAGS=-xlibmil
-CXXFLAGS=-xlibmil -xlibmopt -features=tmplife -norunpath
-LDFLAGS=-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib
+PACKAGES = CSWfirefox
+CATALOGNAME_CSWfirefox = $(GARNAME)
+SPKG_DESC_CSWfirefox = $(DESCRIPTION)
-export PERL CFLAGS CXXFLAGS LDFLAGS
+REQUIRED_PKGS_CSWfirefox = CSWdbusglib
+REQUIRED_PKGS_CSWfirefox += CSWfconfig
+REQUIRED_PKGS_CSWfirefox += CSWftype2
+REQUIRED_PKGS_CSWfirefox += CSWgconf2
+REQUIRED_PKGS_CSWfirefox += CSWglib2
+REQUIRED_PKGS_CSWfirefox += CSWgnomevfs2
+REQUIRED_PKGS_CSWfirefox += CSWgtk2
+REQUIRED_PKGS_CSWfirefox += CSWlibatk
+REQUIRED_PKGS_CSWfirefox += CSWlibcairo
+REQUIRED_PKGS_CSWfirefox += CSWlibdbus
+REQUIRED_PKGS_CSWfirefox += CSWlibgnome
+REQUIRED_PKGS_CSWfirefox += CSWlibx11
+REQUIRED_PKGS_CSWfirefox += CSWlibxrender
+REQUIRED_PKGS_CSWfirefox += CSWpango
+REQUIRED_PKGS_CSWfirefox += CSWsqlite3rt
-CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox
+# Defines the list of patches to be applied to the sources
PATCHFILES = autoconf.mk.in.diff
-TEST_SCRIPTS =
+PATCHFILES += configure.diff
+PATCHFILES += nsPluginsDirUnix.cpp.diff
+PATCHFILES += packager.mk.diff
+PATCHFILES += jemalloc.c.diff
+PATCHFILES += nsMathUtils.h.diff
+PATCHFILES += file_id.cc.diff
+PATCHFILES += md5.h.diff
+PATCHFILES += solaris_lwp.h.diff
+PATCHFILES += nsNativeApSuportUnix.cpp.diff
+PATCHFILES += nsExceptionHandler.cpp.diff
+PATCHFILES += SunOS5.mk.diff
+# pkg-config options
+EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
+
+PERL=/opt/csw/bin/perl
+CXXFLAGS +=-xlibmil -xlibmopt -features=tmplife -norunpath
+CFLAGS +=-xlibmil -D__solaris__
+CFLAGS += -DG_HAVE_ISO_VARARGS
+CXXFLAGS += -DG_HAVE_ISO_VARARGS
+CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include
+XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include
+
+EXTRA_CONFIGURE_EXPORTS = XCFLAGS
+
+LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3
+
+export PERL CFLAGS CXXFLAGS LDFLAGS
+
+CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox --disable-crashreporter
+
+TEST_SCRIPTS =
+
+LICENSE = LICENSE
+
# Variable for direct access to working dir
WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)
WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))
-# Dependencies tracking
-REQUIRED_PKGS_CSWfirefox += CSWbonobo2
-REQUIRED_PKGS_CSWfirefox += CSWfconfig
-REQUIRED_PKGS_CSWfirefox += CSWftype2
-REQUIRED_PKGS_CSWfirefox += CSWgconf2
-REQUIRED_PKGS_CSWfirefox += CSWggettextrt
-REQUIRED_PKGS_CSWfirefox += CSWglib2
-REQUIRED_PKGS_CSWfirefox += CSWgnomekeyring
-REQUIRED_PKGS_CSWfirefox += CSWgnomevfs2
-REQUIRED_PKGS_CSWfirefox += CSWgtk2
-REQUIRED_PKGS_CSWfirefox += CSWlibart
-REQUIRED_PKGS_CSWfirefox += CSWlibatk
-REQUIRED_PKGS_CSWfirefox += CSWlibbonoboui
-REQUIRED_PKGS_CSWfirefox += CSWlibcairo
-REQUIRED_PKGS_CSWfirefox += CSWlibgnome
-REQUIRED_PKGS_CSWfirefox += CSWlibgnomecanvas
-REQUIRED_PKGS_CSWfirefox += CSWlibgnomeui
-REQUIRED_PKGS_CSWfirefox += CSWlibidl
-REQUIRED_PKGS_CSWfirefox += CSWlibpopt
-REQUIRED_PKGS_CSWfirefox += CSWlibxft2
-REQUIRED_PKGS_CSWfirefox += CSWlibxrender
-REQUIRED_PKGS_CSWfirefox += CSWorbit2
-REQUIRED_PKGS_CSWfirefox += CSWpango
-REQUIRED_PKGS_CSWfirefox += CSWzlib
-
post-extract:
@mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD)
+ @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc
@$(MAKECOOKIE)
-pre-configure:
+pre-configure-modulated:
@cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig
-pre-install:
+post-configure-modulated:
+ @gpatch -d$(WORKSRC) -p1 -F2 < download/autoconf.mk.diff
+
+pre-install-modulated:
( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/firefox/bin/firefox . )
( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
@@ -72,17 +97,11 @@
( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop )
( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys )
- @ginstall -d $(WORK_INSTALL)$(datadir)/doc/$(GARNAME)
- @gcp -fp $(WORK_BUILD)/LICENSE $(WORK_INSTALL)$(datadir)/doc/$(GARNAME)/License.txt
-post-install:
+post-install-modulated:
( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; )
- ( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp )
- ( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp )
( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; )
( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; )
( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
-# include the rest of GAR
include gar/category.mk
-
Modified: csw/mgar/pkg/firefox/trunk/checksums
===================================================================
--- csw/mgar/pkg/firefox/trunk/checksums 2009-08-29 21:34:07 UTC (rev 6140)
+++ csw/mgar/pkg/firefox/trunk/checksums 2009-08-29 21:37:39 UTC (rev 6141)
@@ -1,5 +1,16 @@
-35b08b743fae892fc69aed10cdb3a7cf download/CSWfirefox.gspec
f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall
6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove
-ffec5571cbae2a9fae89ba6a3d3f81c5 download/autoconf.mk.in.diff
-f3718fefd01c8edc007ec0b416a8a7b8 download/firefox-2.0.0.20-source.tar.bz2
+9eaa0433fd8d1d7a3b39442b4b4c3e14 download/SunOS5.mk.diff
+03e4d0e627dd508ea895c99c5e7ed184 download/autoconf.mk.diff
+45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff
+c869762735a41bb30f417e510ccb7f31 download/configure.diff
+a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff
+040d01a1e22a1ec1b28188479df06007 download/firefox-3.0.13-source.tar.bz2
+a19792f0b67f28c9227d19d069369369 download/jemalloc.c.diff
+18b0cdc902caa4172b7f2d473239c9a9 download/md5.h.diff
+1a3d61e09378d28d9bc9f3df45a224bc download/nsExceptionHandler.cpp.diff
+ca4162516d8c09deaa9f0b6f3b3ecffb download/nsMathUtils.h.diff
+d8f7ec0df9f63317ff2d8578d9dbe3ff download/nsNativeApSuportUnix.cpp.diff
+f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff
+d0d942fa0c012abcb2a45b1d0fc99051 download/packager.mk.diff
+29e0ca858fe3aef24d5be1300dc39735 download/solaris_lwp.h.diff
Deleted: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec 2009-08-29 21:34:07 UTC (rev 6140)
+++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec 2009-08-29 21:37:39 UTC (rev 6141)
@@ -1,6 +0,0 @@
-%var bitname firefox
-%var pkgname CSWfirefox
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information
Added: csw/mgar/pkg/firefox/trunk/files/SunOS5.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/SunOS5.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/SunOS5.mk.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,11 @@
+--- firefox.orig/security/coreconf/SunOS5.mk 2009-08-29 23:08:08.804586828 +0200
++++ firefox/security/coreconf/SunOS5.mk 2009-08-29 23:08:32.556961245 +0200
+@@ -104,7 +104,7 @@
+ endif
+ endif
+
+-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
++INCLUDES += -I/usr/dt/include -I/opt/csw/X11/include
+
+ RANLIB = echo
+ CPU_ARCH = sparc
Added: csw/mgar/pkg/firefox/trunk/files/autoconf.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/autoconf.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/autoconf.mk.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,31 @@
+--- firefox.orig/config/autoconf.mk 2009-08-29 21:57:42.151999781 +0200
++++ firefox/config/autoconf.mk 2009-08-29 22:05:33.912567245 +0200
+@@ -238,7 +238,7 @@
+
+ MOZ_PREF_EXTENSIONS = 1
+
+-MOZ_CAIRO_LIBS = -L/opt/csw/lib -lcairo -lfreetype -lz -lfontconfig -L/usr/openwin/lib -R/usr/openwin/lib -L/opt/csw/lib -L/opt/csw/X11/lib -lXrender -lcairo -lX11
++MOZ_CAIRO_LIBS = -L/opt/csw/lib -lcairo -lfreetype -lz -lfontconfig -L/opt/csw/lib -L/opt/csw/X11/lib -lXrender -lcairo -lX11
+
+ MOZ_ENABLE_GNOMEUI = 1
+ MOZ_GNOMEUI_CFLAGS = -DORBIT2=1 -D_REENTRANT -D_PTHREADS -D__solaris__ -D_POSIX_PTHREAD_SEMANTICS -I/opt/csw/include/libgnomeui-2.0 -I/opt/csw/include/libgnome-2.0 -I/opt/csw/include/libgnomecanvas-2.0 -I/opt/csw/include/gtk-2.0 -I/opt/csw/include/libart-2.0 -I/opt/csw/include/gconf/2 -I/opt/csw/include/libbonoboui-2.0 -I/opt/csw/include/gnome-vfs-2.0 -I/opt/csw/lib/gnome-vfs-2.0/include -I/opt/csw/include/gnome-keyring-1 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/orbit-2.0 -I/opt/csw/include/libbonobo-2.0 -I/opt/csw/include/bonobo-activation-2.0 -I/opt/csw/include/pango-1.0 -I/opt/csw/include/freetype2 -I/opt/csw/include -I/opt/csw/lib/gtk-2.0/include -I/opt/csw/include/atk-1.0 -I/opt/csw/include/cairo -I/opt/csw/include/pixman-1 -I/opt/csw/include/libpng12 -I/opt/csw/include/libxml2 -I/opt/csw/X11/include
+@@ -270,7 +270,7 @@
+
+ CROSS_COMPILE =
+
+-OS_CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/usr/openwin/include
++OS_CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include
+ OS_CFLAGS = $(OS_CPPFLAGS) -xlibmil -D__solaris__ -DG_HAVE_ISO_VARARGS -xlibmil -D__solaris__ -DG_HAVE_ISO_VARARGS -xlibmieee -xstrconst -xbuiltin=%none -mt
+ OS_CXXFLAGS = $(OS_CPPFLAGS) -xlibmil -xlibmopt -features=tmplife -norunpath -DG_HAVE_ISO_VARARGS -xlibmil -xlibmopt -features=tmplife -norunpath -DG_HAVE_ISO_VARARGS -xlibmieee -xbuiltin=%none -features=tmplife -norunpath -mt
+ OS_LDFLAGS = -lpthread -M /usr/lib/ld/map.noexstk -xildoff -z lazyload -z combreloc -L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 -L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 -z ignore -R '$$ORIGIN:$$ORIGIN/..'
+@@ -297,8 +297,8 @@
+ PROFILE_USE_CFLAGS = -xlinkopt=2 -xprofile=use:/home/wbonnet/mgar/pkg/firefox/branches/firefox3-packaging/work/build-isa-sparcv8/firefox/browser
+ PROFILE_USE_LDFLAGS = -xlinkopt=2 -xprofile=use:/home/wbonnet/mgar/pkg/firefox/branches/firefox3-packaging/work/build-isa-sparcv8/firefox/browser
+
+-XCFLAGS = -I/usr/openwin/include
+-XLDFLAGS = -L/usr/openwin/lib -R/usr/openwin/lib
++XCFLAGS = -I/opt/csw/X11/include
++XLDFLAGS = -L/opt/csw/X11/lib -R/opt/csw/X11/lib
+ XLIBS = -lX11 -lsocket -lnsl
+
+ WIN_TOP_SRC =
Modified: csw/mgar/pkg/firefox/trunk/files/autoconf.mk.in.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/autoconf.mk.in.diff 2009-08-29 21:34:07 UTC (rev 6140)
+++ csw/mgar/pkg/firefox/trunk/files/autoconf.mk.in.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -1,7 +1,7 @@
diff --speed-large-files --minimal -Nru firefox.orig/config/autoconf.mk.in firefox/config/autoconf.mk.in
---- firefox.orig/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400
-+++ firefox/config/autoconf.mk.in 2007-02-25 07:21:36.245899000 -0500
-@@ -57,14 +57,14 @@
+--- firefox.orig/config/autoconf.mk.in 2008-09-18 22:00:51.000000000 +0000
++++ firefox/config/autoconf.mk.in 2008-11-15 20:28:25.577542600 +0000
+@@ -58,14 +58,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@@ -10,13 +10,13 @@
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
--idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = @datadir@/idl
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)
-+mredir = $(libdir)/mre
- mrelibdir = $(mredir)/lib
-
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(datadir)/idl
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)
++sdkdir = $(libdir)
+
DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
Added: csw/mgar/pkg/firefox/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/configure.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/configure.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,25 @@
+diff --speed-large-files --minimal -Nru firefox.orig/configure firefox/configure
+--- firefox.orig/configure 2009-07-07 21:46:57.267011389 +0200
++++ firefox/configure 2009-07-07 21:49:10.319971404 +0200
+@@ -4382,8 +4382,8 @@
+ /usr/local/x11r5/include \
+ /usr/lpp/Xamples/include \
+ \
+- /usr/openwin/include \
+- /usr/openwin/share/include \
++ /opt/csw/X11/include \
++ /opt/csw/X11/share/include \
+ ; \
+ do
+ if test -r "$ac_dir/$x_direct_test_include"; then
+@@ -4458,8 +4458,8 @@
+ /usr/lpp/Xamples/lib \
+ /lib/usr/lib/X11 \
+ \
+- /usr/openwin/lib \
+- /usr/openwin/share/lib \
++ /opt/csw/X11/lib \
++ /opt/csw/X11/share/lib \
+ ; \
+ do
+ for ac_extension in a so sl; do
Added: csw/mgar/pkg/firefox/trunk/files/file_id.cc.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/file_id.cc.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/file_id.cc.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,11 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/crashreporter/google-breakpad/src/common/solaris/file_id.cc firefox/toolkit/crashreporter/google-breakpad/src/common/solaris/file_id.cc
+--- firefox.orig/toolkit/crashreporter/google-breakpad/src/common/solaris/file_id.cc 2007-10-21 15:36:06.000000000 +0000
++++ firefox/toolkit/crashreporter/google-breakpad/src/common/solaris/file_id.cc 2008-11-24 22:07:22.563549000 +0000
+@@ -37,6 +37,7 @@
+ #include <fcntl.h>
+ #include <gelf.h>
+ #include <sys/mman.h>
++#include <sys/stat.h>
+ #include <sys/ksyms.h>
+ #include <stdio.h>
+ #include <string.h>
Added: csw/mgar/pkg/firefox/trunk/files/firefox.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/firefox.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/firefox.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,15 @@
+diff --speed-large-files --minimal -Nru firefox.orig/browser/app/firefox firefox/browser/app/firefox
+--- firefox.orig/browser/app/firefox 2009-08-27 23:43:31.266507053 +0200
++++ firefox/browser/app/firefox 2009-08-27 23:44:53.015182925 +0200
+@@ -54,6 +54,11 @@
+
+ moz_libdir=/opt/csw/mozilla/firefox/lib
+
++if [ "`uname -r`" = "5.8" ] ; then
++ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/lwp
++ LD_LIBRARY_PATH_64=$LD_LIBRARY_PATH_64:/usr/lib/lwp/64
++fi
++
+ # Use run-mozilla.sh in the current dir if it exists
+ # If not, then start resolving symlinks until we find run-mozilla.sh
+ found=0
Added: csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,28 @@
+diff --speed-large-files --minimal -Nru firefox.orig/memory/jemalloc/jemalloc.c firefox/memory/jemalloc/jemalloc.c
+--- firefox.orig/memory/jemalloc/jemalloc.c 2009-07-08 19:50:45.390553748 +0200
++++ firefox/memory/jemalloc/jemalloc.c 2009-07-08 19:51:32.355474070 +0200
+@@ -312,9 +312,9 @@
+ #endif
+ #include <sched.h>
+ #include <stdarg.h>
+-#include <stdbool.h>
++#include "stdbool.h"
+ #include <stdio.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifndef MOZ_MEMORY_DARWIN
+@@ -422,6 +422,12 @@
+ #endif
+ #endif
+
++#define issetugid() 0
++char *strerror_r(int errnum, char *buf, size_t buflen)
++{
++ strncpy(buf, strerror(errnum), buflen);
++}
++
+ #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW)
+
+ /* sizeof(int) == (1U << SIZEOF_INT_2POW). */
Added: csw/mgar/pkg/firefox/trunk/files/md5.h.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/md5.h.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/md5.h.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/crashreporter/google-breakpad/src/common/md5.h firefox/toolkit/crashreporter/google-breakpad/src/common/md5.h
+--- firefox.orig/toolkit/crashreporter/google-breakpad/src/common/md5.h 2007-10-21 15:36:05.000000000 +0000
++++ firefox/toolkit/crashreporter/google-breakpad/src/common/md5.h 2008-11-24 21:59:04.857036600 +0000
+@@ -3,7 +3,7 @@
+ #ifndef COMMON_MD5_H__
+ #define COMMON_MD5_H__
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ typedef uint32_t u32;
+ typedef uint8_t u8;
Added: csw/mgar/pkg/firefox/trunk/files/nsExceptionHandler.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsExceptionHandler.cpp.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsExceptionHandler.cpp.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/crashreporter/nsExceptionHandler.cpp firefox/toolkit/crashreporter/nsExceptionHandler.cpp
+--- firefox.orig/toolkit/crashreporter/nsExceptionHandler.cpp 2008-07-20 22:19:32.000000000 +0000
++++ firefox/toolkit/crashreporter/nsExceptionHandler.cpp 2008-11-24 21:46:58.112282800 +0000
+@@ -301,7 +301,7 @@
+ else if (pid == 0) {
+ // need to clobber this, as libcurl might load NSS,
+ // and we want it to load the system NSS.
+- unsetenv("LD_LIBRARY_PATH");
++ // unsetenv("LD_LIBRARY_PATH");
+ (void) execl(crashReporterPath,
+ crashReporterPath, minidumpPath, (char*)0);
+ _exit(1);
Added: csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,14 @@
+diff --speed-large-files --minimal -Nru firefox.orig/xpcom/ds/nsMathUtils.h firefox/xpcom/ds/nsMathUtils.h
+--- firefox.orig/xpcom/ds/nsMathUtils.h 2008-04-02 00:21:31.000000000 -0400
++++ firefox/xpcom/ds/nsMathUtils.h 2008-11-22 18:22:11.384668100 -0500
+@@ -42,6 +42,10 @@
+ #include <math.h>
+ #include <float.h>
+
++# define floorf(a) floor (a)
++# define ceilf(a) ceil (a)
++# define round(a) floor(a + 0.5)
++
+ /*
+ * round
+ */
Added: csw/mgar/pkg/firefox/trunk/files/nsNativeApSuportUnix.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsNativeApSuportUnix.cpp.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsNativeApSuportUnix.cpp.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,31 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/xre/nsNativeAppSupportUnix.cpp firefox/toolkit/xre/nsNativeAppSupportUnix.cpp
+--- firefox.orig/toolkit/xre/nsNativeAppSupportUnix.cpp 2008-02-21 10:55:06.000000000 +0000
++++ firefox/toolkit/xre/nsNativeAppSupportUnix.cpp 2008-11-24 22:14:26.002326100 +0000
+@@ -237,19 +237,19 @@
+ // We will load gail, atk-bridge by ourself later
+ // We can't run atk-bridge init here, because gail get the control
+ // Set GNOME_ACCESSIBILITY to 0 can avoid this
+- static const char *accEnv = "GNOME_ACCESSIBILITY";
+- const char *accOldValue = getenv(accEnv);
+- setenv(accEnv, "0", 1);
++// static const char *accEnv = "GNOME_ACCESSIBILITY";
++// const char *accOldValue = getenv(accEnv);
++// setenv(accEnv, "0", 1);
+ #endif
+
+ gnome_program_init("Gecko", "1.0", libgnomeui_module_info_get(), gArgc, gArgv, NULL);
+
+ #ifdef ACCESSIBILITY
+- if (accOldValue) {
+- setenv(accEnv, accOldValue, 1);
+- } else {
+- unsetenv(accEnv);
+- }
++// if (accOldValue) {
++// setenv(accEnv, accOldValue, 1);
++// } else {
++// unsetenv(accEnv);
++// }
+ #endif
+
+ // Careful! These libraries cannot be unloaded after this point because
Added: csw/mgar/pkg/firefox/trunk/files/nsPluginsDirUnix.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsPluginsDirUnix.cpp.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsPluginsDirUnix.cpp.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/modules/plugin/base/src/nsPluginsDirUnix.cpp firefox/modules/plugin/base/src/nsPluginsDirUnix.cpp
+--- firefox.orig/modules/plugin/base/src/nsPluginsDirUnix.cpp 2009-07-07 21:52:50.550842128 +0200
++++ firefox/modules/plugin/base/src/nsPluginsDirUnix.cpp 2009-07-07 21:53:10.444317091 +0200
+@@ -76,7 +76,7 @@
+ #define DEFAULT_X11_PATH "/usr/lib"
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a"
+ #elif defined(SOLARIS)
+-#define DEFAULT_X11_PATH "/usr/openwin/lib/"
++#define DEFAULT_X11_PATH "/opt/csw/X11/lib/"
+ #elif defined(LINUX)
+ #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
+ #else
Added: csw/mgar/pkg/firefox/trunk/files/packager.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/packager.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/packager.mk.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,21 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/mozapps/installer/packager.mk firefox/toolkit/mozapps/installer/packager.mk
+--- firefox.orig/toolkit/mozapps/installer/packager.mk 2008-04-28 19:14:12.000000000 +0000
++++ firefox/toolkit/mozapps/installer/packager.mk 2008-11-15 20:28:41.679741300 +0000
+@@ -363,7 +363,7 @@
+ endif # MOZ_PKG_MANIFEST
+ ifndef PKG_SKIP_STRIP
+ @echo "Stripping package directory..."
+- @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); find . ! -type d \
++ @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); gfind . ! -type d \
+ ! -name "*.js" \
+ ! -name "*.xpt" \
+ ! -name "*.gif" \
+@@ -426,7 +426,7 @@
+ (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++ gfind $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
Added: csw/mgar/pkg/firefox/trunk/files/solaris_lwp.h.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/solaris_lwp.h.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/solaris_lwp.h.diff 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.h firefox/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.h
+--- firefox.orig/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.h 2008-03-19 01:48:21.000000000 +0000
++++ firefox/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.h 2008-11-24 21:18:58.900019700 +0000
+@@ -41,7 +41,7 @@
+ #endif
+
+ #include <signal.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <sys/user.h>
+ #include <ucontext.h>
+
Added: csw/mgar/pkg/firefox/trunk/files/stdbool.h
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/stdbool.h (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/stdbool.h 2009-08-29 21:37:39 UTC (rev 6141)
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai at FreeBSD.org>
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+*
+* $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $
+*/
+
+#ifndef _STDBOOL_H_
+#define _STDBOOL_H_
+#define __bool_true_false_are_defined 1
+#ifndef __cplusplus
+#define false 0
+#define true 1
+#define bool _Bool
+#endif /* !__cplusplus */
+#endif /* !_STDBOOL_H_ */
+
Modified: csw/mgar/pkg/firefox/trunk/removeBuildPathFromJar.sh
===================================================================
--- csw/mgar/pkg/firefox/trunk/removeBuildPathFromJar.sh 2009-08-29 21:34:07 UTC (rev 6140)
+++ csw/mgar/pkg/firefox/trunk/removeBuildPathFromJar.sh 2009-08-29 21:37:39 UTC (rev 6141)
@@ -1,4 +1,4 @@
-#!/opt/csw/bin/bash
+#!/opt/csw/bin/bash -x
if [ -d ~/.tempextractjar ] ;
then
@@ -14,7 +14,9 @@
gfind . -name "*.js" -exec bash -x -c " mv {} {}.temp && gsed -e s_\$REPLACEDIR\_\_g {}.temp > {} && rm {}.temp" \;
-rm $BACKUP_OLD_DIR/$1
+rm $1
jar cvf $BACKUP_OLD_DIR/$1 *
cd $BACKUP_OLD_DIR
+
+rm -fr ~/.tempextractjar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list