upgrade to 17.0, actualize patches

Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
2025-02-25 11:02:59 +00:00 · 2012-11-22 12:56:08 +04:00 · 2012-11-22 12:56:08 +04:00 · 30a64600e2
commit 30a64600e2
parent a58ef0a263
8 changed files with 136 additions and 230 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,3 +1,3 @@
 ---
 sources:
-  firefox-16.0.2.source.tar.bz2: 0ffe96896583e92561b341330ab09ddc50140dd1
+  firefox-17.0.source.tar.bz2: 4f5f175c1662d67f70e78403607d8eda600efd8b
--- a/firefox-10.0-nss-binary.patch
+++ b/firefox-10.0-nss-binary.patch
@ -1,11 +0,0 @@
--- toolkit/mozapps/installer/packager.mk.build	2012-03-17 11:59:21.000000000 +0800
-+++ toolkit/mozapps/installer/packager.mk	2012-03-17 12:06:59.000000000 +0800
-@@ -544,7 +544,7 @@
- NSS_DLL_SUFFIX	= .DLL
- SIGN_CMD	= $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
- else
-SIGN_CMD	= $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i
-+SIGN_CMD	= $(RUN_TEST_PROGRAM) /usr/bin/shlibsign$(BIN_SUFFIX) -v -i
- endif
- endif
- 
--- a/firefox-17.0-disable-check-default-browser.patch
+++ b/firefox-17.0-disable-check-default-browser.patch
@ -1,8 +1,7 @@
-diff -Naur mozilla/browser/app/profile/firefox.js mozilla.tpg/browser/app/profile/firefox.js
--- mozilla/browser/app/profile/firefox.js	2008-02-04 19:36:22.000000000 +0000
-+++ mozilla.tpg/browser/app/profile/firefox.js	2008-02-29 21:26:08.000000000 +0000
-@@ -247,7 +247,7 @@ pref("general.autoScroll", true);
- #endif
+--- mozilla-release/browser/app/profile/firefox.js.disable-software-update	2012-11-21 19:23:57.000000000 +0400
+++ mozilla-release/browser/app/profile/firefox.js	2012-11-21 20:26:55.826335163 +0400
+@@ -237,7 +237,7 @@ pref("general.useragent.override.natwest
+ pref("general.useragent.override.raiffeisen.hu",         "Gecko/[^ ]*#Gecko/20100101"); // bug 795348
 
 // At startup, check if we're the default browser and prompt user if not.
 -pref("browser.shell.checkDefaultBrowser", true);
--- a/firefox-17.0-kde.patch
+++ b/firefox-17.0-kde.patch
@ -1,7 +1,5 @@
-diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
-new file mode 100644
--- /dev/null
-+++ b/browser/base/content/browser-kde.xul
+--- mozilla-release/browser/base/content/browser-kde.xul.kdepatch	2012-11-21 20:32:50.498345565 +0400
+++ mozilla-release/browser/base/content/browser-kde.xul	2012-11-21 20:32:50.498345565 +0400
@@ -0,0 +1,1210 @@
 +#filter substitution
 +<?xml version="1.0"?>
@ -1213,37 +1211,20 @@ new file mode 100644
 +</deck>
 +
 +</window>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -35,16 +35,18 @@ browser.jar:
-         content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
-         content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
-         content/browser/abouthome/noise.png           (content/abouthome/noise.png)
-         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
-         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+--- mozilla-release/browser/base/jar.mn.kdepatch	2012-11-20 06:45:49.000000000 +0400
+++ mozilla-release/browser/base/jar.mn	2012-11-21 20:41:13.886429419 +0400
+@@ -41,6 +41,8 @@ browser.jar:
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
- *       content/browser/content.js                    (content/content.js)
- *       content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
- *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
-         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
- *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
- *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
- *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
-diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
-+++ b/browser/components/build/nsModule.cpp
-@@ -8,17 +8,17 @@
- #include "nsBrowserCompsCID.h"
- #include "DirectoryProvider.h"
- 
- #if defined(XP_WIN)
- #include "nsWindowsShellService.h"
+         content/browser/content.js                    (content/content.js)
+         content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
+--- mozilla-release/browser/components/build/nsModule.cpp.kdepatch	2012-11-20 06:45:49.000000000 +0400
+++ mozilla-release/browser/components/build/nsModule.cpp	2012-11-21 20:32:50.499335644 +0400
+@@ -13,7 +13,7 @@
 #elif defined(XP_MACOSX)
 #include "nsMacShellService.h"
 #elif defined(MOZ_WIDGET_GTK2)
@ -1252,17 +1233,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 #endif
 
 #if defined(XP_WIN)
- #include "nsIEHistoryEnumerator.h"
- #endif
- 
- #include "rdf.h"
- #include "nsFeedSniffer.h"
-@@ -32,18 +32,16 @@ using namespace mozilla::browser;
- 
- /////////////////////////////////////////////////////////////////////////////
- 
- NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
- #if defined(XP_WIN)
+@@ -37,8 +37,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(Directory
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
 #elif defined(XP_MACOSX)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
@ -1271,17 +1242,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 #endif
 
 #if defined(XP_WIN)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
- #endif
- 
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
- 
-@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
- #endif
- NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
- 
- static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
-     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
+@@ -69,7 +67,7 @@ static const mozilla::Module::CIDEntry k
 #if defined(XP_WIN)
     { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
 #elif defined(MOZ_WIDGET_GTK2)
@ -1290,20 +1251,9 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 #endif
     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
- #if defined(XP_WIN)
-     { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
- #elif defined(XP_MACOSX)
-     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
- #endif
-diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
-+++ b/browser/components/preferences/advanced.js
-@@ -23,16 +23,22 @@ var gAdvancedPane = {
-     if (extraArgs && extraArgs["advancedTab"]){
-       advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
-     } else {
-       var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
-       if (preference.value !== null)
+--- mozilla-release/browser/components/preferences/advanced.js.kdepatch	2012-11-20 06:45:49.000000000 +0400
+++ mozilla-release/browser/components/preferences/advanced.js	2012-11-21 20:45:20.726667535 +0400
+@@ -28,6 +28,12 @@ var gAdvancedPane = {
         advancedPrefs.selectedIndex = preference.value;
     }
 
@ -1316,17 +1266,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 #ifdef HAVE_SHELL_SERVICE
     this.updateSetDefaultBrowser();
 #ifdef XP_WIN
-     let shellSvc = getShellService();
-     // In Windows 8 we launch the control panel since it's the only
-     // way to get all file type association prefs. So we don't know
-     // when the user will select the default.  We refresh here periodically
-     // in case the default changes. 
-@@ -737,14 +743,25 @@ var gAdvancedPane = {
-    * Set browser as the operating system default browser.
-    */
-   setDefaultBrowser: function()
-   {
-     let shellSvc = getShellService();
+@@ -730,6 +736,17 @@ var gAdvancedPane = {
     if (!shellSvc)
       return;
     shellSvc.setDefaultBrowser(true, false);
@ -1344,18 +1284,9 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
     let selectedIndex =
       shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
     document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
-   }
- #endif
- };
-diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
--- a/browser/components/shell/src/Makefile.in
-+++ b/browser/components/shell/src/Makefile.in
-@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1
- 
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS = nsWindowsShellService.cpp
- else
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+--- mozilla-release/browser/components/shell/src/Makefile.in.kdepatch	2012-11-20 06:45:49.000000000 +0400
+++ mozilla-release/browser/components/shell/src/Makefile.in	2012-11-21 20:32:50.500335609 +0400
+@@ -22,7 +22,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
@ -1365,15 +1296,8 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell
 endif
 endif
 endif
- 
- ifdef CPPSRCS
- LIBRARY_NAME = shellservice_s
- endif
- 
-diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
-new file mode 100644
--- /dev/null
-+++ b/browser/components/shell/src/nsKDEShellService.cpp
+--- mozilla-release/browser/components/shell/src/nsKDEShellService.cpp.kdepatch	2012-11-21 20:32:50.501335636 +0400
+++ mozilla-release/browser/components/shell/src/nsKDEShellService.cpp	2012-11-21 20:32:50.501335636 +0400
@@ -0,0 +1,265 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -1640,10 +1564,8 @@ new file mode 100644
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
 +    }
-diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
-new file mode 100644
--- /dev/null
-+++ b/browser/components/shell/src/nsKDEShellService.h
+--- mozilla-release/browser/components/shell/src/nsKDEShellService.h.kdepatch	2012-11-21 20:32:50.501335636 +0400
+++ mozilla-release/browser/components/shell/src/nsKDEShellService.h	2012-11-21 20:32:50.501335636 +0400
@@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -1704,10 +1626,8 @@ new file mode 100644
 +};
 +
 +#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
-new file mode 100644
--- /dev/null
-+++ b/browser/components/shell/src/nsUnixShellService.cpp
+--- mozilla-release/browser/components/shell/src/nsUnixShellService.cpp.kdepatch	2012-11-21 20:32:50.501335636 +0400
+++ mozilla-release/browser/components/shell/src/nsUnixShellService.cpp	2012-11-21 20:32:50.501335636 +0400
@@ -0,0 +1,52 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -1761,10 +1681,8 @@ new file mode 100644
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
-diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
-new file mode 100644
--- /dev/null
-+++ b/browser/components/shell/src/nsUnixShellService.h
+--- mozilla-release/browser/components/shell/src/nsUnixShellService.h.kdepatch	2012-11-21 20:32:50.502335643 +0400
+++ mozilla-release/browser/components/shell/src/nsUnixShellService.h	2012-11-21 20:32:50.501335636 +0400
@@ -0,0 +1,45 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -1811,15 +1729,9 @@ new file mode 100644
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
-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
-@@ -558,18 +558,20 @@
- @BINPATH@/@PREF_DIR@/services-sync.js
- #endif
- @BINPATH@/greprefs.js
- @BINPATH@/defaults/autoconfig/platform.js
- @BINPATH@/defaults/autoconfig/prefcalls.js
+--- mozilla-release/browser/installer/package-manifest.in.kdepatch	2012-11-20 06:45:50.000000000 +0400
+++ mozilla-release/browser/installer/package-manifest.in	2012-11-21 20:32:50.502335643 +0400
+@@ -566,8 +566,10 @@
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 @BINPATH@/defaults/pref/channel-prefs.js
@ -1830,8 +1742,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 #endif
 @BINPATH@/defaults/profile/prefs.js
 
- ; [Layout Engine Resources]
- ; Style Sheets, Graphics and other Resources used by the layout engine. 
- @BINPATH@/res/EditorOverride.css
- @BINPATH@/res/contenteditable.css
- @BINPATH@/res/designmode.css
--- a/firefox-17.0-nss-binary.patch
+++ b/firefox-17.0-nss-binary.patch
@ -0,0 +1,11 @@
+--- mozilla-release/toolkit/mozapps/installer/packager.mk.nsspatch	2012-11-20 06:46:22.000000000 +0400
+++ mozilla-release/toolkit/mozapps/installer/packager.mk	2012-11-21 19:19:02.856402131 +0400
+@@ -608,7 +608,7 @@ ifeq ($(OS_ARCH),OS2)
+ NSS_DLL_SUFFIX	= .DLL
+ SIGN_CMD	= $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/sign.cmd $(DIST)
+ else
+-SIGN_CMD	= $(strip $(RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i)
+SIGN_CMD	= $(strip $(RUN_TEST_PROGRAM) /bin/shlibsign$(BIN_SUFFIX) -v -i)
+ endif
+ endif
+ 
--- a/iceape-2.12-system-virtualenv.patch
+++ b/iceape-2.12-system-virtualenv.patch
@ -1,10 +1,10 @@
--- BUILD/mozilla-release/configure.in.virtualenv	2012-10-24 18:32:27.000000000 +0400
-+++ BUILD/mozilla-release/configure.in	2012-10-29 17:45:42.060800696 +0400
-@@ -8838,7 +8838,7 @@ dnl Create a virtualenv where we can ins
+--- mozilla-release/configure.in.system-virtualenv	2012-11-20 06:45:51.000000000 +0400
+++ mozilla-release/configure.in	2012-11-22 12:30:08.020356523 +0400
+@@ -8698,7 +8698,7 @@ dnl Create a virtualenv where we can ins
 AC_MSG_RESULT([Creating Python virtualenv])
 rm -rf _virtualenv
 mkdir -p _virtualenv
-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
 +MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= virtualenv --system-site-packages ./_virtualenv
 case "$host_os" in
 mingw*)
--- a/firefox.spec
+++ b/firefox.spec
@ -7,7 +7,7 @@
 # This also means only STABLE upstream releases, NO betas.
 # This is a discussed topic. Please, do not flame it again.

-%define major 16.0.2
+%define major 17.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@ -31,7 +31,7 @@

 %define _use_syshunspell 0

-%define release 9
+%define release 1

 %define update_channel  release

@ -59,23 +59,23 @@ Source12:   firefox-searchengines-bing.xml
 Patch1:		firefox-6.0-lang.patch
 Patch2:         firefox-vendor.patch
 Patch3:		mozilla-firefox-1.5.0.6-systemproxy.patch
-Patch4:		firefox-10.0-nss-binary.patch
+Patch4:		firefox-17.0-nss-binary.patch
 # (OpenSuse) add patch to make firefox always use /usr/bin/firefox when "make firefox
 # the default web browser" is used fix mdv bug#58784
 Patch5:         firefox-6.0-appname.patch
 Patch6:		firefox-7.0-fix-str-fmt.patch
 Patch7:		mozilla-firefox-run-mozilla.patch
-Patch8:		firefox-disable-check-default-browser.patch
+Patch8:		firefox-17.0-disable-check-default-browser.patch
 Patch9:         firefox-5.0-asciidel.patch
 Patch10:	firefox-3.5.3-default-mail-handler.patch
 # Patches for kde integration of FF 
-Patch11:        firefox-16.0-kde.patch
-Patch12:        mozilla-16.0-kde.patch
+Patch11:        firefox-17.0-kde.patch
+Patch12:        mozilla-17.0-kde.patch
 Patch13:        firefox-13-fix-nspr-include.patch
 Patch14:        firefox-13-fix-cairo-build.patch
 Patch34:	xulrunner_nojit.patch
 # (cjw) use system virtualenv
-Patch36:		iceape-2.12-system-virtualenv.patch
+Patch36:		firefox-17.0-virtualenv.patch
 BuildRequires:	gtk+2-devel
 BuildRequires:	unzip
 BuildRequires:	zip
@ -173,7 +173,7 @@ Files and macros mainly for building Firefox extensions.
 %patch1 -p1 -b .lang
 %patch2 -p1 -b .vendor
 #patch3 -p1 -b .systemproxy
-%patch4 -p0 -b .nss
+%patch4 -p1 -b .nsspatch
 %patch5 -p1 -b .appname
 # It was disabled because firefox3 hangs when using soundwrapper
 #patch7 -p1
@ -184,7 +184,7 @@ Files and macros mainly for building Firefox extensions.

 ## KDE INTEGRATION
 # Disable kde integration , need refactoring
-%patch11 -p1 -b .kde
+%patch11 -p1 -b .kdepatch
 %patch12 -p1 -b .kdemoz

 %ifarch %arm
@ -192,7 +192,7 @@ Files and macros mainly for building Firefox extensions.
 %patch34 -p1
 %endif
 %endif
-%patch36 -p2 -b .system-virtualenv
+%patch36 -p1 -b .system-virtualenv

 pushd js/src
 autoconf-2.13
--- a/mozilla-17.0-kde.patch
+++ b/mozilla-17.0-kde.patch
@ -1,5 +1,5 @@
--- mozilla-release/modules/libpref/src/Makefile.in.kdemoz	2012-10-24 18:33:20.000000000 +0400
-+++ mozilla-release/modules/libpref/src/Makefile.in	2012-10-30 18:59:47.133829665 +0400
+--- mozilla-release/modules/libpref/src/Makefile.in.kdemoz	2012-11-20 06:46:16.000000000 +0400
+++ mozilla-release/modules/libpref/src/Makefile.in	2012-11-21 20:48:44.545356808 +0400
@@ -50,6 +50,8 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi
 	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
 endif
@ -9,8 +9,8 @@
 
 greprefs.js: $(GREPREF_FILES)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
--- mozilla-release/modules/libpref/src/Preferences.cpp.kdemoz	2012-10-24 18:33:20.000000000 +0400
-+++ mozilla-release/modules/libpref/src/Preferences.cpp	2012-10-30 18:59:47.134832212 +0400
+--- mozilla-release/modules/libpref/src/Preferences.cpp.kdemoz	2012-11-20 06:46:16.000000000 +0400
+++ mozilla-release/modules/libpref/src/Preferences.cpp	2012-11-22 12:05:24.811386447 +0400
@@ -28,6 +28,7 @@
 #include "nsCOMArray.h"
 #include "nsXPCOMCID.h"
@ -19,7 +19,7 @@
 
 #include "nsQuickSort.h"
 #include "prmem.h"
-@@ -912,6 +913,24 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -901,6 +902,24 @@ static nsresult pref_LoadPrefsInDirList(
   if (NS_FAILED(rv))
     return rv;
 
@ -44,16 +44,16 @@
   nsCOMPtr<nsISimpleEnumerator> list;
   dirSvc->Get(listId,
               NS_GET_IID(nsISimpleEnumerator),
-@@ -937,7 +956,7 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -926,7 +945,7 @@ static nsresult pref_LoadPrefsInDirList(
     if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
       ReadExtensionPrefs(path);
     else
-      pref_LoadPrefsInDir(path, nsnull, 0);
+-      pref_LoadPrefsInDir(path, nullptr, 0);
 +      pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles));
   }
   return NS_OK;
 }
-@@ -1041,6 +1060,7 @@ static nsresult pref_InitInitialObjects(
+@@ -1030,6 +1049,7 @@ static nsresult pref_InitInitialObjects(
     "winpref.js"
 #elif defined(XP_UNIX)
     "unix.js"
@ -61,7 +61,7 @@
 #if defined(VMS)
     , "openvms.js"
 #elif defined(_AIX)
-@@ -1053,6 +1073,17 @@ static nsresult pref_InitInitialObjects(
+@@ -1042,6 +1062,17 @@ static nsresult pref_InitInitialObjects(
 #endif
   };
 
@ -79,8 +79,8 @@
   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
   if (NS_FAILED(rv))
     NS_WARNING("Error parsing application default preferences.");
--- mozilla-release/toolkit/components/downloads/Makefile.in.kdemoz	2012-10-24 18:33:28.000000000 +0400
-+++ mozilla-release/toolkit/components/downloads/Makefile.in	2012-10-30 18:59:47.134832212 +0400
+--- mozilla-release/toolkit/components/downloads/Makefile.in.kdemoz	2012-11-20 06:46:20.000000000 +0400
+++ mozilla-release/toolkit/components/downloads/Makefile.in	2012-11-21 20:48:44.546356893 +0400
@@ -46,4 +46,7 @@ TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
@ -89,8 +89,8 @@
 +
 +
 CXXFLAGS += $(TK_CFLAGS)
--- mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp.kdemoz	2012-10-24 18:33:28.000000000 +0400
-+++ mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp	2012-10-30 18:59:47.135779934 +0400
+--- mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp.kdemoz	2012-11-20 06:46:20.000000000 +0400
+++ mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp	2012-11-22 12:10:22.079356852 +0400
@@ -40,6 +40,10 @@
 #endif
 #endif
@ -115,7 +115,7 @@
 +          nsKDEUtils::command( command );
 +        } else {
 +        // begin non-KDE block
-         PRInt32 alertInterval = 2000;
+         int32_t alertInterval = 2000;
         if (pref)
           pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
@@ -2269,9 +2282,10 @@ nsDownload::SetState(DownloadState aStat
@ -130,8 +130,8 @@
 
 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
--- mozilla-release/toolkit/content/jar.mn.kdemoz	2012-10-24 18:33:29.000000000 +0400
-+++ mozilla-release/toolkit/content/jar.mn	2012-10-30 18:59:47.135779934 +0400
+--- mozilla-release/toolkit/content/jar.mn.kdemoz	2012-11-20 06:46:21.000000000 +0400
+++ mozilla-release/toolkit/content/jar.mn	2012-11-21 20:48:44.547356805 +0400
@@ -50,6 +50,8 @@ toolkit.jar:
    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
@ -150,8 +150,8 @@
    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
    content/global/bindings/radio.xml           (widgets/radio.xml)
    content/global/bindings/resizer.xml         (widgets/resizer.xml)
--- mozilla-release/toolkit/content/widgets/dialog-kde.xml.kdemoz	2012-10-30 18:59:47.136836167 +0400
-+++ mozilla-release/toolkit/content/widgets/dialog-kde.xml	2012-10-30 18:59:47.136836167 +0400
+--- mozilla-release/toolkit/content/widgets/dialog-kde.xml.kdemoz	2012-11-21 20:48:44.548356774 +0400
+++ mozilla-release/toolkit/content/widgets/dialog-kde.xml	2012-11-21 20:48:44.548356774 +0400
@@ -0,0 +1,451 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
@ -604,8 +604,8 @@
 +  </binding>
 +
 +</bindings>
--- mozilla-release/toolkit/content/widgets/preferences-kde.xml.kdemoz	2012-10-30 18:59:47.138780033 +0400
-+++ mozilla-release/toolkit/content/widgets/preferences-kde.xml	2012-10-30 18:59:47.138780033 +0400
+--- mozilla-release/toolkit/content/widgets/preferences-kde.xml.kdemoz	2012-11-21 20:48:44.550356535 +0400
+++ mozilla-release/toolkit/content/widgets/preferences-kde.xml	2012-11-21 20:48:44.549356863 +0400
@@ -0,0 +1,1339 @@
 +<?xml version="1.0"?>
 +
@ -1946,26 +1946,26 @@
 +#    PrefWindow II  (???)
 +#    PrefWindow I   (June 4, 1999)
 +#
--- mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.kdemoz	2012-10-24 18:33:33.000000000 +0400
-+++ mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2012-10-30 19:06:55.457901352 +0400
-@@ -17,6 +17,8 @@
- #include "nsISupportsPrimitives.h"
+--- mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.kdemoz	2012-11-20 06:46:22.000000000 +0400
+++ mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2012-11-22 12:13:19.911391656 +0400
+@@ -18,6 +18,8 @@
 #include "nsIGSettingsService.h"
 #include "nsInterfaceHashtable.h"
+ #include "mozilla/Attributes.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
 
- class nsUnixSystemProxySettings : public nsISystemProxySettings {
+ class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
 public:
-@@ -38,6 +40,7 @@ private:
-   nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
-   nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+@@ -39,6 +41,7 @@ private:
+   nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
+   nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
   nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
 +  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
 };
 
 NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
-@@ -494,6 +497,9 @@ nsUnixSystemProxySettings::GetProxyForUR
+@@ -495,6 +498,9 @@ nsUnixSystemProxySettings::GetProxyForUR
   rv = aURI->GetPort(&port);
   NS_ENSURE_SUCCESS(rv, rv);
 
@ -1975,7 +1975,7 @@
   if (mProxySettings) {
     rv = GetProxyFromGSettings(scheme, host, port, aResult);
     if (rv == NS_OK)
-@@ -529,3 +535,29 @@ static const mozilla::Module kUnixProxyM
+@@ -530,3 +536,29 @@ static const mozilla::Module kUnixProxyM
 };
 
 NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
@ -2005,8 +2005,8 @@
 +  return NS_OK;
 +}
 +
--- mozilla-release/toolkit/xre/Makefile.in.kdemoz	2012-10-24 18:33:33.000000000 +0400
-+++ mozilla-release/toolkit/xre/Makefile.in	2012-10-30 18:59:47.138780033 +0400
+--- mozilla-release/toolkit/xre/Makefile.in.kdemoz	2012-11-20 06:46:23.000000000 +0400
+++ mozilla-release/toolkit/xre/Makefile.in	2012-11-21 20:48:44.550356535 +0400
@@ -74,7 +74,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS += nsNativeAppSupportOS2.cpp
 else
@ -2017,8 +2017,8 @@
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 MOCSRCS += moc_nsNativeAppSupportQt.cpp
--- mozilla-release/toolkit/xre/nsKDEUtils.cpp.kdemoz	2012-10-30 18:59:47.139837402 +0400
-+++ mozilla-release/toolkit/xre/nsKDEUtils.cpp	2012-10-30 18:59:47.139837402 +0400
+--- mozilla-release/toolkit/xre/nsKDEUtils.cpp.kdemoz	2012-11-21 20:48:44.551357147 +0400
+++ mozilla-release/toolkit/xre/nsKDEUtils.cpp	2012-11-21 20:48:44.551357147 +0400
@@ -0,0 +1,373 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -2393,8 +2393,8 @@
 +    fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
 +    fflush( commandFile );
 +    }
--- mozilla-release/toolkit/xre/nsKDEUtils.h.kdemoz	2012-10-30 18:59:47.139837402 +0400
-+++ mozilla-release/toolkit/xre/nsKDEUtils.h	2012-10-30 18:59:47.139837402 +0400
+--- mozilla-release/toolkit/xre/nsKDEUtils.h.kdemoz	2012-11-21 20:48:44.551357147 +0400
+++ mozilla-release/toolkit/xre/nsKDEUtils.h	2012-11-21 20:48:44.551357147 +0400
@@ -0,0 +1,81 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@ -2477,8 +2477,8 @@
 +    };
 +
 +#endif // nsKDEUtils
--- mozilla-release/uriloader/exthandler/Makefile.in.kdemoz	2012-10-24 18:33:34.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/Makefile.in	2012-10-30 18:59:47.140780023 +0400
+--- mozilla-release/uriloader/exthandler/Makefile.in.kdemoz	2012-11-20 06:46:23.000000000 +0400
+++ mozilla-release/uriloader/exthandler/Makefile.in	2012-11-21 20:48:44.552356734 +0400
@@ -63,8 +63,9 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
             -I$(topsrcdir)/netwerk/protocol/http
 
@ -2490,8 +2490,8 @@
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp.kdemoz	2012-10-30 18:59:47.140780023 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp	2012-10-30 18:59:47.140780023 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp.kdemoz	2012-11-21 20:48:44.552356734 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp	2012-11-21 20:48:44.552356734 +0400
@@ -0,0 +1,87 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -2580,8 +2580,8 @@
 +        return nsKDERegistry::GetFromType( aMIMEType );
 +    return nsGNOMERegistry::GetFromType( aMIMEType );
 +}
--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h.kdemoz	2012-10-30 18:59:47.140780023 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h	2012-10-30 18:59:47.140780023 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h.kdemoz	2012-11-21 20:48:44.552356734 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h	2012-11-21 20:48:44.552356734 +0400
@@ -0,0 +1,56 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -2639,8 +2639,8 @@
 +
 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
 +};
--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp.kdemoz	2012-10-30 18:59:47.140780023 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp	2012-10-30 18:59:47.140780023 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp.kdemoz	2012-11-21 20:48:44.553356851 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp	2012-11-21 20:48:44.553356851 +0400
@@ -0,0 +1,119 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -2761,8 +2761,8 @@
 +        }
 +    return nsnull;
 +}
--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h.kdemoz	2012-10-30 18:59:47.141825629 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h	2012-10-30 18:59:47.141825629 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h.kdemoz	2012-11-21 20:48:44.553356851 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h	2012-11-21 20:48:44.553356851 +0400
@@ -0,0 +1,62 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -2826,8 +2826,8 @@
 +  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
 +
 +};
--- mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.kdemoz	2012-10-24 18:33:34.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-10-30 18:59:47.141825629 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.kdemoz	2012-11-20 06:46:23.000000000 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-11-21 20:48:44.553356851 +0400
@@ -21,7 +21,7 @@
 #endif
 
@ -2901,8 +2901,8 @@
   if (mimeInfo) {
     nsCAutoString type;
     mimeInfo->GetType(type);
--- mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp.kdemoz	2012-10-24 18:33:34.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-10-30 18:59:47.142780445 +0400
+--- mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp.kdemoz	2012-11-20 06:46:23.000000000 +0400
+++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-11-21 20:48:44.554356746 +0400
@@ -15,7 +15,7 @@
 #include "nsOSHelperAppService.h"
 #include "nsMIMEInfoUnix.h"
@ -2948,9 +2948,9 @@
     if (gnomeInfo && gnomeInfo->HasExtensions()) {
       LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
       return gnomeInfo;
--- mozilla-release/widget/gtk2/Makefile.in.kdemoz	2012-10-24 18:33:34.000000000 +0400
-+++ mozilla-release/widget/gtk2/Makefile.in	2012-10-30 18:59:47.142780445 +0400
-@@ -110,6 +110,9 @@ INCLUDES	+= \
+--- mozilla-release/widget/gtk2/Makefile.in.kdemoz	2012-11-20 06:46:25.000000000 +0400
+++ mozilla-release/widget/gtk2/Makefile.in	2012-11-21 20:48:44.554356746 +0400
+@@ -109,6 +109,9 @@ INCLUDES	+= \
 		-I$(topsrcdir)/layout/xul/base/src \
 		-I$(topsrcdir)/other-licenses/atk-1.0 \
 		$(NULL)
@ -2960,8 +2960,8 @@
 ifdef MOZ_X11
 INCLUDES   	+= -I$(srcdir)/../shared/x11
 endif
--- mozilla-release/widget/gtk2/nsFilePicker.cpp.kdemoz	2012-10-24 18:33:35.000000000 +0400
-+++ mozilla-release/widget/gtk2/nsFilePicker.cpp	2012-10-30 18:59:47.143779543 +0400
+--- mozilla-release/widget/gtk2/nsFilePicker.cpp.kdemoz	2012-11-20 06:46:25.000000000 +0400
+++ mozilla-release/widget/gtk2/nsFilePicker.cpp	2012-11-22 12:26:59.004410385 +0400
@@ -6,6 +6,7 @@
 #include "mozilla/Util.h"
 
@ -2978,7 +2978,7 @@
 
 #if (MOZ_PLATFORM_MAEMO == 5)
 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
-@@ -257,7 +259,9 @@ nsFilePicker::AppendFilter(const nsAStri
+@@ -269,7 +271,9 @@ nsFilePicker::AppendFilter(const nsAStri
 {
   if (aFilter.EqualsLiteral("..apps")) {
     // No platform specific thing we can do here, really....
@ -2989,19 +2989,19 @@
   }
 
   nsCAutoString filter, name;
-@@ -362,6 +366,9 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -374,6 +378,9 @@ nsFilePicker::Show(int16_t *aReturn)
 {
   NS_ENSURE_ARG_POINTER(aReturn);
 
 +  if( nsKDEUtils::kdeSupport())
 +    return kdeFileDialog(aReturn);
 +
-   nsXPIDLCString title;
-   title.Adopt(ToNewUTF8String(mTitle));
- 
-@@ -510,3 +517,229 @@ nsFilePicker::Show(PRInt16 *aReturn)
- 
-   return NS_OK;
+   nsresult rv = Open(nullptr);
+   if (NS_FAILED(rv))
+     return rv;
+@@ -592,3 +599,229 @@ nsFilePicker::Done(GtkWidget* file_choos
+   }
+   NS_RELEASE_THIS();
 }
 +
 +nsCString nsFilePicker::kdeMakeFilter( int index )
@ -3027,7 +3027,7 @@
 +    return GDK_WINDOW_XID( gdk_window );
 +    }
 +
-+NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn)
+NS_IMETHODIMP nsFilePicker::kdeFileDialog(int16_t *aReturn)
 +    {
 +    NS_ENSURE_ARG_POINTER(aReturn);
 +
@ -3199,7 +3199,7 @@
 +    }
 +
 +
-+NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn)
+NS_IMETHODIMP nsFilePicker::kdeAppsDialog(int16_t *aReturn)
 +    {
 +    NS_ENSURE_ARG_POINTER(aReturn);
 +
@ -3229,9 +3229,9 @@
 +        }
 +    return NS_OK;
 +    }
--- mozilla-release/widget/gtk2/nsFilePicker.h.kdemoz	2012-10-24 18:33:35.000000000 +0400
-+++ mozilla-release/widget/gtk2/nsFilePicker.h	2012-10-30 18:59:47.143779543 +0400
-@@ -62,6 +62,12 @@ protected:
+--- mozilla-release/widget/gtk2/nsFilePicker.h.kdemoz	2012-11-20 06:46:25.000000000 +0400
+++ mozilla-release/widget/gtk2/nsFilePicker.h	2012-11-21 20:48:44.555357191 +0400
+@@ -72,6 +72,12 @@ protected:
 
 private:
   static nsIFile *mPrevDisplayDirectory;
@ -3244,8 +3244,8 @@
 };
 
 #endif
--- mozilla-release/xpcom/components/Makefile.in.kdemoz	2012-10-24 18:33:36.000000000 +0400
-+++ mozilla-release/xpcom/components/Makefile.in	2012-10-30 18:59:47.143779543 +0400
+--- mozilla-release/xpcom/components/Makefile.in.kdemoz	2012-11-20 06:46:26.000000000 +0400
+++ mozilla-release/xpcom/components/Makefile.in	2012-11-21 20:48:44.555357191 +0400
@@ -64,5 +64,6 @@ include $(topsrcdir)/config/rules.mk
 DEFINES	+= -D_IMPL_NS_COM
 
@ -3253,8 +3253,8 @@
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif
--- mozilla-release/xpcom/components/ManifestParser.cpp.kdemoz	2012-10-24 18:33:36.000000000 +0400
-+++ mozilla-release/xpcom/components/ManifestParser.cpp	2012-10-30 18:59:47.143779543 +0400
+--- mozilla-release/xpcom/components/ManifestParser.cpp.kdemoz	2012-11-20 06:46:26.000000000 +0400
+++ mozilla-release/xpcom/components/ManifestParser.cpp	2012-11-21 20:48:44.556357107 +0400
@@ -35,6 +35,7 @@
 #include "nsIScriptError.h"
 #include "nsIXULAppInfo.h"
@ -3331,8 +3331,8 @@
 #ifdef MOZ_WIDGET_ANDROID
         stTablet == eBad ||
 #endif
--- mozilla-release/xpcom/io/Makefile.in.kdemoz	2012-10-24 18:33:37.000000000 +0400
-+++ mozilla-release/xpcom/io/Makefile.in	2012-10-30 18:59:47.144829885 +0400
+--- mozilla-release/xpcom/io/Makefile.in.kdemoz	2012-11-20 06:46:26.000000000 +0400
+++ mozilla-release/xpcom/io/Makefile.in	2012-11-21 20:48:44.556357107 +0400
@@ -162,7 +162,7 @@ DEFINES     += -DHAVE_USR_LIB64_DIR
 endif
 endif
@ -3342,8 +3342,8 @@
 
 ifeq ($(MOZ_PLATFORM_MAEMO),5)
 CFLAGS          += $(MOZ_DBUS_CFLAGS)
--- mozilla-release/xpcom/io/nsLocalFileUnix.cpp.kdemoz	2012-10-24 18:33:37.000000000 +0400
-+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2012-10-30 18:59:47.144829885 +0400
+--- mozilla-release/xpcom/io/nsLocalFileUnix.cpp.kdemoz	2012-11-20 06:46:26.000000000 +0400
+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2012-11-21 20:48:44.557356774 +0400
@@ -54,6 +54,7 @@
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"