--- a/MozillaFirefox/MozillaFirefox.spec Mon Jan 03 17:57:59 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Jan 09 10:04:57 2011 +0100
@@ -1,8 +1,8 @@
#
-# spec file for package MozillaFirefox (Version 4.0b)
+# spec file for package MozillaFirefox (Version 4.0b8)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# 2006-2010 Wolfgang Rosenauer
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 2006-2011 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,14 +29,14 @@
BuildRequires: wireless-tools
%endif
%if 0%{?use_xulrunner}
-BuildRequires: %{xulrunner}-devel = 2.0b
+BuildRequires: %{xulrunner}-devel = 2.0b8
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 4.0b
+Version: 4.0b8
Provides: web_browser
Provides: firefox = %{version}
Release: 1
-%define releasedate 2010121400
+%define releasedate 2011010500
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -52,7 +52,6 @@
Source9: firefox-lockdown.js
Source10: compare-locales.tar.bz2
Source11: firefox.1
-Patch0: mozilla-firefox-sync.patch
Patch1: toolkit-download-folder.patch
Patch2: firefox-linkorder.patch
Patch3: firefox-browser-css.patch
@@ -152,7 +151,6 @@
%prep
%setup -q -n mozilla -b 7 -b 10
cd $RPM_BUILD_DIR/mozilla
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
--- a/MozillaFirefox/mozilla-firefox-sync.patch Mon Jan 03 17:57:59 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-firefox-sync.patch
\ No newline at end of file
--- a/mozilla-firefox-sync.patch Mon Jan 03 17:57:59 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,323 +0,0 @@
-# HG changeset patch
-# User Mike Hommey
-# Parent 202570dfd2a5defb5ae390030ee81b46cb60c3fd
-Bug 618195 - Build services-crypto (or just nsSyncJPAKE) unconditionally as part of tier_platform
-(mozilla + firefox part)
-
-diff --git a/browser/build.mk b/browser/build.mk
---- a/browser/build.mk
-+++ b/browser/build.mk
-@@ -45,17 +45,17 @@ ifdef MOZ_EXTENSIONS
- tier_app_dirs += extensions
- endif
-
- tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
-
- tier_app_dirs += toolkit/components/console/hudservice
-
- ifdef MOZ_SERVICES_SYNC
--tier_app_dirs += services/sync
-+tier_app_dirs += services
- endif
-
- tier_app_dirs += browser
- # Never add other tier_app_dirs after browser. They won't get packaged
- # properly on mac.
-
- installer:
- @$(MAKE) -C browser/installer installer
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -225,16 +225,17 @@
- @BINPATH@/components/proxyObject.xpt
- @BINPATH@/components/rdf.xpt
- @BINPATH@/components/satchel.xpt
- @BINPATH@/components/saxparser.xpt
- @BINPATH@/components/sessionstore.xpt
- #ifdef MOZ_SERVICES_SYNC
- @BINPATH@/components/services-crypto.xpt
- #endif
-+@BINPATH@/components/services-crypto-component.xpt
- @BINPATH@/components/shellservice.xpt
- @BINPATH@/components/shistory.xpt
- @BINPATH@/components/spellchecker.xpt
- @BINPATH@/components/storage.xpt
- @BINPATH@/components/toolkitprofile.xpt
- #ifdef MOZ_ENABLE_XREMOTE
- @BINPATH@/components/toolkitremote.xpt
- #endif
-diff --git a/services/crypto/Makefile.in b/services/crypto/Makefile.in
---- a/services/crypto/Makefile.in
-+++ b/services/crypto/Makefile.in
-@@ -43,37 +43,18 @@ VPATH = @srcdir@
-
- include $(DEPTH)/config/autoconf.mk
-
- MODULE = services-crypto
- XPIDL_MODULE = services-crypto
-
- XPIDLSRCS = \
- IWeaveCrypto.idl \
-- nsISyncJPAKE.idl \
-- $(NULL)
--
--LIBRARY_NAME = services-crypto
--EXPORT_LIBRARY = 1
--IS_COMPONENT = 1
--MODULE_NAME = nsServicesCryptoModule
--LIBXUL_LIBRARY = 1
--FORCE_USE_PIC = 1
--MOZILLA_INTERNAL_API = 1
--
--CPPSRCS = \
-- nsSyncJPAKE.cpp \
- $(NULL)
-
- libs::
- $(PYTHON) $(topsrcdir)/config/nsinstall.py $(srcdir)/modules/* $(FINAL_TARGET)/modules/services-crypto
-
- ifdef ENABLE_TESTS
- DIRS += tests
- endif
-
- include $(topsrcdir)/config/rules.mk
--
--EXTRA_DSO_LDOPTS += \
-- $(MOZ_COMPONENT_LIBS) \
-- $(NSPR_LIBS) \
-- $(NSS_LIBS) \
-- $(NULL)
-diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in
-new file mode 100644
---- /dev/null
-+++ b/services/crypto/component/Makefile.in
-@@ -0,0 +1,75 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is
-+# the Mozilla Foundation.
-+# Portions created by the Initial Developer are Copyright (C) 2010
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+# Philipp von Weitershausen <philipp@weitershausen.de>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either of the GNU General Public License Version 2 or later (the "GPL"),
-+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+DEPTH = ../../..
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+MODULE = services-crypto
-+XPIDL_MODULE = services-crypto-component
-+
-+XPIDLSRCS = \
-+ nsISyncJPAKE.idl \
-+ $(NULL)
-+
-+LIBRARY_NAME = services-crypto
-+EXPORT_LIBRARY = 1
-+IS_COMPONENT = 1
-+MODULE_NAME = nsServicesCryptoModule
-+LIBXUL_LIBRARY = 1
-+FORCE_USE_PIC = 1
-+MOZILLA_INTERNAL_API = 1
-+
-+CPPSRCS = \
-+ nsSyncJPAKE.cpp \
-+ $(NULL)
-+
-+ifdef ENABLE_TESTS
-+DIRS += tests
-+endif
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+EXTRA_DSO_LDOPTS += \
-+ $(MOZ_COMPONENT_LIBS) \
-+ $(NSPR_LIBS) \
-+ $(NSS_LIBS) \
-+ $(NULL)
-diff --git a/services/crypto/nsISyncJPAKE.idl b/services/crypto/component/nsISyncJPAKE.idl
-rename from services/crypto/nsISyncJPAKE.idl
-rename to services/crypto/component/nsISyncJPAKE.idl
-diff --git a/services/crypto/nsSyncJPAKE.cpp b/services/crypto/component/nsSyncJPAKE.cpp
-rename from services/crypto/nsSyncJPAKE.cpp
-rename to services/crypto/component/nsSyncJPAKE.cpp
-diff --git a/services/crypto/nsSyncJPAKE.h b/services/crypto/component/nsSyncJPAKE.h
-rename from services/crypto/nsSyncJPAKE.h
-rename to services/crypto/component/nsSyncJPAKE.h
-diff --git a/services/crypto/component/tests/Makefile.in b/services/crypto/component/tests/Makefile.in
-new file mode 100644
---- /dev/null
-+++ b/services/crypto/component/tests/Makefile.in
-@@ -0,0 +1,50 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is
-+# the Mozilla Foundation.
-+# Portions created by the Initial Developer are Copyright (C) 2010
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+# Philipp von Weitershausen <philipp@weitershausen.de>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either of the GNU General Public License Version 2 or later (the "GPL"),
-+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+DEPTH = ../../../..
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+relativesrcdir = services/crypto/components/tests
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+MODULE = test_services_crypto
-+XPCSHELL_TESTS = unit
-+
-+include $(topsrcdir)/config/rules.mk
-diff --git a/services/crypto/tests/unit/test_jpake.js b/services/crypto/component/tests/unit/test_jpake.js
-rename from services/crypto/tests/unit/test_jpake.js
-rename to services/crypto/component/tests/unit/test_jpake.js
---- a/services/crypto/tests/unit/test_jpake.js
-+++ b/services/crypto/component/tests/unit/test_jpake.js
-@@ -1,8 +1,11 @@
-+const Cc = Components.classes;
-+const Ci = Components.interfaces;
-+
- // Ensure PSM is initialized.
- Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
-
- function do_check_throws(func) {
- let have_error = false;
- try {
- func();
- } catch(ex) {
-diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
---- a/toolkit/library/libxul-config.mk
-+++ b/toolkit/library/libxul-config.mk
-@@ -345,19 +345,17 @@ DEFINES += -DMOZ_SPELLCHECK
- COMPONENT_LIBS += spellchecker
- endif
-
- ifdef MOZ_ZIPWRITER
- DEFINES += -DMOZ_ZIPWRITER
- COMPONENT_LIBS += zipwriter
- endif
-
--ifdef MOZ_SERVICES_SYNC
- COMPONENT_LIBS += services-crypto
--endif
-
- ifdef MOZ_DEBUG
- ifdef ENABLE_TESTS
- COMPONENT_LIBS += gkdebug
- endif
- endif
-
- ifdef MOZ_APP_COMPONENT_LIBS
-diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
---- a/toolkit/library/nsStaticXULComponents.cpp
-+++ b/toolkit/library/nsStaticXULComponents.cpp
-@@ -228,21 +228,17 @@
- #endif
-
- #if defined(BUILD_CTYPES)
- #define JSCTYPES_MODULE MODULE(jsctypes)
- #else
- #define JSCTYPES_MODULE
- #endif
-
--#ifdef MOZ_SERVICES_SYNC
- #define SERVICES_CRYPTO_MODULE MODULE(nsServicesCryptoModule)
--#else
--#define SERVICES_CRYPTO_MODULE
--#endif
-
- #if defined(MOZ_APP_COMPONENT_INCLUDE)
- #include MOZ_APP_COMPONENT_INCLUDE
- #else
- #define APP_COMPONENT_MODULES
- #endif
-
- #define XUL_MODULES \
-diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
---- a/toolkit/toolkit-tiers.mk
-+++ b/toolkit/toolkit-tiers.mk
-@@ -230,19 +230,17 @@ tier_platform_dirs += security/manager
- else
- tier_platform_dirs += security/manager/boot/public security/manager/ssl/public
- endif
-
- ifdef MOZ_PREF_EXTENSIONS
- tier_platform_dirs += extensions/pref
- endif
-
--ifdef MOZ_SERVICES_SYNC
--tier_platform_dirs += services/crypto
--endif
-+tier_platform_dirs += services/crypto/component
-
- # JavaXPCOM JNI code is compiled into libXUL
- ifdef MOZ_JAVAXPCOM
- tier_platform_dirs += extensions/java/xpcom/src
- endif
-
- ifndef BUILD_STATIC_LIBS
- ifneq (,$(MOZ_ENABLE_GTK2))
--- a/mozilla-kde.patch Mon Jan 03 17:57:59 2011 +0100
+++ b/mozilla-kde.patch Sun Jan 09 10:04:57 2011 +0100
@@ -21,8 +21,7 @@
diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
--- a/modules/libpref/src/nsPrefService.cpp
+++ b/modules/libpref/src/nsPrefService.cpp
-@@ -55,16 +55,17 @@
- #include "nsIStringEnumerator.h"
+@@ -57,16 +57,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -30,6 +29,7 @@
#include "nsCOMArray.h"
#include "nsXPCOMCID.h"
#include "nsAutoPtr.h"
+ #include "nsThreadUtils.h"
+#include "nsKDEUtils.h"
#include "nsQuickSort.h"
@@ -39,7 +39,7 @@
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -760,30 +761,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -798,30 +799,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
}
static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
}
//----------------------------------------------------------------------------------------
-@@ -814,28 +833,40 @@ static nsresult pref_InitDefaults()
+@@ -852,28 +871,40 @@ static nsresult pref_InitDefaults()
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MAC) || defined(XP_MACOSX)
@@ -167,7 +167,7 @@
#define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
#define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete"
#define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval"
-@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2199,16 +2203,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -193,7 +193,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2227,16 +2240,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2234,16 +2247,17 @@ nsDownload::SetState(DownloadState aStat
// because if it is, they'll click open the download manager and
// the items they downloaded will have been removed.
alerts->ShowAlertNotification(
@@ -2602,7 +2602,7 @@
OSHELPER += nsAndroidHandlerApp.cpp
OSHELPER += nsExternalSharingAppService.cpp
EXPORTS += nsExternalSharingAppService.h
- endif
+ OSHELPER += nsExternalURLHandlerService.cpp
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644
--- /dev/null
@@ -3201,14 +3201,14 @@
#include "nsAccessibilityHelper.h"
+#include "nsKDEUtils.h"
- #ifdef MOZ_PLATFORM_MAEMO
+ #if (MOZ_PLATFORM_MAEMO == 5)
#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
#endif
#define MAX_PREVIEW_SIZE 180
nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
-@@ -270,17 +272,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3229,7 +3229,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -418,16 +422,19 @@ confirm_overwrite_file(GtkWidget *parent
+@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent
gtk_widget_destroy(dialog);
return result;
@@ -3249,7 +3249,7 @@
GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -568,8 +575,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@@ -3687,7 +3687,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1818,44 +1819,50 @@ nsLocalFile::Launch()
+@@ -1820,44 +1821,50 @@ nsLocalFile::Launch()
return NS_OK;
}
@@ -3752,7 +3752,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1881,16 +1888,23 @@ nsLocalFile::Launch()
+@@ -1883,16 +1890,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;
--- a/mozilla-xulrunner20/create-tar.sh Mon Jan 03 17:57:59 2011 +0100
+++ b/mozilla-xulrunner20/create-tar.sh Sun Jan 09 10:04:57 2011 +0100
@@ -1,8 +1,8 @@
#!/bin/bash
BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b8_RELEASE"
-VERSION="2.0b"
+RELEASE_TAG="default"
+VERSION="2.0b8"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
--- a/mozilla-xulrunner20/mozilla-firefox-sync.patch Mon Jan 03 17:57:59 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-firefox-sync.patch
\ No newline at end of file
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Mon Jan 03 17:57:59 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Sun Jan 09 10:04:57 2011 +0100
@@ -1,8 +1,8 @@
#
-# spec file for package mozilla-xulrunner20 (Version 2.0b)
+# spec file for package mozilla-xulrunner20 (Version 2.0b8)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# 2006-2010 Wolfgang Rosenauer
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 2006-2011 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,10 +30,10 @@
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 2.0b
+Version: 2.0b8
Release: 1
-%define releasedate 2010121400
-%define version_internal 2.0b8
+%define releasedate 2011010500
+%define version_internal 2.0b9pre
%define apiversion 2.0
%define uaweight 199900
Summary: Mozilla Runtime Environment 2.0
@@ -71,7 +71,6 @@
# ---
Patch11: mozilla-cpuid.patch
Patch12: mozilla-language.patch
-Patch13: mozilla-firefox-sync.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js20 = %{version}
Requires(post): update-alternatives coreutils
@@ -212,7 +211,6 @@
%patch11 -p1
%endif
%patch12 -p1
-%patch13 -p1
%build
kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
--- a/series Mon Jan 03 17:57:59 2011 +0100
+++ b/series Sun Jan 09 10:04:57 2011 +0100
@@ -12,7 +12,6 @@
mozilla-cpuid.patch
#mozilla-cairo-lcd.patch
mozilla-language.patch
-mozilla-firefox-sync.patch
# Firefox patches
firefox-linkorder.patch