[packages/iceweasel] Updated to 15.0
baggins
baggins at pld-linux.org
Wed Aug 29 18:28:29 CEST 2012
commit 09927094ff1784d4201c79cb088849621c75762f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Aug 29 18:28:18 2012 +0200
Updated to 15.0
iceweasel-branding.patch | 5 ++++-
iceweasel-install.patch | 27 +++++++++++++++------------
iceweasel-packaging.patch | 11 +++++++----
iceweasel-prefs.patch | 6 +++---
iceweasel.spec | 10 +++++-----
system-cairo.patch | 20 +++++---------------
6 files changed, 39 insertions(+), 40 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 96bd6bb..d5ade20 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -14,8 +14,8 @@
%endif
# convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define xulrunner_main 14.0
-%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#14.0})
+%define xulrunner_main 15.0
+%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#15.0})
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -26,12 +26,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: 14.0.1
-Release: 4
+Version: 15.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: c2f884f0f6c41c65cf20f678a1ee7191
+# Source0-md5: 64220887a349515f16e5aa990acb4db3
Source1: %{name}-branding.tar.bz2
# Source1-md5: 816d926bd2c76a5bba5108979ba776ac
Source2: %{name}-rm_nonfree.sh
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index 4cc4419..e8b73f8 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -124,7 +124,10 @@ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en
index 1ccd459..b87c867 100644
--- a/browser/locales/en-US/searchplugins/google.xml
+++ b/browser/locales/en-US/searchplugins/google.xml
-@@ -1,4 +1,6 @@
+@@ -1,7 +1,9 @@
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+#filter substitution
#define GOOGLE_PARAMS <Param name="q" value="{searchTerms}"/><Param name="ie" value="utf-8"/><Param name="oe" value="utf-8"/><Param name="aq" value="t"/><Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
+#if MOZ_APP_NAME==firefox
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index 725dac2..ba04a82 100644
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -29,32 +29,35 @@
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
-@@ -708,35 +708,35 @@
+@@ -708,37 +708,37 @@
endif
stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
-- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
-+ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(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)
++ @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..."
-- @mkdir $(DIST)/$(MOZ_PKG_DIR)
-+ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+- 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)
- ifeq (DMG, $(MOZ_PKG_FORMAT))
- ifeq (dmg, $(filter dmg, $(MOZ_INTERNAL_SIGNING_FORMAT)))
-- @cd $(DIST)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
-+ @cd $(DESTDIR)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
- endif
- endif
- $(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 \
@@ -72,7 +75,7 @@
- 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_PKG_FORMAT),DMG)
+ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
ifndef STAGE_SDK
@@ -741,10 +741,10 @@
@$(NSINSTALL) -D $(DIST)/xpt
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 1ef1b97..353b0df 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -176,8 +176,8 @@
+#ifndef LIBXUL_SDK
@BINPATH@/components/ConsoleAPI.manifest
@BINPATH@/components/ConsoleAPI.js
- @BINPATH@/components/BrowserElementAPI.manifest
- @BINPATH@/components/BrowserElementAPI.js
+ @BINPATH@/components/BrowserElementParent.manifest
+ @BINPATH@/components/BrowserElementParent.js
@BINPATH@/components/FeedProcessor.manifest
@BINPATH@/components/FeedProcessor.js
+#endif
@@ -263,14 +263,16 @@
#ifdef MOZ_ENABLE_DBUS
@BINPATH@/components/@DLL_PREFIX at dbusservice@DLL_SUFFIX@
#endif
-@@ -427,10 +479,12 @@
+@@ -427,12 +479,14 @@
@BINPATH@/components/nsINIProcessor.js
@BINPATH@/components/nsPrompter.manifest
@BINPATH@/components/nsPrompter.js
+#endif
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/components/SyncComponents.manifest
+ @BINPATH@/components/AitcComponents.manifest
@BINPATH@/components/Weave.js
+ @BINPATH@/components/Aitc.js
#endif
+#ifndef LIBXUL_SDK
@BINPATH@/components/TelemetryPing.js
@@ -317,7 +319,7 @@
#ifdef MOZ_GTK2
@BINPATH@/chrome/icons/default/default16.png
@BINPATH@/chrome/icons/default/default32.png
-@@ -496,13 +557,17 @@
+@@ -496,14 +557,18 @@
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/firefox.js
@@ -326,6 +328,7 @@
+#endif
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/@PREF_DIR@/services-sync.js
+ @BINPATH@/@PREF_DIR@/services-aitc.js
#endif
+#ifndef LIBXUL_SDK
@BINPATH@/greprefs.js
diff --git a/iceweasel-prefs.patch b/iceweasel-prefs.patch
index 1471ea2..f802d12 100644
--- a/iceweasel-prefs.patch
+++ b/iceweasel-prefs.patch
@@ -2,9 +2,9 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile
--- mozilla.orig/browser/app/profile/firefox.js 2008-06-21 12:55:30.000000000 +0200
+++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000 +0200
@@ -94,7 +94,7 @@ pref("extensions.hotfix.certs.1.sha1Fingerprint", "F1:DB:F9:6A:7B:B8:04:FA:48:3C
- // Disable add-ons installed into the shared user and shared system areas by
- // default. This does not include the application directory. See the SCOPE
- // constants in AddonManager.jsm for values to use here
+
+ // Disable add-ons that are not installed by the user in all scopes by default.
+ // See the SCOPE constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 3);
diff --git a/system-cairo.patch b/system-cairo.patch
index 9ae0888..d395822 100644
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -25,21 +25,16 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
{
void *userData = aSurface->GetData(&kSourceSurface);
-@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
- NS_RUNTIMEABORT("Invalid surface format!");
- }
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
- srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
- IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
- imgSurface->Stride(),
- format);
+ }
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
+- &kSourceSurface,
+- imgSurface,
+- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
@@ -47,8 +42,3 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
}
srcBuffer->AddRef();
- aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
-
- return srcBuffer;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/09927094ff1784d4201c79cb088849621c75762f
More information about the pld-cvs-commit
mailing list