[packages/iceweasel] - drop install patch, it only causes problems on each and every update - install this the easy way t

baggins baggins at pld-linux.org
Thu Apr 18 17:12:27 CEST 2013 

commit 3e529974dcb77f2761f25b371ad3b82ada50ff48
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Apr 18 17:11:39 2013 +0200

    - drop install patch, it only causes problems on each and every update
    - install this the easy way that is bound to work always

 iceweasel-install.patch   | 78 -----------------------------------------------
 iceweasel-packaging.patch | 13 +-------
 iceweasel.spec            | 25 ++++++++-------
 3 files changed, 13 insertions(+), 103 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 71c3098..942a90d 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -43,7 +43,6 @@ Source4:	%{name}.sh
 Source5:	vendor.js
 Source6:	vendor-ac.js
 Patch0:		%{name}-branding.patch
-Patch1:		%{name}-install.patch
 Patch2:		%{name}-gcc3.patch
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
@@ -163,7 +162,6 @@ cd mozilla
 /bin/sh %{SOURCE2}
 
 %patch0 -p1
-%patch1 -p1
 
 %if "%{cc_version}" < "3.4"
 %patch2 -p2
@@ -289,18 +287,21 @@ cd mozilla
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
 	$RPM_BUILD_ROOT%{_desktopdir} \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}
+	$RPM_BUILD_ROOT%{_datadir}/%{name} \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
-%{__make} -C obj-%{_target_cpu}/browser/installer stage-package \
+cd obj-%{_target_cpu}
+%{__make} -C browser/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
-	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
-	MOZ_PKG_DIR=%{_libdir}/%{name} \
+	installdir=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
 
-install -d \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+%{__make} -C iceweasel/branding install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+cp -a dist/iceweasel/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
 %if %{with xulrunner}
 # >= 5.0 seems to require this
@@ -343,10 +344,10 @@ ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/firefox
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 
 # install icons and desktop file
-cp obj-%{_target_cpu}/iceweasel/branding/{mozicon,default}128.png
+cp iceweasel/branding/{mozicon,default}128.png
 for i in 16 32 48 64 128; do
 	install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps
-	cp -a obj-%{_target_cpu}/iceweasel/branding/default${i}.png \
+	cp -a iceweasel/branding/default${i}.png \
 		$RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/iceweasel.png
 done
 
@@ -440,7 +441,6 @@ fi
 
 %dir %{_libdir}/%{name}/components
 
-%{_libdir}/%{name}/components/Aitc.js
 %{_libdir}/%{name}/components/ChromeProfileMigrator.js
 %{_libdir}/%{name}/components/DownloadsStartup.js
 %{_libdir}/%{name}/components/DownloadsUI.js
@@ -450,13 +450,12 @@ fi
 %{_libdir}/%{name}/components/PageThumbsProtocol.js
 %{_libdir}/%{name}/components/PlacesProtocolHandler.js
 %{_libdir}/%{name}/components/ProfileMigrator.js
-%{_libdir}/%{name}/components/Weave.js
 %{_libdir}/%{name}/components/WebContentConverter.js
 %{_libdir}/%{name}/components/browser.xpt
 %{_libdir}/%{name}/components/fuelApplication.js
 %{_libdir}/%{name}/components/nsBrowserContentHandler.js
 %{_libdir}/%{name}/components/nsBrowserGlue.js
-%{_libdir}/%{name}/components/nsPrivateBrowsingService.js
+%{_libdir}/%{name}/components/nsPrivateBrowsingServiceObsolete.js
 %{_libdir}/%{name}/components/nsSessionStartup.js
 %{_libdir}/%{name}/components/nsSessionStore.js
 %{_libdir}/%{name}/components/nsSetDefaultBrowser.js
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
deleted file mode 100644
index a98f739..0000000
--- a/iceweasel-install.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- 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
-@@ -708,41 +708,41 @@
- endif
- 
- stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
--	@rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
-+	@rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
- ifndef MOZ_FAST_PACKAGE
--	@rm -rf $(DIST)/$(MOZ_PKG_DIR)
-+	@rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
- endif
- # 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..."
--	if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \
--		mkdir $(DIST)/$(MOZ_PKG_DIR); \
-+	if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \
-+		mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR); \
- 	fi
- ifndef UNIVERSAL_BINARY
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
- # STAGEPATH
- ifdef MOZ_PKG_MANIFEST
- ifndef MOZ_FAST_PACKAGE
- 	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
- endif
- 	$(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)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
-+	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/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))
- ifdef MOZ_WEBAPP_RUNTIME
--	mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
--	sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
-+	mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
-+	sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
- endif
--	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_WIDGET_TOOLKIT),cocoa)
- ifndef STAGE_SDK
-@@ -741,10 +741,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
-@@ -830,7 +830,7 @@
- 	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
- endif
- 	$(NSINSTALL) -D $(DESTDIR)$(installdir)
--	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
-+	(cd $(DESTDIR)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
- 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
- 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 048b7b4..d6ef4e9 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -81,14 +81,13 @@
  @BINPATH@/components/alerts.xpt
  #ifdef ACCESSIBILITY
  #ifdef XP_WIN32
-@@ -144,8 +161,11 @@
+@@ -144,8 +161,10 @@
  @BINPATH@/components/appstartup.xpt
  @BINPATH@/components/autocomplete.xpt
  @BINPATH@/components/autoconfig.xpt
 +#endif
  @BINPATH@/components/browsercompsbase.xpt
  @BINPATH@/components/browser-feeds.xpt
-+ at BINPATH@/components/browser.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/caps.xpt
  @BINPATH@/components/chrome.xpt
@@ -359,13 +358,3 @@
  
  ; for Solaris SPARC
  #ifdef SOLARIS
---- iceweasel-20.0.1/mozilla/browser/installer/removed-files.in~	2013-04-10 05:01:20.000000000 +0200
-+++ iceweasel-20.0.1/mozilla/browser/installer/removed-files.in	2013-04-18 12:30:31.839633055 +0200
-@@ -884,7 +884,6 @@
-   components/addonManager.js
-   components/amContentHandler.js
-   components/amWebInstallListener.js
--  components/browser.xpt
-   components/BrowserElementParent.js
-   components/BrowserElementParent.manifest
-   components/BrowserElementPromptService.jsm
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/3e529974dcb77f2761f25b371ad3b82ada50ff48

More information about the pld-cvs-commit mailing list