packages: mozilla-firefox/mozilla-firefox-branding.patch, mozilla-firefox/m...

qboosh qboosh at pld-linux.org
Sat Mar 24 19:47:45 CET 2012 

Author: qboosh                       Date: Sat Mar 24 18:47:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 11.0

---- Files affected:
packages/mozilla-firefox:
   mozilla-firefox-branding.patch (1.5 -> 1.6) , mozilla-firefox-install.patch (1.6 -> 1.7) , mozilla-firefox.spec (1.278 -> 1.279) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-branding.patch
diff -u packages/mozilla-firefox/mozilla-firefox-branding.patch:1.5 packages/mozilla-firefox/mozilla-firefox-branding.patch:1.6
--- packages/mozilla-firefox/mozilla-firefox-branding.patch:1.5	Mon Oct 17 18:29:05 2011
+++ packages/mozilla-firefox/mozilla-firefox-branding.patch	Sat Mar 24 19:47:39 2012
@@ -1,16 +1,16 @@
---- mozilla.orig/browser/app/application.ini	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/app/application.ini	2010-02-04 15:48:46.000000000 +0100
-@@ -37,8 +37,8 @@
- 
+--- mozilla/build/application.ini.in.orig	2012-03-13 02:36:39.000000000 +0100
++++ mozilla/build/application.ini.in	2012-03-24 19:29:15.284836726 +0100
+@@ -43,8 +43,8 @@
+ #endif
  #filter substitution
  [App]
 -Vendor=@MOZ_APP_VENDOR@
 -Name=@MOZ_APP_BASENAME@
 +Vendor=
 +Name=Firefox Community Edition
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
+ Version=@MOZ_APP_VERSION@
+ #ifdef MOZ_APP_PROFILE
+ Profile=@MOZ_APP_PROFILE@
 --- mozilla.orig/browser/locales/generic/profile/bookmarks.html.in	2009-06-24 10:20:29.000000000 +0200
 +++ mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-28 15:29:30.000000000 +0200
 @@ -24,4 +24,12 @@

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-install.patch
diff -u packages/mozilla-firefox/mozilla-firefox-install.patch:1.6 packages/mozilla-firefox/mozilla-firefox-install.patch:1.7
--- packages/mozilla-firefox/mozilla-firefox-install.patch:1.6	Wed Mar 14 20:06:28 2012
+++ packages/mozilla-firefox/mozilla-firefox-install.patch	Sat Mar 24 19:47:39 2012
@@ -29,7 +29,7 @@
  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 @@
+@@ -708,30 +708,30 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -49,8 +49,8 @@
 -	  "$(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)"
+-	$(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 \
@@ -68,7 +68,7 @@
  else # !MOZ_PKG_MANIFEST
  ifeq ($(MOZ_PKG_FORMAT),DMG)
  ifndef STAGE_SDK
-@@ -529,10 +529,10 @@
+@@ -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
@@ -81,7 +81,7 @@
  	@echo "Linking XPT files..."
  	@rm -rf $(DIST)/xpt
  	@$(NSINSTALL) -D $(DIST)/xpt
-@@ -620,7 +620,7 @@
+@@ -830,7 +830,7 @@
  	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)

================================================================
Index: packages/mozilla-firefox/mozilla-firefox.spec
diff -u packages/mozilla-firefox/mozilla-firefox.spec:1.278 packages/mozilla-firefox/mozilla-firefox.spec:1.279
--- packages/mozilla-firefox/mozilla-firefox.spec:1.278	Wed Mar 14 20:06:28 2012
+++ packages/mozilla-firefox/mozilla-firefox.spec	Sat Mar 24 19:47:40 2012
@@ -25,12 +25,12 @@
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	10.0.2
+Version:	11.0
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	5ce038d591964f72c534fa33b75a62f5
+# Source0-md5:	4b07acf47857aff72776d805409cdd1b
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-install.patch
@@ -57,6 +57,8 @@
 BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libdnet-devel
 BuildRequires:	libevent-devel >= 1.4.7
+# standalone libffi 3.0.9 or gcc's from 4.5(?)+
+BuildRequires:	libffi-devel >= 6:3.0.9
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libiw-devel
 BuildRequires:	libjpeg-devel >= 6b
@@ -65,8 +67,8 @@
 BuildRequires:	libpng-devel >= 1.4.1
 BuildRequires:	libstdc++-devel
 BuildRequires:	libvpx-devel >= 1.0.0
-BuildRequires:	nspr-devel >= 1:4.8.9
-BuildRequires:	nss-devel >= 1:3.13.1
+BuildRequires:	nspr-devel >= 1:4.9
+BuildRequires:	nss-devel >= 1:3.13.3
 BuildRequires:	pango-devel >= 1:1.14.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
@@ -107,6 +109,7 @@
 Obsoletes:	mozilla-firebird
 Obsoletes:	mozilla-firefox-lang-en < 2.0.0.8-3
 Obsoletes:	mozilla-firefox-libs
+Conflicts:	mozilla-firefox-lang-resources < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # don't satisfy other packages (don't use %{name} here)
@@ -187,6 +190,7 @@
 ac_add_options --sharedstatedir=%{_sharedstatedir}
 ac_add_options --mandir=%{_mandir}
 ac_add_options --infodir=%{_infodir}
+ac_add_options --disable-elf-hack
 %if %{?debug:1}0
 ac_add_options --disable-optimize
 ac_add_options --enable-debug
@@ -384,6 +388,7 @@
 
 %dir %{_libdir}/%{name}/components
 
+%{_libdir}/%{name}/components/ChromeProfileMigrator.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
 %{_libdir}/%{name}/components/PlacesProtocolHandler.js
@@ -502,8 +507,6 @@
 %endif
 
 %dir %{_datadir}/%{name}/extensions
-# -dom-inspector subpackage?
-#%{_datadir}/%{name}/extensions/inspector at mozilla.org
 # the signature of the default theme
 %{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 
@@ -517,6 +520,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.279  2012/03/24 18:47:40  qboosh
+- updated to 11.0
+
 Revision 1.278  2012/03/14 19:06:28  qboosh
 - updated to 10.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mozilla-firefox/mozilla-firefox-branding.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/mozilla-firefox/mozilla-firefox-install.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/mozilla-firefox/mozilla-firefox.spec?r1=1.278&r2=1.279

More information about the pld-cvs-commit mailing list