Author: mmazur Date: Tue Mar 22 22:57:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- both patches updated; not tested though
---- Files affected:
packages/iceweasel:
iceweasel-install.patch (1.6 -> 1.7) , iceweasel.spec (1.130 -> 1.131)
---- Diffs:
================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.6
packages/iceweasel/iceweasel-install.patch:1.7
--- packages/iceweasel/iceweasel-install.patch:1.6 Thu Jan 21 21:34:30 2010
+++ packages/iceweasel/iceweasel-install.patch Tue Mar 22 23:57:42 2011
@@ -1,36 +1,3 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.org 2010-01-21
21:10:00.234466295 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2010-01-21
21:10:29.847369216 +0100
-@@ -362,13 +362,13 @@
- # NOTE: this must be a tar now that dist links into the tree so that we
- # do not strip the binaries actually in the tree.
- @echo "Creating package directory..."
-- @mkdir $(DIST)/$(MOZ_PKG_DIR)
-+ @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
- ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
-- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
- "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
-+ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -377,11 +377,11 @@
- ifndef STAGE_SDK
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif
- endif
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- @echo "Linking XPT files..."
- @rm -rf $(DIST)/xpt
- @$(NSINSTALL) -D $(DIST)/xpt
--- mozilla/browser/app/Makefile.in 2008-06-22 22:54:03.000000000 +0200
+++ mozilla/browser/app/Makefile.in 2008-06-23 10:34:59.000000000 +0200
@@ -397,7 +397,7 @@
@@ -60,3 +27,66 @@
endif # cocoa
endif # SKIP_COPY_XULRUNNER
endif # LIBXUL_SDK
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19
00:34:12.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22
23:53:43.877485659 +0100
+@@ -496,30 +496,30 @@
+ endif
+
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
+- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg
$@ $(EXCLUDE_LIST)
+ # NOTE: this must be a tar now that dist links into the tree so that we
+ # do not strip the binaries actually in the tree.
+ @echo "Creating package directory..."
+- @mkdir $(DIST)/$(MOZ_PKG_DIR)
++ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
+ ifdef MOZ_PKG_MANIFEST
+ $(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
+ $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
+ $(patsubst
%,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+- printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
++ printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
+ else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ ifndef STAGE_SDK
+@@ -529,10 +529,10 @@
+ @$(NSINSTALL) -D $(DIST)/xpt
+ @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp
$(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces
$(MOZ_PKG_APPNAME).xpt\n"
>$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest)
|| echo No *.xpt files found in:
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
+ endif
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
+ @echo "Linking XPT files..."
+ @rm -rf $(DIST)/xpt
+ @$(NSINSTALL) -D $(DIST)/xpt
+@@ -620,7 +620,7 @@
+ cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
+ endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
+- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(bindir)
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.130
packages/iceweasel/iceweasel.spec:1.131
--- packages/iceweasel/iceweasel.spec:1.130 Tue Mar 22 21:57:29 2011
+++ packages/iceweasel/iceweasel.spec Tue Mar 22 23:57:42 2011
@@ -150,9 +150,8 @@
cd mozilla
/bin/sh %{SOURCE2}
-#TODO: update these
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
%if "%{cc_version}" < "3.4"
%patch2 -p2
@@ -525,6 +524,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.131 2011/03/22 22:57:42 mmazur
+- both patches updated; not tested though
+
Revision 1.130 2011/03/22 20:57:29 mmazur
- BR: cairo-devel >= 1.10.2-5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.130&r2=1.131&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
