Accepting request 143652 from mozilla:Factory

- update to Firefox 17.0.1
  * revert some useragent changes introduced in 17.0
  * leaving private browsing with social enabled doesn't reset all
    social components (bmo#815042)
- fix KDE integration for file dialogs

OBS-URL: https://build.opensuse.org/request/show/143652
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=162

MozillaFirefox.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 29 19:56:51 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 17.0.1
+  * revert some useragent changes introduced in 17.0
+  * leaving private browsing with social enabled doesn't reset all
+    social components (bmo#815042)
+- fix KDE integration for file dialogs
+
 -------------------------------------------------------------------
 Tue Nov 20 19:52:02 UTC 2012 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -18,7 +18,7 @@
 
 
 %define major 17
-%define mainver %major.0
+%define mainver %major.0.1
 %define update_channel release
 
 Name:           MozillaFirefox
@@ -54,7 +54,7 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012111600
+%define         releasedate 2012112800
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser

compare-locales.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de3c0cf1d4cecef9e1195fb8f112d995558aa9e9767dac6554fd878f10ed84b5
+oid sha256:9d2e8dad6293d8ff53c6d4a2577f8b018d49475bd77088185ba32d99705992ff
-size 29941
+size 29966

create-tar.sh

@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_17_0_RELEASE"
+RELEASE_TAG="FIREFOX_17_0_1_RELEASE"
-VERSION="17.0"
+VERSION="17.0.1"
 
 # mozilla
 echo "cloning $BRANCH..."

firefox-17.0-source.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0956aa518475fa8b6e019efd95cf2d6378c7c5c720db5c23f7c60cb9e34ceac5
-size 92114962

firefox-17.0.1-source.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36d4eab5d653332e0814d2c6a9cad8ac5f5c69aece2f11abef440adda5874f50
+size 92101778

l10n-17.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18552a20adcf62c5cea6b54ca5d5d7829db3b837fd8428635d3a53f4322c14d4
+size 52155540

l10n-17.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aceaea6943c6ffda95074d701b8ee50eab72ea2a2532c7a9c20f0baa3929d0fb
-size 52156353

mozilla-kde.patch

@@ -3106,27 +3106,40 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -369,16 +373,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
+@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn)
-   return NS_ERROR_FAILURE;
- }
  
  NS_IMETHODIMP
- nsFilePicker::Show(int16_t *aReturn)
+ nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
  {
-   NS_ENSURE_ARG_POINTER(aReturn);
+   // Can't show two dialogs concurrently with the same filepicker
+   if (mRunning)
+     return NS_ERROR_NOT_AVAILABLE;
  
-+  if( nsKDEUtils::kdeSupport())
++  // KDE file picker is not handled via callback
-+    return kdeFileDialog(aReturn);
++  if( nsKDEUtils::kdeSupport()) {
++    int16_t result;
++    mCallback = aCallback;
++    mRunning = true;
++    kdeFileDialog(&result);
++    if (mCallback) {
++      mCallback->Done(result);
++      mCallback = nullptr;
++    } else {
++      mResult = result;
++    }
++    mRunning = false;
++    return NS_OK;
++  }
 +
-   nsresult rv = Open(nullptr);
+   nsXPIDLCString title;
-   if (NS_FAILED(rv))
+   title.Adopt(ToNewUTF8String(mTitle));
-     return rv;
  
-   while (mRunning) {
+   GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
-     g_main_context_iteration(nullptr, TRUE);
-   }
  
-@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
+   const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+                                ? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
+@@ -587,8 +607,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;

source-stamp.txt

@@ -1,2 +1,2 @@
-REV=0af23f8db35d
+REV=c23c45132139
 REPO=http://hg.mozilla.org/releases/mozilla-release