[packages/iceweasel] - up to 26.0

[arekm]

commit da892b7e9dd64dde79e869d3a1e41b30857948c1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Dec 10 14:40:17 2013 +0100

    - up to 26.0

 941837.patch              | 20 --------------------
 iceweasel-packaging.patch | 27 ++++++++++++++-------------
 iceweasel.spec            | 10 +++++-----
 3 files changed, 19 insertions(+), 38 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index c55dcd2..0d9819c 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -17,19 +17,19 @@
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
 %endif
 
-%define		nspr_ver	4.9.6
+%define		nspr_ver	4.10.2
 %define		nss_ver		3.15
 
 Summary:	Iceweasel web browser
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	25.0.1
+Version:	26.0
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	b5b57d3ea937a339e0ed7ebea604b430
+# Source0-md5:	91ce51cc6474f1269484e5327643a59c
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	513af080c920d916362b607a872adf00
 Source2:	%{name}-rm_nonfree.sh
@@ -38,7 +38,7 @@ Source4:	%{name}.sh
 Source5:	vendor.js
 Source6:	vendor-ac.js
 Patch0:		%{name}-branding.patch
-Patch1:		941837.patch
+
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
@@ -159,7 +159,7 @@ cd mozilla
 /bin/sh %{SOURCE2}
 
 %patch0 -p1
-%patch1 -p1
+
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
diff --git a/941837.patch b/941837.patch
deleted file mode 100644
index 8e85cf6..0000000
--- a/941837.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/js/src/gc/Memory.cpp.orig	2013-11-13 01:13:53.000000000 +0100
-+++ a/js/src/gc/Memory.cpp	2013-11-28 05:03:31.160133711 +0100
-@@ -63,7 +63,7 @@
-         p = VirtualAlloc(NULL, size * 2, MEM_RESERVE, PAGE_READWRITE);
-         if (!p)
-             return NULL;
--        void *chunkStart = (void *)(uintptr_t(p) + (alignment - (uintptr_t(p) % alignment)));
-+        void *chunkStart = (void *)AlignBytes(uintptr_t(p), alignment);
-         UnmapPages(rt, p, size * 2);
-         p = VirtualAlloc(chunkStart, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- 
-@@ -335,7 +335,7 @@
-     uintptr_t offset = uintptr_t(region) % alignment;
-     JS_ASSERT(offset < reqSize - size);
- 
--    void *front = (void *)(uintptr_t(region) + (alignment - offset));
-+    void *front = (void *)AlignBytes(uintptr_t(region), alignment);
-     void *end = (void *)(uintptr_t(front) + size);
-     if (front != region)
-         JS_ALWAYS_TRUE(0 == munmap(region, alignment - offset));
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 6426cf6..136810a 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -113,9 +113,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/dom_base.xpt
  @BINPATH@/components/dom_system.xpt
 +#endif
- #ifdef MOZ_B2G_RIL
- @BINPATH@/components/dom_telephony.xpt
- @BINPATH@/components/dom_voicemail.xpt
+ #ifdef MOZ_B2G_BT
+ @BINPATH@/components/dom_bluetooth.xpt
+ #endif
 @@ -212,6 +212,7 @@
  #ifdef MOZ_B2G_BT
  @BINPATH@/components/dom_bluetooth.xpt
@@ -253,9 +253,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/contentAreaDropListener.manifest
  @BINPATH@/components/contentAreaDropListener.js
 +#endif
- #ifdef MOZ_B2G_RIL
- @BINPATH@/components/RadioInterfaceLayer.manifest
- @BINPATH@/components/RadioInterfaceLayer.js
+ @BINPATH@/browser/components/BrowserProfileMigrators.manifest
+ @BINPATH@/browser/components/ProfileMigrator.js
+ @BINPATH@/browser/components/ChromeProfileMigrator.js
 @@ -462,17 +514,24 @@
  @BINPATH@/browser/components/SafariProfileMigrator.js
  #endif
@@ -294,7 +294,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/servicesComponents.manifest
  @BINPATH@/components/cryptoComponents.manifest
  @BINPATH@/components/TelemetryPing.js
-@@ -532,28 +593,37 @@
+@@ -581,7 +581,9 @@
  @BINPATH@/components/PeerConnection.js
  @BINPATH@/components/PeerConnection.manifest
  #endif
@@ -304,14 +304,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/chrome/marionette at JAREXT@
  @BINPATH@/chrome/marionette.manifest
  @BINPATH@/components/MarionetteComponents.manifest
- @BINPATH@/components/marionettecomponent.js
+@@ -594,6 +596,7 @@
+ ; InputMethod API
+ @BINPATH@/components/MozKeyboard.js
+ @BINPATH@/components/InputMethod.manifest
 +#endif
  
- #ifdef MOZ_WEBSPEECH
-+#ifndef LIBXUL_SDK
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
-+#endif
+ ; Modules
+ @BINPATH@/browser/modules/*
+@@ -597,16 +600,20 @@
  
  ; Modules
  @BINPATH@/browser/modules/*
================================================================

---- gitweb:

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