diff --git a/mozilla-817533.patch b/mozilla-817533.patch deleted file mode 100644 index 11d1bb7..0000000 --- a/mozilla-817533.patch +++ /dev/null @@ -1,32 +0,0 @@ -# HG changeset patch -# Parent d09a5a5666baa44c817a4e1e463ef62eae0a1105 -# User Patrick McManus -bug 817533 - failed system proxy lookups should not fallback to manual configs r?jduell - -diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp ---- a/netwerk/base/src/nsProtocolProxyService.cpp -+++ b/netwerk/base/src/nsProtocolProxyService.cpp -@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal - - // Proxy auto config magic... - if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { - // Do not query PAC now. - *usePACThread = true; - return NS_OK; - } - -- // proxy info values -+ // If we aren't in manual proxy configuration mode then we don't -+ // want to honor any manual specific prefs that might be still set -+ if (mProxyConfig != PROXYCONFIG_MANUAL) -+ return NS_OK; -+ -+ // proxy info values for manual configuration mode - const char *type = nullptr; - const nsACString *host = nullptr; - int32_t port = -1; - - uint32_t proxyFlags = 0; - - if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && - !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { diff --git a/mozilla-860213.patch b/mozilla-860213.patch deleted file mode 100644 index 5c25541..0000000 --- a/mozilla-860213.patch +++ /dev/null @@ -1,69 +0,0 @@ -# HG changeset patch -# Parent 9cf679827fae794995f0d35030ad3fb4c7a6e6a8 -# User Jan Horak -# Bug 860213 - Use async version of g_file_set_attribute to set file metadata, removes UI block when dbus timeout. - -diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp ---- a/toolkit/components/downloads/nsDownloadManager.cpp -+++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -2520,16 +2520,30 @@ nsDownload::nsDownload() : mDownloadStat - mAutoResume(DONT_RESUME) - { - } - - nsDownload::~nsDownload() - { - } - -+#ifdef MOZ_ENABLE_GIO -+static void gio_set_metadata_done(GObject *source_obj, GAsyncResult *res, gpointer user_data) -+{ -+ GError *err = NULL; -+ g_file_set_attributes_finish(G_FILE(source_obj), res, NULL, &err); -+ if (err) { -+#ifdef DEBUG -+ NS_DebugBreak(NS_DEBUG_WARNING, "Set file metadata failed: ", err->message, __FILE__, __LINE__); -+#endif -+ g_error_free(err); -+ } -+} -+#endif -+ - nsresult - nsDownload::SetState(DownloadState aState) - { - NS_ASSERTION(mDownloadState != aState, - "Trying to set the download state to what it already is set to!"); - - int16_t oldState = mDownloadState; - mDownloadState = aState; -@@ -2665,21 +2679,24 @@ nsDownload::SetState(DownloadState aStat - } - #endif - } - #ifdef MOZ_ENABLE_GIO - // Use GIO to store the source URI for later display in the file manager. - GFile* gio_file = g_file_new_for_path(NS_ConvertUTF16toUTF8(path).get()); - nsCString source_uri; - mSource->GetSpec(source_uri); -- -- g_file_set_attribute(gio_file, "metadata::download-uri", -- G_FILE_ATTRIBUTE_TYPE_STRING, -- (gpointer)source_uri.get(), -- G_FILE_QUERY_INFO_NONE, NULL, NULL); -+ GFileInfo *file_info = g_file_info_new(); -+ g_file_info_set_attribute_string(file_info, "metadata::download-uri", source_uri.get()); -+ g_file_set_attributes_async(gio_file, -+ file_info, -+ G_FILE_QUERY_INFO_NONE, -+ G_PRIORITY_DEFAULT, -+ NULL, gio_set_metadata_done, NULL); -+ g_object_unref(file_info); - g_object_unref(gio_file); - #endif - } - #endif - #ifdef XP_MACOSX - // On OS X, make the downloads stack bounce. - CFStringRef observedObject = ::CFStringCreateWithCString(kCFAllocatorDefault, - NS_ConvertUTF16toUTF8(path).get(), diff --git a/xulrunner.spec b/xulrunner.spec index 31cf086..5ce6b2f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 22.0 -Release: 7%{?pre_tag}%{?dist} +Version: 23.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -104,9 +104,7 @@ Patch21: rhbz-911314.patch Patch24: rhbz-966424.patch # Upstream patches -Patch105: mozilla-817533.patch Patch106: mozilla-831688.patch -Patch107: mozilla-860213.patch # --------------------------------------------------- @@ -247,9 +245,7 @@ cd %{tarballdir} %endif %patch24 -p1 -b .966424 -%patch105 -p1 -b .817533 %patch106 -p1 -b .831688 -%patch107 -p1 -b .860213 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -530,6 +526,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Jul 25 2013 Martin Stransky - 23.0-1 +- Update to latest upstream (23.0) + * Mon Jul 29 2013 Jan Horak - 22.0-7 - Use system libffi for Fedora 19+ - Added fix for mozbz#860213