From b4e0dbd99d0ad296ee17a9f0e6164de3017deafb3f8780da847dfe3fdf69e984 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 26 Nov 2012 11:27:34 +0000 Subject: [PATCH 1/2] - fix KDE integration for file dialogs OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=305 --- MozillaFirefox.changes | 5 +++++ mozilla-kde.patch | 41 +++++++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 1c3c9b2..a0ba145 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 26 11:11:38 UTC 2012 - wr@rosenauer.org + +- fix KDE integration for file dialogs + ------------------------------------------------------------------- Tue Nov 20 19:52:02 UTC 2012 - wr@rosenauer.org diff --git a/mozilla-kde.patch b/mozilla-kde.patch index 5921e97..b3e3cae 100644 --- a/mozilla-kde.patch +++ b/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 - return NS_ERROR_FAILURE; - } +@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn) 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()) -+ return kdeFileDialog(aReturn); ++ // KDE file picker is not handled via callback ++ 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); - if (NS_FAILED(rv)) - return rv; + nsXPIDLCString title; + title.Adopt(ToNewUTF8String(mTitle)); - while (mRunning) { - g_main_context_iteration(nullptr, TRUE); - } + GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); -@@ -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; From 401b2f7bae7f5f7d08a94ad6da0ab0177b23594d9c9c96368d4f4dafa203b26f Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 30 Nov 2012 09:28:25 +0000 Subject: [PATCH 2/2] - 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) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=306 --- MozillaFirefox.changes | 6 +++++- MozillaFirefox.spec | 4 ++-- compare-locales.tar.bz2 | 4 ++-- create-tar.sh | 4 ++-- firefox-17.0-source.tar.bz2 | 3 --- firefox-17.0.1-source.tar.bz2 | 3 +++ l10n-17.0.1.tar.bz2 | 3 +++ l10n-17.0.tar.bz2 | 3 --- source-stamp.txt | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 firefox-17.0-source.tar.bz2 create mode 100644 firefox-17.0.1-source.tar.bz2 create mode 100644 l10n-17.0.1.tar.bz2 delete mode 100644 l10n-17.0.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index a0ba145..9dc9363 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,6 +1,10 @@ ------------------------------------------------------------------- -Mon Nov 26 11:11:38 UTC 2012 - wr@rosenauer.org +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 ------------------------------------------------------------------- diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index f09ee57..547621d 100644 --- a/MozillaFirefox.spec +++ b/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 diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index c44ac12..c37d917 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de3c0cf1d4cecef9e1195fb8f112d995558aa9e9767dac6554fd878f10ed84b5 -size 29941 +oid sha256:9d2e8dad6293d8ff53c6d4a2577f8b018d49475bd77088185ba32d99705992ff +size 29966 diff --git a/create-tar.sh b/create-tar.sh index 17a5c92..438219f 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_RELEASE" -VERSION="17.0" +RELEASE_TAG="FIREFOX_17_0_1_RELEASE" +VERSION="17.0.1" # mozilla echo "cloning $BRANCH..." diff --git a/firefox-17.0-source.tar.bz2 b/firefox-17.0-source.tar.bz2 deleted file mode 100644 index 95b1b72..0000000 --- a/firefox-17.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0956aa518475fa8b6e019efd95cf2d6378c7c5c720db5c23f7c60cb9e34ceac5 -size 92114962 diff --git a/firefox-17.0.1-source.tar.bz2 b/firefox-17.0.1-source.tar.bz2 new file mode 100644 index 0000000..9f7b671 --- /dev/null +++ b/firefox-17.0.1-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d4eab5d653332e0814d2c6a9cad8ac5f5c69aece2f11abef440adda5874f50 +size 92101778 diff --git a/l10n-17.0.1.tar.bz2 b/l10n-17.0.1.tar.bz2 new file mode 100644 index 0000000..ed2a4ad --- /dev/null +++ b/l10n-17.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18552a20adcf62c5cea6b54ca5d5d7829db3b837fd8428635d3a53f4322c14d4 +size 52155540 diff --git a/l10n-17.0.tar.bz2 b/l10n-17.0.tar.bz2 deleted file mode 100644 index cc0ea20..0000000 --- a/l10n-17.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aceaea6943c6ffda95074d701b8ee50eab72ea2a2532c7a9c20f0baa3929d0fb -size 52156353 diff --git a/source-stamp.txt b/source-stamp.txt index 93ec788..e8940b4 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=0af23f8db35d +REV=c23c45132139 REPO=http://hg.mozilla.org/releases/mozilla-release