# HG changeset patch # User Wolfgang Rosenauer # Date 1299360235 -3600 # Node ID a4f5954df3a35866cd1cddd5cd11a8a5dc3e5fbf # Parent 156406e2b62d81969c318ef3a78bfc6549a2592c update for 2.0/4.0rc1 diff -r 156406e2b62d -r a4f5954df3a3 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Tue Mar 01 09:58:05 2011 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Sat Mar 05 22:23:55 2011 +0100 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 4 15:18:17 UTC 2011 - wr@rosenauer.org + +- update to version 4.0rc1 + ------------------------------------------------------------------- Wed Feb 23 07:52:04 UTC 2011 - wr@rosenauer.org diff -r 156406e2b62d -r a4f5954df3a3 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Tue Mar 01 09:58:05 2011 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Mar 05 22:23:55 2011 +0100 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 4.0b12) +# spec file for package MozillaFirefox # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -31,15 +31,15 @@ BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b12 +BuildRequires: %{xulrunner}-devel = 2.0.0 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: %{mainver}b12 +Version: %{mainver}.0 Release: 1 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} -%define releasedate 2011022200 +%define releasedate 2011030400 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers diff -r 156406e2b62d -r a4f5954df3a3 mozilla-gecko-version.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-gecko-version.patch Sat Mar 05 22:23:55 2011 +0100 @@ -0,0 +1,16 @@ +# HG changeset patch +# Parent 7d3dc831fb0c3282bda0e5da3f7965e6422ee294 +diff --git a/config/milestone.txt b/config/milestone.txt +--- a/config/milestone.txt ++++ b/config/milestone.txt +@@ -5,9 +5,9 @@ + # x.x.x.x + # x.x.x+ + # + # Referenced by milestone.pl. + # Hopefully I'll be able to automate replacement of *all* + # hardcoded milestones in the tree from these two files. + #-------------------------------------------------------- + +-2.0 ++2.0.0 diff -r 156406e2b62d -r a4f5954df3a3 mozilla-gio-launch-uri.patch --- a/mozilla-gio-launch-uri.patch Tue Mar 01 09:58:05 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -# HG changeset patch -# Parent 689e53e965fdd8c76354a69fa936a3fd4f07a220 - -diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ---- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -53,16 +53,18 @@ - #include "nsContentHandlerApp.h" - #endif - #endif - - #include "nsMIMEInfoUnix.h" - #include "nsCommonRegistry.h" - #include "nsIGIOService.h" - #include "nsIGnomeVFSService.h" -+#include "nsNetCID.h" -+#include "nsIIOService.h" - #include "nsAutoPtr.h" - #ifdef MOZ_ENABLE_DBUS - #include "nsDBusHandlerApp.h" - #endif - #if defined(XP_UNIX) && !defined(XP_MACOSX) - #include "nsKDEUtils.h" - #endif - -@@ -172,38 +174,50 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns - } - if (!mDefaultApplication) - return NS_ERROR_FILE_NOT_FOUND; - - return LaunchWithIProcess(mDefaultApplication, nativePath); - } - - nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); -+ nsCAutoString uriSpec; -+ if (giovfs) { -+ // nsGIOMimeApp->Launch wants a URI string instead of local file -+ nsresult rv; -+ nsCOMPtr ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ nsCOMPtr uri; -+ rv = ioservice->NewFileURI(aFile, getter_AddRefs(uri)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ uri->GetSpec(uriSpec); -+ } -+ - nsCOMPtr gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - if (giovfs) { - nsCOMPtr app; - if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) -- return app->Launch(nativePath); -+ return app->Launch(uriSpec); - } else if (gnomevfs) { - /* Fallback to GnomeVFS */ - nsCOMPtr app; - if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) - return app->Launch(nativePath); - } - - // If we haven't got an app we try to get a valid one by searching for the - // extension mapped type - nsRefPtr mimeInfo = nsCommonRegistry::GetFromExtension(nativePath); - if (mimeInfo) { - nsCAutoString type; - mimeInfo->GetType(type); - if (giovfs) { - nsCOMPtr app; - if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) -- return app->Launch(nativePath); -+ return app->Launch(uriSpec); - } else if (gnomevfs) { - nsCOMPtr app; - if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) - return app->Launch(nativePath); - } - } - - if (!mDefaultApplication) diff -r 156406e2b62d -r a4f5954df3a3 mozilla-kde.patch --- a/mozilla-kde.patch Tue Mar 01 09:58:05 2011 +0100 +++ b/mozilla-kde.patch Sat Mar 05 22:23:55 2011 +0100 @@ -2945,7 +2945,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,28 +50,31 @@ +@@ -50,30 +50,33 @@ #include #if (MOZ_ENABLE_CONTENTACTION) #include @@ -2957,6 +2957,8 @@ -#include "nsGNOMERegistry.h" +#include "nsCommonRegistry.h" #include "nsIGIOService.h" + #include "nsNetCID.h" + #include "nsIIOService.h" #include "nsIGnomeVFSService.h" #include "nsAutoPtr.h" #ifdef MOZ_ENABLE_DBUS @@ -2979,7 +2981,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3004,7 +3006,7 @@ if (*_retval) return NS_OK; -@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3031,12 +3033,14 @@ + } + nsCOMPtr giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + nsCAutoString uriSpec; if (giovfs) { - nsCOMPtr app; - if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) - return app->Launch(nativePath); - } else if (gnomevfs) { + // nsGIOMimeApp->Launch wants a URI string instead of local file + nsresult rv; + nsCOMPtr ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr uri; +@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3053,7 +3057,7 @@ if (giovfs) { nsCOMPtr app; if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) - return app->Launch(nativePath); + return app->Launch(uriSpec); } else if (gnomevfs) { diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp diff -r 156406e2b62d -r a4f5954df3a3 mozilla-xulrunner20/create-tar.sh --- a/mozilla-xulrunner20/create-tar.sh Tue Mar 01 09:58:05 2011 +0100 +++ b/mozilla-xulrunner20/create-tar.sh Sat Mar 05 22:23:55 2011 +0100 @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b12_RELEASE" -VERSION="2.0b12" +BRANCH="releases/mozilla-2.0" +RELEASE_TAG="FIREFOX_4_0rc1_RELEASE" +VERSION="2.0.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff -r 156406e2b62d -r a4f5954df3a3 mozilla-xulrunner20/mozilla-gecko-version.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-xulrunner20/mozilla-gecko-version.patch Sat Mar 05 22:23:55 2011 +0100 @@ -0,0 +1,1 @@ +../mozilla-gecko-version.patch \ No newline at end of file diff -r 156406e2b62d -r a4f5954df3a3 mozilla-xulrunner20/mozilla-gio-launch-uri.patch --- a/mozilla-xulrunner20/mozilla-gio-launch-uri.patch Tue Mar 01 09:58:05 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-gio-launch-uri.patch \ No newline at end of file diff -r 156406e2b62d -r a4f5954df3a3 mozilla-xulrunner20/mozilla-xulrunner20.changes --- a/mozilla-xulrunner20/mozilla-xulrunner20.changes Tue Mar 01 09:58:05 2011 +0100 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.changes Sat Mar 05 22:23:55 2011 +0100 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Mon Feb 28 12:03:35 UTC 2011 - wr@rosenauer.org +Fri Mar 4 15:16:56 UTC 2011 - wr@rosenauer.org +- update to 2.0rc1 - set useragent buildid to branded Firefox default +- removed upstreamed mozilla-gio-launch-uri.patch ------------------------------------------------------------------- Wed Feb 23 07:51:12 UTC 2011 - wr@rosenauer.org diff -r 156406e2b62d -r a4f5954df3a3 mozilla-xulrunner20/mozilla-xulrunner20.spec --- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Tue Mar 01 09:58:05 2011 +0100 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Sat Mar 05 22:23:55 2011 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner20 (Version 2.0b12) +# spec file for package mozilla-xulrunner20 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -30,12 +30,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 2.0b12 +Version: 2.0.0 Release: 1 -%define releasedate 2011022200 -%define version_internal 2.0b12 +%define releasedate 2011030400 +%define version_internal 2.0.0 %define apiversion 2.0 -%define uaweight 199900 +%define uaweight 200000 Summary: Mozilla Runtime Environment 2.0 Url: http://www.mozilla.org Group: Productivity/Other @@ -73,8 +73,8 @@ Patch12: mozilla-language.patch Patch13: mozilla-gio.patch Patch14: mozilla-cairo-return.patch -Patch15: mozilla-gio-launch-uri.patch -Patch16: mozilla-ntlm-full-path.patch +Patch15: mozilla-ntlm-full-path.patch +Patch16: mozilla-gecko-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js20 = %{version} Requires(post): update-alternatives coreutils @@ -182,9 +182,9 @@ Requires(post): coreutils %description gnome -This subpackage contains the Necko Gnome-VFS and Gnome components which -rely on the gnome-vfs subsystem to be installed. They are recommended -for full desktop integration but not mandatory for small disk footprint +This subpackage contains the Gnome components which rely on certain +Gnome subsystems to be installed. They are recommended for full +desktop integration but not mandatory for small disk footprint KDE installations for example. diff -r 156406e2b62d -r a4f5954df3a3 series --- a/series Tue Mar 01 09:58:05 2011 +0100 +++ b/series Sat Mar 05 22:23:55 2011 +0100 @@ -14,8 +14,8 @@ mozilla-language.patch mozilla-gio.patch mozilla-cairo-return.patch -mozilla-gio-launch-uri.patch mozilla-ntlm-full-path.patch +mozilla-gecko-version.patch # Firefox patches firefox-linkorder.patch