[csw-devel] SF.net SVN: gar:[6140] csw/mgar/pkg/firefox/branches
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sat Aug 29 23:34:07 CEST 2009
Revision: 6140
http://gar.svn.sourceforge.net/gar/?rev=6140&view=rev
Author: wbonnet
Date: 2009-08-29 21:34:07 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Fix patches for firefox3 under solaris 8. Move firefox2 package to maintenance branch
Modified Paths:
--------------
csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
Added Paths:
-----------
csw/mgar/pkg/firefox/branches/firefox2-maintenance/
csw/mgar/pkg/firefox/branches/firefox3-packaging/files/autoconf.mk.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2009-08-29 20:01:28 UTC (rev 6139)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2009-08-29 21:34:07 UTC (rev 6140)
@@ -9,7 +9,7 @@
endef
DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2
-DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall
+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+)*)
@@ -48,6 +48,7 @@
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
@@ -81,10 +82,13 @@
@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 )
@@ -94,7 +98,7 @@
( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info )
( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys )
-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 {}" \; )
( 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" \; )
Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums 2009-08-29 20:01:28 UTC (rev 6139)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/checksums 2009-08-29 21:34:07 UTC (rev 6140)
@@ -1,5 +1,7 @@
f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall
6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove
+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
Added: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/autoconf.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/autoconf.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/autoconf.mk.diff 2009-08-29 21:34:07 UTC (rev 6140)
@@ -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/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-08-29 20:01:28 UTC (rev 6139)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-08-29 21:34:07 UTC (rev 6140)
@@ -90,6 +90,7 @@
EXTRA_CONFIGURE_EXPORTS = XCFLAGS LD
# 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
+LDFLAGS += -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3
# PERL=/opt/csw/bin/perl
# export PERL
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums 2009-08-29 20:01:28 UTC (rev 6139)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums 2009-08-29 21:34:07 UTC (rev 6140)
@@ -9,7 +9,6 @@
463d0bd49aa3726c1d9e19c18b38ce70 download/configure.diff
f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff
0589ca8ad5f6744f573bb8ce0ba71d78 download/js.src.configure.diff
-b940bc6f09956cb97b5a68f0fe9b73a6 download/SunOS5.mk.diff
3ad7b67c350157d9b54270139e36c107 download/lowpbe.c.diff
969c809ca9889cc8292ff50220b46efd download/softoken.config.mk.diff
1178db1603e82d8bfefefa200d7e7ce7 download/fipsaudt.c.diff
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