--- a/MozillaFirefox/MozillaFirefox.spec Sun Dec 25 10:36:35 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Mon Dec 26 09:20:25 2011 +0100
@@ -44,9 +44,9 @@
BuildRequires: mozilla-nspr-devel >= 4.8.9
BuildRequires: mozilla-nss-devel >= 3.13.1
BuildRequires: nss-shared-helper-devel
-Version: %{mainver}.1
-Release: 0
-%define releasedate 2011122000
+Version: %{mainver}
+Release: 10
+%define releasedate 2011122200
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
@@ -233,11 +233,11 @@
TIME="\"$(date -d "${modified}" "+%%R")\""
find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
#
-kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
-if test "$kdehelperversion" != %{kde_helper_version}; then
- echo fix kde helper version in the .spec file
- exit 1
-fi
+#kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
+#if test "$kdehelperversion" != %{kde_helper_version}; then
+# echo fix kde helper version in the .spec file
+# exit 1
+#fi
source %{SOURCE5}
export MOZ_SOURCE_STAMP=$REV
export SOURCE_REPO=$REPO
@@ -514,7 +514,6 @@
%{progdir}/distribution/extensions/
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
%{progdir}/icons/
-%{progdir}/hyphenation/
%{progdir}/searchplugins/
%attr(755,root,root) %{progdir}/%{progname}.sh
%{progdir}/firefox-bin
@@ -524,7 +523,7 @@
%{progdir}/dependentlibs.list
%{progdir}/*.so
%{progdir}/mozilla-xremote-client
-%{progdir}/omni.jar
+%{progdir}/omni.ja
%{progdir}/platform.ini
%{progdir}/plugin-container
%if %crashreporter
--- a/mozilla-kde.patch Sun Dec 25 10:36:35 2011 +0100
+++ b/mozilla-kde.patch Mon Dec 26 09:20:25 2011 +0100
@@ -3595,15 +3595,15 @@
NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
NS_NAMED_LITERAL_STRING(kABI, "abi");
+ NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
+ #if defined(ANDROID)
+ NS_NAMED_LITERAL_STRING(kTablet, "tablet");
+ #endif
// Obsolete
NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
nsAutoString appID;
- nsAutoString appVersion;
- nsAutoString geckoVersion;
- nsAutoString osTarget;
-@@ -478,39 +480,44 @@ ParseManifestCommon(NSLocationType aType
+@@ -481,41 +483,46 @@ ParseManifestCommon(NSLocationType aType
CopyUTF8toUTF16(s, abi);
abi.Insert(PRUnichar('_'), 0);
abi.Insert(osTarget, 0);
@@ -3636,8 +3636,10 @@
gtk_minor_version);
+ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
#elif defined(ANDROID)
+ bool isTablet = false;
if (mozilla::AndroidBridge::Bridge()) {
mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
+ isTablet = mozilla::AndroidBridge::Bridge()->IsTablet();
}
+ desktop = NS_LITERAL_STRING("android");
#endif
@@ -3648,13 +3650,13 @@
char *token;
char *newline = buf;
-@@ -589,24 +596,26 @@ ParseManifestCommon(NSLocationType aType
- TriState stAppVersion = eUnspecified;
- TriState stGeckoVersion = eUnspecified;
- TriState stApp = eUnspecified;
+@@ -597,24 +604,26 @@ ParseManifestCommon(NSLocationType aType
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
TriState stABI = eUnspecified;
+ #if defined(ANDROID)
+ TriState stTablet = eUnspecified;
+ #endif
bool platform = false;
bool contentAccessible = false;
+ TriState stDesktop = eUnspecified;
@@ -3672,10 +3674,10 @@
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
continue;
- if (directive->contentflags &&
- (CheckFlag(kPlatform, wtoken, platform) ||
- CheckFlag(kContentAccessible, wtoken, contentAccessible)))
-@@ -627,16 +636,17 @@ ParseManifestCommon(NSLocationType aType
+ #if defined(ANDROID)
+ bool tablet = false;
+ if (CheckFlag(kTablet, wtoken, tablet)) {
+@@ -643,16 +652,17 @@ ParseManifestCommon(NSLocationType aType
}
if (!ok ||
@@ -3685,14 +3687,14 @@
stOs == eBad ||
stOsVersion == eBad ||
+ stDesktop == eBad ||
+ #ifdef ANDROID
+ stTablet == eBad ||
+ #endif
stABI == eBad)
continue;
if (directive->regfunc) {
if (GeckoProcessType_Default != XRE_GetProcessType())
- continue;
-
- if (!nsChromeRegistry::gChromeRegistry) {
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in