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

adwol adwol at pld-linux.org
Thu Mar 22 22:14:14 CET 2012 

Author: adwol                        Date: Thu Mar 22 21:14:14 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 11.0

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.21 -> 1.22) , iceweasel-install.patch (1.11 -> 1.12) , iceweasel.spec (1.174 -> 1.175) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.21 packages/iceweasel/iceweasel-branding.patch:1.22
--- packages/iceweasel/iceweasel-branding.patch:1.21	Fri Feb  3 11:20:31 2012
+++ packages/iceweasel/iceweasel-branding.patch	Thu Mar 22 22:14:09 2012
@@ -1,17 +1,17 @@
-diff -urN mozilla.orig/browser/app/application.ini mozilla/browser/app/application.ini
---- 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 @@
- 
+diff -urN mozilla.orig/build/application.ini.in mozilla/build/application.ini.in
+--- mozilla.orig/build/application.ini.in	2010-02-04 15:47:13.000000000 +0100
++++ mozilla/build/application.ini.in	2010-02-04 15:48:46.000000000 +0100
+@@ -43,8 +43,8 @@
+ #endif
  #filter substitution
  [App]
 -Vendor=@MOZ_APP_VENDOR@
 -Name=@MOZ_APP_BASENAME@
 +Vendor=
 +Name=Iceweasel
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
+ Version=@MOZ_APP_VERSION@
+ #ifdef MOZ_APP_PROFILE
+ Profile=@MOZ_APP_PROFILE@
 diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
 --- mozilla.orig/browser/app/profile/firefox.js	2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/app/profile/firefox.js	2010-02-04 15:50:15.000000000 +0100

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.11 packages/iceweasel/iceweasel-install.patch:1.12
--- packages/iceweasel/iceweasel-install.patch:1.11	Fri Feb  3 11:20:31 2012
+++ packages/iceweasel/iceweasel-install.patch	Thu Mar 22 22:14:09 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/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.174 packages/iceweasel/iceweasel.spec:1.175
--- packages/iceweasel/iceweasel.spec:1.174	Sat Mar 17 10:05:43 2012
+++ packages/iceweasel/iceweasel.spec	Thu Mar 22 22:14:09 2012
@@ -16,8 +16,8 @@
 %endif
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define		xulrunner_main	10.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#10.0})
+%define		xulrunner_main	11.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#11.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,12 +28,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-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:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	5ce038d591964f72c534fa33b75a62f5
+# Source0-md5:	4b07acf47857aff72776d805409cdd1b
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:	%{name}-rm_nonfree.sh
@@ -74,8 +74,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
@@ -203,6 +203,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
@@ -545,6 +546,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175  2012/03/22 21:14:09  adwol
+- up to 11.0
+
 Revision 1.174  2012/03/17 09:05:43  qboosh
 - no more libjemalloc as separate library
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel-branding.patch?r1=1.21&r2=1.22
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel-install.patch?r1=1.11&r2=1.12
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel.spec?r1=1.174&r2=1.175

More information about the pld-cvs-commit mailing list