[csw-devel] SF.net SVN: gar:[5565] csw/mgar/pkg/firefox/branches/firefox3.5-packaging
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sat Jul 11 15:03:19 CEST 2009
Revision: 5565
http://gar.svn.sourceforge.net/gar/?rev=5565&view=rev
Author: wbonnet
Date: 2009-07-11 13:03:19 +0000 (Sat, 11 Jul 2009)
Log Message:
-----------
First version that goes until the of compilation. Not yet working...
Modified Paths:
--------------
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff
Added Paths:
-----------
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.configure.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.in.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/npruntime.h.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/sign.sh.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-07-11 11:27:23 UTC (rev 5564)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-07-11 13:03:19 UTC (rev 5565)
@@ -20,6 +20,29 @@
CATALOGNAME_CSWfirefox = $(GARNAME)
SPKG_DESC_CSWfirefox = $(DESCRIPTION)
+# Defines dependencies
+REQUIRED_PKGS_CSWfirefox += CSWdbusglib
+REQUIRED_PKGS_CSWfirefox += CSWfconfig
+REQUIRED_PKGS_CSWfirefox += CSWftype2
+REQUIRED_PKGS_CSWfirefox += CSWgcc3core
+REQUIRED_PKGS_CSWfirefox += CSWgcc3corert
+REQUIRED_PKGS_CSWfirefox += CSWgcc3g++
+REQUIRED_PKGS_CSWfirefox += CSWgcc3g++rt
+REQUIRED_PKGS_CSWfirefox += CSWgcc4corert
+REQUIRED_PKGS_CSWfirefox += CSWgcc4g++rt
+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 += CSWlibxrender
+REQUIRED_PKGS_CSWfirefox += CSWpango
+REQUIRED_PKGS_CSWfirefox += CSWsqlite3rt
+REQUIRED_PKGS_CSWfirefox += CSWzlib
+
# Defines the list of patches to be applied to the sources
PATCHFILES += jemalloc.c.diff
PATCHFILES += jsstdint.h.diff
@@ -33,6 +56,11 @@
PATCHFILES += lowpbe.c.diff
PATCHFILES += softoken.config.mk.diff
PATCHFILES += fipsaudt.c.diff
+PATCHFILES += sign.sh.diff
+PATCHFILES += js.configure.diff
+PATCHFILES += libxul.Makefile.in.diff
+PATCHFILES += libxul.Makefile.diff
+PATCHFILES += npruntime.h.diff
# PATCHFILES += nsMathUtils.h.diff
# PATCHFILES += file_id.cc.diff
# PATCHFILES += md5.h.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums 2009-07-11 11:27:23 UTC (rev 5564)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums 2009-07-11 13:03:19 UTC (rev 5565)
@@ -3,13 +3,18 @@
705741740ea1b5f2409bf4bfcf665220 download/Nativei386.h.diff
b940bc6f09956cb97b5a68f0fe9b73a6 download/SunOS5.mk.diff
8cd01e82aa312e79ae4f4f8c779174c6 download/autoconf.mk.in.diff
-37f4078ab1b34d16c1739d3b089b2947 download/configure.diff
+463d0bd49aa3726c1d9e19c18b38ce70 download/configure.diff
1178db1603e82d8bfefefa200d7e7ce7 download/fipsaudt.c.diff
6dd59399db08963ef022a1d0e5010053 download/firefox-3.5-source.tar.bz2
24e815d4265a9d0fe7786f3258e7dc5a download/jemalloc.c.diff
+ed49bb0e38e1b577d4742936bd551d79 download/js.configure.diff
0589ca8ad5f6744f573bb8ce0ba71d78 download/js.src.configure.diff
fafd09557dbb4d3acc01c51b78ce8120 download/jsstdint.h.diff
+48d3d6fe519013219989ae0a1b009a8c download/libxul.Makefile.diff
+48d3d6fe519013219989ae0a1b009a8c download/libxul.Makefile.in.diff
3ad7b67c350157d9b54270139e36c107 download/lowpbe.c.diff
+30ef29635eedc770a9db7bf3a79bf01a download/npruntime.h.diff
f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff
1de554cffc12f15bddf11ecdba0fe32d download/packager.mk.diff
-46e4778961dea277f8ee657f475a89dd download/softoken.config.mk.diff
+e4bfb0cee27672ed90ec473b589e3305 download/sign.sh.diff
+969c809ca9889cc8292ff50220b46efd download/softoken.config.mk.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff 2009-07-11 11:27:23 UTC (rev 5564)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/configure.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -23,3 +23,12 @@
; \
do
for ac_extension in a so sl; do
+@@ -5185,7 +5185,7 @@
+
+ MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-R,$(LIBXUL_DIST)/bin -Wl,-R,$(prefix)/lib'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.configure.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.configure.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/js.configure.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/js/src/configure firefox/js/src/configure
+--- firefox.orig/js/src/configure 2009-07-07 21:46:57.267011389 +0200
++++ firefox/js/src/configure 2009-07-07 21:49:10.319971404 +0200
+@@ -4775,7 +4775,7 @@
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+
+ MOZ_JS_LIBS='-L$(libdir) -lmozjs'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
++MOZ_FIX_LINK_PATHS='-Wl,-R,$(LIBXUL_DIST)/bin -Wl,-R,$(PREFIX)/lib'
+
+ MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
+ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/library/Makefile firefox/toolkit/library/Makefile
+--- firefox.orig/toolkit/library/Makefile 2009-07-07 21:46:57.267011389 +0200
++++ firefox/toolkit/library/Makefile 2009-07-07 21:49:10.319971404 +0200
+@@ -252,7 +252,7 @@
+ endif
+
+ ifeq ($(OS_ARCH),SunOS)
+-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
++EXTRA_DSO_LDOPTS += -lelf -ldemangle
+ endif
+
+ ifeq ($(OS_ARCH),WINNT)
Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.in.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.in.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/libxul.Makefile.in.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/toolkit/library/Makefile firefox/toolkit/library/Makefile
+--- firefox.orig/toolkit/library/Makefile 2009-07-07 21:46:57.267011389 +0200
++++ firefox/toolkit/library/Makefile 2009-07-07 21:49:10.319971404 +0200
+@@ -252,7 +252,7 @@
+ endif
+
+ ifeq ($(OS_ARCH),SunOS)
+-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
++EXTRA_DSO_LDOPTS += -lelf -ldemangle
+ endif
+
+ ifeq ($(OS_ARCH),WINNT)
Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/npruntime.h.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/npruntime.h.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/npruntime.h.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -0,0 +1,14 @@
+diff --speed-large-files --minimal -Nru firefox.orig/modules/plugin/base/public/npruntime.h firefox/modules/plugin/base/public/npruntime.h
+--- firefox.orig/modules/plugin/base/public/npruntime.h 2007-10-21 15:36:05.000000000 +0000
++++ firefox/modules/plugin/base/public/npruntime.h 2008-11-24 21:59:04.857036600 +0000
+@@ -65,6 +65,10 @@
+ #ifndef _NP_RUNTIME_H_
+ #define _NP_RUNTIME_H_
+
++typedef int bool;
++#define true 1
++#define false 0
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
Added: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/sign.sh.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/sign.sh.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/sign.sh.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/security/nss/cmd/shlibsign/sign.sh firefox/security/nss/cmd/shlibsign/sign.sh
+--- firefox.orig/security/nss/cmd/shlibsign/sign.sh 2007-10-21 15:36:05.000000000 +0000
++++ firefox/security/nss/cmd/shlibsign/sign.sh 2008-11-24 21:59:04.857036600 +0000
+@@ -44,7 +44,7 @@
+ export LIBPATH
+ SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
+ export SHLIB_PATH
+- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH:/opt/csw/lib
+ export LD_LIBRARY_PATH
+ DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff 2009-07-11 11:27:23 UTC (rev 5564)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff 2009-07-11 13:03:19 UTC (rev 5565)
@@ -6,7 +6,7 @@
# The -R '$ORIGIN' linker option instructs this library to search for its
# dependencies in the same directory where it resides.
-MKSHLIB += -R '$$ORIGIN'
-+MKSHLIB += -R '$$ORIGIN' -L../../../../dist/lib
++MKSHLIB += -R '$$ORIGIN' -L../../../../dist/lib -L/opt/csw/lib
OS_LIBS += -lbsm
endif
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