[csw-devel] SF.net SVN: gar:[5521] csw/mgar/pkg/firefox/branches/firefox3.5-packaging
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Tue Jul 7 00:20:04 CEST 2009
Revision: 5521
http://gar.svn.sourceforge.net/gar/?rev=5521&view=rev
Author: wbonnet
Date: 2009-07-06 22:20:04 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
Fix some patches
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/autoconf.mk.in.diff
csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/packager.mk.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-07-06 21:25:52 UTC (rev 5520)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile 2009-07-06 22:20:04 UTC (rev 5521)
@@ -21,10 +21,11 @@
SPKG_DESC_CSWfirefox = $(DESCRIPTION)
# Defines the list of patches to be applied to the sources
-# PATCHFILES = autoconf.mk.in.diff
-# PATCHFILES += packager.mk.diff
PATCHFILES += jemalloc.c.diff
PATCHFILES += jsstdint.h.diff
+PATCHFILES += Nativei386.h.diff
+PATCHFILES = autoconf.mk.in.diff
+PATCHFILES += packager.mk.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-06 21:25:52 UTC (rev 5520)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums 2009-07-06 22:20:04 UTC (rev 5521)
@@ -1,5 +1,5 @@
f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall
6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove
+1dd2f532b937cfe21f11a90f11d2d3dd download/autoconf.mk.in.diff
6dd59399db08963ef022a1d0e5010053 download/firefox-3.5-source.tar.bz2
-4046facca3889b1dcb8539b6458278e1 download/jemalloc.c.diff
-fafd09557dbb4d3acc01c51b78ce8120 download/jsstdint.h.diff
+e4d436b36ca98bf903f11b4124fb118d download/packager.mk.diff
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/autoconf.mk.in.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/autoconf.mk.in.diff 2009-07-06 21:25:52 UTC (rev 5520)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/autoconf.mk.in.diff 2009-07-06 22:20:04 UTC (rev 5521)
@@ -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 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 @@
+--- firefox.orig/config/autoconf.mk.in 2009-07-07 00:06:33.409680057 +0200
++++ firefox/config/autoconf.mk.in 2009-07-07 00:13:28.551660717 +0200
+@@ -57,14 +57,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@
libdir = @libdir@
- datadir = @datadir@
+ 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)
-
++sdkdir = $(libdir)/sdk
+
DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
+ LIBXUL_SDK = @LIBXUL_SDK@
Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/packager.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/packager.mk.diff 2009-07-06 21:25:52 UTC (rev 5520)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/packager.mk.diff 2009-07-06 22:20:04 UTC (rev 5521)
@@ -1,21 +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 @@
+@@ -394,7 +394,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 -)
+ @echo "Stripping package directory..."
+- @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR); find . ! -type d \
++ @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR); gfind . ! -type d \
+ ! -name "*.js" \
+ ! -name "*.xpt" \
+ ! -name "*.gif" \
+@@ -458,7 +458,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 \;
+- 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
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