packages: iceweasel/iceweasel-branding.patch, iceweasel/iceweasel-install.p...

arekm arekm at pld-linux.org
Thu Jan 21 14:53:50 CET 2010 

Author: arekm                        Date: Thu Jan 21 13:53:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update patches; branding patch still needs update

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.10 -> 1.11) , iceweasel-install.patch (1.3 -> 1.4) , iceweasel-nss_cflags.patch (1.2 -> 1.3) , iceweasel.spec (1.84 -> 1.85) , iceweasel-gcc44.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.10 packages/iceweasel/iceweasel-branding.patch:1.11
--- packages/iceweasel/iceweasel-branding.patch:1.10	Tue Jun 30 15:24:06 2009
+++ packages/iceweasel/iceweasel-branding.patch	Thu Jan 21 14:53:45 2010
@@ -1,6 +1,6 @@
-diff -urN mozilla-1.9.1.orig/browser/app/application.ini mozilla-1.9.1/browser/app/application.ini
---- mozilla-1.9.1.orig/browser/app/application.ini	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/app/application.ini	2009-06-28 14:11:09.000000000 +0200
+diff -urN mozilla.orig/browser/app/application.ini mozilla/browser/app/application.ini
+--- mozilla.orig/browser/app/application.ini	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/app/application.ini	2009-06-28 14:11:09.000000000 +0200
 @@ -37,8 +37,8 @@
  
  #filter substitution
@@ -12,9 +12,9 @@
  Version=@APP_VERSION@
  BuildID=@GRE_BUILDID@
  #ifdef MOZ_SOURCE_REPO
-diff -urN mozilla-1.9.1.orig/browser/app/firefox-branding.js mozilla-1.9.1/browser/app/firefox-branding.js
---- mozilla-1.9.1.orig/browser/app/firefox-branding.js	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/app/firefox-branding.js	2009-06-28 14:12:51.000000000 +0200
+diff -urN mozilla.orig/browser/app/firefox-branding.js mozilla/browser/app/firefox-branding.js
+--- mozilla.orig/browser/app/firefox-branding.js	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/app/firefox-branding.js	2009-06-28 14:12:51.000000000 +0200
 @@ -1,17 +1,18 @@
 -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
@@ -39,9 +39,9 @@
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla-1.9.1.orig/browser/app/profile/firefox.js mozilla-1.9.1/browser/app/profile/firefox.js
---- mozilla-1.9.1.orig/browser/app/profile/firefox.js	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/app/profile/firefox.js	2009-06-28 14:15:29.000000000 +0200
+diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
+--- mozilla.orig/browser/app/profile/firefox.js	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/app/profile/firefox.js	2009-06-28 14:15:29.000000000 +0200
 @@ -70,12 +70,12 @@
  
  // Preferences for the Get Add-ons pane
@@ -93,9 +93,9 @@
  
  // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
  pref("security.alternate_certificate_error_page", "certerror");
-diff -urN mozilla-1.9.1.orig/browser/base/content/aboutDialog.xul mozilla-1.9.1/browser/base/content/aboutDialog.xul
---- mozilla-1.9.1.orig/browser/base/content/aboutDialog.xul	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/base/content/aboutDialog.xul	2009-06-28 17:29:14.000000000 +0200
+diff -urN mozilla.orig/browser/base/content/aboutDialog.xul mozilla/browser/base/content/aboutDialog.xul
+--- mozilla.orig/browser/base/content/aboutDialog.xul	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/base/content/aboutDialog.xul	2009-06-28 17:29:14.000000000 +0200
 @@ -87,7 +87,6 @@
          &copyrightInfo1;<label 
          class="text-link" href="&licenseLink;"
@@ -104,9 +104,9 @@
        </description>
        <textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
      </vbox>
-diff -urN mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul
---- mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul	2009-06-28 14:24:47.000000000 +0200
+diff -urN mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/base/content/baseMenuOverlay.xul	2009-06-28 14:24:47.000000000 +0200
 @@ -92,11 +92,6 @@
                    accesskey="&helpForIEUsers.accesskey;"
                    oncommand="openHelpLink('ieusers');"/>
@@ -119,9 +119,9 @@
          <menuseparator id="updateSeparator"/>
  #ifdef MOZ_UPDATER
          <menuitem id="checkForUpdates"
-diff -urN mozilla-1.9.1.orig/browser/base/content/credits.xhtml mozilla-1.9.1/browser/base/content/credits.xhtml
---- mozilla-1.9.1.orig/browser/base/content/credits.xhtml	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/base/content/credits.xhtml	2009-06-28 14:18:00.000000000 +0200
+diff -urN mozilla.orig/browser/base/content/credits.xhtml mozilla/browser/base/content/credits.xhtml
+--- mozilla.orig/browser/base/content/credits.xhtml	2009-06-24 10:20:27.000000000 +0200
++++ mozilla/browser/base/content/credits.xhtml	2009-06-28 14:18:00.000000000 +0200
 @@ -209,7 +209,7 @@
      </div>
  
@@ -153,9 +153,9 @@
            U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
            as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
            &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
-diff -urN mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js
---- mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js	2009-06-24 10:20:28.000000000 +0200
-+++ mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js	2009-06-28 14:19:26.000000000 +0200
+diff -urN mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla/browser/branding/unofficial/pref/firefox-branding.js
+--- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla/browser/branding/unofficial/pref/firefox-branding.js	2009-06-28 14:19:26.000000000 +0200
 @@ -1,17 +1,17 @@
 -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
@@ -179,9 +179,9 @@
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js mozilla-1.9.1/browser/components/nsBrowserContentHandler.js
---- mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js	2009-06-24 10:20:28.000000000 +0200
-+++ mozilla-1.9.1/browser/components/nsBrowserContentHandler.js	2009-06-28 14:19:54.000000000 +0200
+diff -urN mozilla.orig/browser/components/nsBrowserContentHandler.js mozilla/browser/components/nsBrowserContentHandler.js
+--- mozilla.orig/browser/components/nsBrowserContentHandler.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla/browser/components/nsBrowserContentHandler.js	2009-06-28 14:19:54.000000000 +0200
 @@ -818,7 +818,7 @@
    },
  
@@ -191,9 +191,9 @@
  
    /* nsIFactory */
    createInstance: function dch_CI(outer, iid) {
-diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js mozilla-1.9.1/browser/components/nsBrowserGlue.js
---- mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js	2009-06-24 10:20:28.000000000 +0200
-+++ mozilla-1.9.1/browser/components/nsBrowserGlue.js	2009-06-28 14:20:10.000000000 +0200
+diff -urN mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
+--- mozilla.orig/browser/components/nsBrowserGlue.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla/browser/components/nsBrowserGlue.js	2009-06-28 14:20:10.000000000 +0200
 @@ -994,7 +994,7 @@
  
  
@@ -203,9 +203,9 @@
    classID:          Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
    contractID:       "@mozilla.org/browser/browserglue;1",
  
-diff -urN mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp
---- mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-24 10:20:29.000000000 +0200
-+++ mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-28 14:25:50.000000000 +0200
+diff -urN mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla/browser/components/shell/src/nsWindowsShellService.cpp
+--- mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-28 14:25:50.000000000 +0200
 @@ -181,7 +181,7 @@
    char* valueData;
  } SETTING;
@@ -215,9 +215,9 @@
  #define DI "\\DefaultIcon"
  #define SOP "\\shell\\open\\command"
  
-diff -urN mozilla-1.9.1.orig/browser/confvars.sh mozilla-1.9.1/browser/confvars.sh
---- mozilla-1.9.1.orig/browser/confvars.sh	2009-06-24 10:20:29.000000000 +0200
-+++ mozilla-1.9.1/browser/confvars.sh	2009-06-28 14:26:12.000000000 +0200
+diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
+--- mozilla.orig/browser/confvars.sh	2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/confvars.sh	2009-06-28 14:26:12.000000000 +0200
 @@ -36,7 +36,7 @@
  #
  # ***** END LICENSE BLOCK *****
@@ -227,9 +227,9 @@
  MOZ_UPDATER=1
  MOZ_PHOENIX=1
  
-diff -urN mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties
---- mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-24 10:20:29.000000000 +0200
-+++ mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-28 14:30:14.000000000 +0200
+diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
+--- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-28 14:30:14.000000000 +0200
 @@ -35,23 +35,23 @@
  # ***** END LICENSE BLOCK *****
  
@@ -264,9 +264,9 @@
  contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
  unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
  externalProtocolTitle=External Protocol Request
-diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml
---- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml	2009-06-24 10:20:29.000000000 +0200
-+++ mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml	2009-06-28 14:30:42.000000000 +0200
+diff -urN mozilla.orig/browser/locales/en-US/searchplugins/answers.xml mozilla/browser/locales/en-US/searchplugins/answers.xml
+--- mozilla.orig/browser/locales/en-US/searchplugins/answers.xml	2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/answers.xml	2009-06-28 14:30:42.000000000 +0200
 @@ -8,6 +8,6 @@
    <Param name="gwp" value="13"/>
  </Url>
@@ -275,9 +275,9 @@
 +     template="http://www.answers.com/main/startswith?output=json&amp;client=iceweasel&amp;s={searchTerms}"/>
  <SearchForm>http://www.answers.com/</SearchForm>
  </SearchPlugin>
-diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml
---- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml	2009-06-24 10:20:29.000000000 +0200
-+++ mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml	2009-06-28 14:31:31.000000000 +0200
+diff -urN mozilla.orig/browser/locales/en-US/searchplugins/google.xml mozilla/browser/locales/en-US/searchplugins/google.xml
+--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml	2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/google.xml	2009-06-28 14:31:31.000000000 +0200
 @@ -3,7 +3,7 @@
  <Description>Google Search</Description>
  <InputEncoding>UTF-8</InputEncoding>
@@ -297,9 +297,9 @@
 -<SearchForm>http://www.google.com/firefox</SearchForm>
 +<SearchForm>http://www.google.com/</SearchForm>
  </SearchPlugin>
-diff -urN mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul
---- mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-24 10:20:52.000000000 +0200
-+++ mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-28 14:45:04.000000000 +0200
+diff -urN mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul
+--- mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-24 10:20:52.000000000 +0200
++++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-28 14:45:04.000000000 +0200
 @@ -55,7 +55,7 @@
      <menuitem id="menu_HelpPopup_reportertoolmenu" 
                label="&reporterMenu2.title;" 
@@ -309,9 +309,9 @@
                observes="reporterItemsBroadcaster"
                oncommand="loadReporterWizard()"/>
    </menupopup>
-diff -urN mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp
---- mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp	2009-06-24 10:22:27.000000000 +0200
-+++ mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp	2009-06-28 14:45:56.000000000 +0200
+diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
+--- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2009-06-24 10:22:27.000000000 +0200
++++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-06-28 14:45:56.000000000 +0200
 @@ -1231,8 +1231,7 @@
  static inline void
  DumpVersion()

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.3 packages/iceweasel/iceweasel-install.patch:1.4
--- packages/iceweasel/iceweasel-install.patch:1.3	Fri Jul 17 12:15:46 2009
+++ packages/iceweasel/iceweasel-install.patch	Thu Jan 21 14:53:45 2010
@@ -1,23 +1,20 @@
---- mozilla/toolkit/mozapps/installer/packager.mk	2006-12-23 03:38:32.302235167 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2008-03-05 22:59:55.020447000 +0000
-@@ -370,13 +370,13 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.org	2010-01-21 13:25:04.436839154 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk	2010-01-21 13:32:14.673453287 +0100
+@@ -362,11 +362,11 @@
  # 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 $(DESTDIR)/$(MOZ_PKG_APPDIR)
++	@mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR) $(DESTDIR)/$(MOZ_PKG_APPDIR)
  ifdef MOZ_PKG_MANIFEST
  	$(RM) -rf $(DIST)/xpt
- 	$(call PACKAGER_COPY, "$(DIST)",\
--		 "$(DIST)/$(MOZ_PKG_DIR)", \
-+		 "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
+ 	$(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)/components -v -x "$(XPIDL_LINK)"
-+	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
+ 	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_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
-@@ -385,11 +385,11 @@
+@@ -377,11 +377,11 @@
  ifndef STAGE_SDK
  	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
  else
@@ -28,53 +25,48 @@
  else
 -	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +	cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -421,7 +421,7 @@
- endif
- 	@echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
--	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+	cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
- endif
- ifdef MOZ_PKG_REMOVALS
- 	$(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
---- 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 @@
- 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
- 	$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
- ifdef LIBXUL_SDK
--	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
-+	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)-bin
- else
- 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
- 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
-@@ -407,7 +407,7 @@
- 	-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
- 	cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
- 	cp -RL $(DIST)/branding/document.icns $(DIST)/$(APP_NAME).app/Contents/Resources/document.icns
--	cp -RL $(LIBXUL_DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/firefox-bin.rsrc
-+	cp -RL $(LIBXUL_DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME)-bin.rsrc
- 	printf APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
- #       remove CVS dirs from packaged app
- 	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
-@@ -415,7 +415,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
- endif
- endif
- 
-@@ -433,7 +433,7 @@
- 	rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
- else
- 	$(NSINSTALL) -D $(DIST)/bin/xulrunner
--	(cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
-+	cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
- endif # cocoa
- endif # SKIP_COPY_XULRUNNER
- endif # LIBXUL_SDK
+ 	@echo "Linking XPT files..."
+ 	@rm -rf $(DIST)/xpt
+ 	@$(NSINSTALL) -D $(DIST)/xpt
+@@ -450,24 +450,33 @@
+ 	$(error "make install" is not supported on this platform. Use "make package" instead.)
+ endif
+ 	$(NSINSTALL) -D $(DESTDIR)$(installdir)
+-	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DESTDIR)$(installdir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
+ 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+-	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++	ln -s $(installdir)/$(MOZ_APP_NAME)-bin $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
++	$(RM) -f $(DESTDIR)$(bindir)/regxpcom
++	ln -s $(installdir)/regxpcom $(DESTDIR)$(bindir)/regxpcom
++	$(RM) -f $(DESTDIR)$(bindir)/xpcshell
++	ln -s $(installdir)/xpcshell $(DESTDIR)$(bindir)/xpcshell
++	$(RM) -f $(DESTDIR)$(bindir)/xpidl
++	ln -s $(installdir)/xpidl $(DESTDIR)$(bindir)/xpidl
++	$(RM) -f $(DESTDIR)$(bindir)/xpt_dump
++	ln -s $(installdir)/xpt_dump $(DESTDIR)$(bindir)/xpt_dump
++	$(RM) -f $(DESTDIR)$(bindir)/xpt_link
++	ln -s $(installdir)/xpt_link $(DESTDIR)$(bindir)/xpt_link
+ ifdef INSTALL_SDK # Here comes the hard part
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+-	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DESTDIR)$(includedir) && tar -xf -)
++	cp -rfLp $(DIST)/include/* $(DESTDIR)$(includedir)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
+-	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DESTDIR)$(idldir) && tar -xf -)
++	cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+-	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++	cp -rfLp $(DIST)/sdk/lib/*.a $(DESTDIR)$(sdkdir)/sdk/lib
++	ln -s $(installdir)/libmozjs.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozjs.so
++	ln -s $(installdir)/libxpcom.so $(DESTDIR)$(sdkdir)/sdk/lib/libxpcom.so
++	ln -s $(installdir)/libxul.so $(DESTDIR)$(sdkdir)/sdk/lib/libxul.so
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin

================================================================
Index: packages/iceweasel/iceweasel-nss_cflags.patch
diff -u packages/iceweasel/iceweasel-nss_cflags.patch:1.2 packages/iceweasel/iceweasel-nss_cflags.patch:1.3
--- packages/iceweasel/iceweasel-nss_cflags.patch:1.2	Tue Jun 30 15:41:49 2009
+++ packages/iceweasel/iceweasel-nss_cflags.patch	Thu Jan 21 14:53:45 2010
@@ -1,14 +1,3 @@
---- mozilla/config/autoconf.mk.in.orig	2008-06-19 17:55:40.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2008-06-19 18:45:18.000000000 +0200
-@@ -280,7 +280,7 @@
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
- 
--OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
-+OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
- OS_LIBS		= @LIBS@
- ACDEFINES	= @MOZ_DEFINES@
- 
 --- mozilla/config/rules.mk.orig	2008-06-19 18:45:00.000000000 +0200
 +++ mozilla/config/rules.mk	2008-06-19 18:42:40.000000000 +0200
 @@ -1365,23 +1365,23 @@

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.84 packages/iceweasel/iceweasel.spec:1.85
--- packages/iceweasel/iceweasel.spec:1.84	Thu Jan 21 14:44:53 2010
+++ packages/iceweasel/iceweasel.spec	Thu Jan 21 14:53:45 2010
@@ -52,9 +52,8 @@
 Patch6:		%{name}-nss_cflags.patch
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
-Patch9:		%{name}-gcc44.patch
-Patch10:	%{name}-no-subshell.patch
-Patch11:	%{name}-ppc.patch
+Patch9:		%{name}-no-subshell.patch
+Patch10:	%{name}-ppc.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -170,9 +169,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p2
-%patch11 -p1
+%patch9 -p2
+%patch10 -p1
 
 %build
 cd mozilla
@@ -527,6 +525,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2010/01/21 13:53:45  arekm
+- update patches; branding patch still needs update
+
 Revision 1.84  2010/01/21 13:44:53  arekm
 - fetch tarball
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-nss_cflags.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.84&r2=1.85&f=u

More information about the pld-cvs-commit mailing list