[csw-devel] SF.net SVN: gar:[2326] csw/trunk/apps/firefox
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Thu Nov 20 00:14:12 CET 2008
Revision: 2326
http://gar.svn.sourceforge.net/gar/?rev=2326&view=rev
Author: wbonnet
Date: 2008-11-19 23:14:11 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
Update to 3.0.4
Modified Paths:
--------------
csw/trunk/apps/firefox/Makefile
csw/trunk/apps/firefox/checksums
csw/trunk/apps/firefox/files/CSWfirefox.depend
csw/trunk/apps/firefox/files/autoconf.mk.in.diff
csw/trunk/apps/firefox/files/packager.mk.diff
Added Paths:
-----------
csw/trunk/apps/firefox/files/jemalloc.c.diff
csw/trunk/apps/firefox/files/stdbool.h
Modified: csw/trunk/apps/firefox/Makefile
===================================================================
--- csw/trunk/apps/firefox/Makefile 2008-11-19 20:36:01 UTC (rev 2325)
+++ csw/trunk/apps/firefox/Makefile 2008-11-19 23:14:11 UTC (rev 2326)
@@ -13,36 +13,36 @@
MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/
DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2
DISTFILES += $(call admfiles,CSWfirefox, depend postinstall postremove )
-# DISTFILES += CSWfirefoxrt.depend CSWfirefoxrt.gspec CSWfirefoxrt.prototype
-# DISTFILES += CSWfirefoxdevel.depend CSWfirefoxdevel.gspec CSWfirefoxdevel.prototype
-# DISTFILES += CSWfirefox.depend CSWfirefox.gspec CSWfirefox.prototype CSWfirefox.postinstall CSWfirefox.postremove
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-PERL="/opt/csw/bin/perl"
-FIND="/opt/csw/bin/gfind"
-CFLAGS=-xlibmil
-CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath"
-LDFLAGS="-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib"
+PATCHFILES = autoconf.mk.in.diff
+PATCHFILES += packager.mk.diff
+PATCHFILES += jemalloc.c.diff
-export PERL CFLAGS CXXFLAGS LDFLAGS FIND
+include ../category.mk
+PERL=/opt/csw/bin/perl
+CXXFLAGS+=-xlibmil -xlibmopt -features=tmplife -norunpath
+CFLAGS+=-xlibmil -D__solaris__
+LDFLAGS+=-L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib
+
+export PERL CFLAGS CXXFLAGS LDFLAGS
+
CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox
-# PATCHFILES = autoconf.mk.in.diff
-# PATCHFILES += packager.mk.diff
+TEST_SCRIPTS = none
-TEST_SCRIPTS =
+test-none:
+ @$(MAKECOOKIE)
-include ../category.mk
-
post-extract:
( mv $(WORKDIR)/mozilla $(WORKDIR)/$(DISTNAME) )
+ ( cp $(FILEDIR)/stdbool.h $(WORKDIR)/$(DISTNAME)/memory/jemalloc/ )
@$(MAKECOOKIE)
pre-configure:
-# ( mv $(HOME)/.mozconfig $(HOME)/.mozconfig.pre-CSWfirefox-build )
( cp $(FILEDIR)/.mozconfig $(WORKDIR)/$(DISTNAME)/.mozconfig )
pre-install:
@@ -56,7 +56,10 @@
( cp $(FILEDIR)/firefox.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/firefox.keys )
post-install:
- ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; )
+ ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; )
+ ( mv $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp && gsed -e s\_-L$(DESTDIR)/opt/csw/lib\_\_g $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp > $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config && rm $(DESTDIR)/opt/csw/mozilla/firefox/bin/firefox-config.temp )
+ ( mv $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp && gsed -e s\_-L$(DESTDIR)/opt/csw/lib\_\_g $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp > $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc && rm $(DESTDIR)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp )
( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; )
( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; )
( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; )
+
Modified: csw/trunk/apps/firefox/checksums
===================================================================
--- csw/trunk/apps/firefox/checksums 2008-11-19 20:36:01 UTC (rev 2325)
+++ csw/trunk/apps/firefox/checksums 2008-11-19 23:14:11 UTC (rev 2326)
@@ -1,5 +1,8 @@
8a1ac4a5940108a96458c5307a74c98d download/firefox-3.0.4-source.tar.bz2
3cc981390e527e1343f6c450d839eceb download/CSWfirefox.gspec
-d90e4c03eeae012a80de7b44129ded1f download/CSWfirefox.depend
+206d69879ba8f02201c74bd78ec33d9f download/CSWfirefox.depend
f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall
6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove
+1c8ee494a515890096c71b77c6c01dd7 download/autoconf.mk.in.diff
+d0d942fa0c012abcb2a45b1d0fc99051 download/packager.mk.diff
+20622e4e2548b227aba09e1eb04de134 download/jemalloc.c.diff
Modified: csw/trunk/apps/firefox/files/CSWfirefox.depend
===================================================================
--- csw/trunk/apps/firefox/files/CSWfirefox.depend 2008-11-19 20:36:01 UTC (rev 2325)
+++ csw/trunk/apps/firefox/files/CSWfirefox.depend 2008-11-19 23:14:11 UTC (rev 2326)
@@ -23,7 +23,6 @@
P CSWgnomekeyring gnomekeyring - keep password and other secrets for users
P CSWlibcairo libcairo - The Cairo 2D Graphics Library
P CSWiconv libiconv - GNU iconv library
-P CSWdbusglib
-P CSWlibdbus
-P CSWsqlite3
-
+P CSWcommon common - common files and dirs for CSW packages
+P CSWcommon common - common files and dirs for CSW packages
+P CSWcommon common - common files and dirs for CSW packages
Modified: csw/trunk/apps/firefox/files/autoconf.mk.in.diff
===================================================================
--- csw/trunk/apps/firefox/files/autoconf.mk.in.diff 2008-11-19 20:36:01 UTC (rev 2325)
+++ csw/trunk/apps/firefox/files/autoconf.mk.in.diff 2008-11-19 23:14:11 UTC (rev 2326)
@@ -1,22 +1,22 @@
diff --speed-large-files --minimal -Nru firefox.orig/config/autoconf.mk.in firefox/config/autoconf.mk.in
---- firefox.orig/config/autoconf.mk.in
-+++ firefox/config/autoconf.mk.in
+--- 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@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--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
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-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)/sdk
+
+ DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
Added: csw/trunk/apps/firefox/files/jemalloc.c.diff
===================================================================
--- csw/trunk/apps/firefox/files/jemalloc.c.diff (rev 0)
+++ csw/trunk/apps/firefox/files/jemalloc.c.diff 2008-11-19 23:14:11 UTC (rev 2326)
@@ -0,0 +1,16 @@
+diff --speed-large-files --minimal -Nru firefox.orig/memory/jemalloc/jemalloc.c firefox/memory/jemalloc/jemalloc.c
+--- firefox.orig/memory/jemalloc/jemalloc.c 2008-07-23 05:47:24.000000000 -0400
++++ firefox/memory/jemalloc/jemalloc.c 2008-11-19 17:57:57.038274900 -0500
+@@ -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
+
Modified: csw/trunk/apps/firefox/files/packager.mk.diff
===================================================================
--- csw/trunk/apps/firefox/files/packager.mk.diff 2008-11-19 20:36:01 UTC (rev 2325)
+++ csw/trunk/apps/firefox/files/packager.mk.diff 2008-11-19 23:14:11 UTC (rev 2326)
@@ -1,12 +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 21:14:12.000000000 +0200
-+++ firefox/toolkit/mozapps/installer/packager.mk 2008-11-08 01:54:31.129193000 +0100
+--- 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 -)
+ (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 \;
+- 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
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
Added: csw/trunk/apps/firefox/files/stdbool.h
===================================================================
--- csw/trunk/apps/firefox/files/stdbool.h (rev 0)
+++ csw/trunk/apps/firefox/files/stdbool.h 2008-11-19 23:14:11 UTC (rev 2326)
@@ -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_ */
+
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