- started update to 42.0

diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 1c3d70f66c01a9b71dea238a18821cfc35d7768f..23a62cfa74917450dc910fee45f1468520fa5590 100644 (file)
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -116,7 +116,7 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel
  @RESPATH@/components/mimetype.xpt
  @RESPATH@/components/mozfind.xpt
  @RESPATH@/components/necko_about.xpt
-@@ -313,12 +336,16 @@
+@@ -313,10 +336,14 @@
  @RESPATH@/components/rdf.xpt
  @RESPATH@/components/satchel.xpt
  @RESPATH@/components/saxparser.xpt
@@ -124,10 +124,8 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel
  @RESPATH@/browser/components/sessionstore.xpt
 +#ifndef LIBXUL_SDK
  @RESPATH@/components/services-crypto-component.xpt
- #ifdef MOZ_CAPTIVEDETECT
- @RESPATH@/components/captivedetect.xpt
- #endif
 +#endif
+ @RESPATH@/components/captivedetect.xpt
  @RESPATH@/browser/components/shellservice.xpt
 +#ifndef LIBXUL_SDK
  @RESPATH@/components/shistory.xpt

diff --git a/iceweasel.spec b/iceweasel.spec
index f0ba29a4e49ea67734598d22da1956d131a9c8b3..b3a773a47e00631c1a255b704e939972b67d857b 100644 (file)
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -22,12 +22,12 @@ Summary:    Iceweasel web browser
 Summary(hu.UTF-8):     Iceweasel web böngésző
 Summary(pl.UTF-8):     Iceweasel - przeglądarka WWW
 Name:          iceweasel
-Version:       41.0.2
-Release:       2
+Version:       42.0
+Release:       0.1
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5: d71f0f761c51aeae03e367001afc9f8d
+# Source0-md5: d610bf10a75afb4734045e1a43d8eba4
 Source1:       %{name}-branding.tar.xz
 # Source1-md5: 1ac95e1164acae1954f118cddd197aad
 Source2:       %{name}-rm_nonfree.sh
@@ -197,10 +197,8 @@ Iceweasel development package.
 Pakiet programistyczny Iceweasela.
 
 %prep
-%setup -qc
-mv -f mozilla-release mozilla
-%setup -q -T -D -a1
-cd mozilla
+%setup -q -a1 -n firefox-%{version}
+mv mozilla/iceweasel ./
 /bin/sh %{SOURCE2}
 
 # avoid using included headers (-I. is before HUNSPELL_CFLAGS)
@@ -231,7 +229,6 @@ sed -i -e 's@__BROWSER_PATH__@"../../dist/bin/iceweasel-bin"@' build/automation.
 %endif
 
 %build
-cd mozilla
 cp -p %{_datadir}/automake/config.* build/autoconf
 
 cat << 'EOF' > .mozconfig
@@ -352,7 +349,6 @@ kill $XVFB_PID
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd mozilla
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
        $RPM_BUILD_ROOT%{_desktopdir} \

diff --git a/idl-parser.patch b/idl-parser.patch
index 8f4c686bc4fb8f4da11854e630ae6ae9925dcac6..b5aa30df19761a9658d78566b73d8126bbd92e86 100644 (file)
--- a/idl-parser.patch
+++ b/idl-parser.patch
@@ -1,5 +1,5 @@
---- xulrunner-10.0/mozilla/xpcom/idl-parser/header.py.wiget    2012-02-09 16:26:27.074098583 +0100
-+++ xulrunner-10.0/mozilla/xpcom/idl-parser/header.py  2012-02-09 16:28:01.250436455 +0100
+--- xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/header.py.wiget      2012-02-09 16:26:27.074098583 +0100
++++ xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/header.py    2012-02-09 16:28:01.250436455 +0100
 @@ -477,7 +477,7 @@ if __name__ == '__main__':
      o = OptionParser()
      o.add_option('-I', action='append', dest='incdirs', default=['.'],
@@ -27,8 +27,8 @@
              print >>sys.stderr, "--regen useless without --cachedir"
          sys.exit(0)
  
---- xulrunner-10.0/mozilla/xpcom/idl-parser/typelib.py.wiget   2012-02-09 16:31:01.826758036 +0100
-+++ xulrunner-10.0/mozilla/xpcom/idl-parser/typelib.py 2012-02-09 16:32:26.473475659 +0100
+--- xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/typelib.py.wiget     2012-02-09 16:31:01.826758036 +0100
++++ xulrunner-10.0/mozilla/xpcom/idl-parser/xpidl/typelib.py   2012-02-09 16:32:26.473475659 +0100
 @@ -276,7 +276,7 @@ if __name__ == '__main__':
      o = OptionParser()
      o.add_option('-I', action='append', dest='incdirs', default=['.'],

diff --git a/xulrunner-new-libxul.patch b/xulrunner-new-libxul.patch
index a25180ff49b55835529f73ce175f9bd640c0c48d..f4a527cc2a884e6a60727001a7e697839d0dd7b7 100644 (file)
--- a/xulrunner-new-libxul.patch
+++ b/xulrunner-new-libxul.patch
@@ -2,11 +2,11 @@ diff -ruNp mozilla.orig/toolkit/mozapps/installer/packager.py mozilla/toolkit/mo
 --- mozilla.orig/toolkit/mozapps/installer/packager.py 2015-04-03 04:30:06.000000000 +0200
 +++ mozilla/toolkit/mozapps/installer/packager.py      2015-04-10 14:52:45.133163567 +0200
 @@ -152,7 +152,7 @@ def precompile_cache(formatter, source_p
-                             '-e', 'precompile_startupcache("resource://%s/");'
-                                   % resource],
-                            extra_linker_path=gre_path,
--                           extra_env={'MOZ_STARTUP_CACHE': cache}):
-+                           extra_env={'MOZ_STARTUP_CACHE': cache, 'LD_PRELOAD': os.path.join(gre_path, 'libxul.so')}):
-             errors.fatal('Error while running startup cache precompilation')
-             return
-         from mozpack.mozjar import JarReader
+     os.remove(cache)
+ 
+     try:
+-        extra_env = {'MOZ_STARTUP_CACHE': cache}
++        extra_env = {'MOZ_STARTUP_CACHE': cache, 'LD_PRELOAD': os.path.join(gre_path, 'libxul.so')}
+         if buildconfig.substs.get('MOZ_TSAN'):
+             extra_env['TSAN_OPTIONS'] = 'report_bugs=0'
+         if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,