rpms/firefox/devel firefox-2.0.0.4-undo-uriloader.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 firefox.spec, 1.181, 1.182 sources, 1.37, 1.38 firefox-1.5-dnd-nograb.patch, 1.1, NONE firefox-1.5-embedwindow-visibility.patch, 1.1, NONE firefox-1.5-gtk-key-theme-crash.patch, 1.1, NONE
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Fri May 25 17:57:44 UTC 2007
- Previous message (by thread): rpms/Pound/F-7 .cvsignore, 1.14, 1.15 Pound.spec, 1.14, 1.15 sources, 1.14, 1.15
- Next message (by thread): rpms/anaconda/F-7 .cvsignore, 1.418, 1.419 anaconda.spec, 1.550, 1.551 sources, 1.543, 1.544
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22448
Modified Files:
.cvsignore firefox.spec sources
Added Files:
firefox-2.0.0.4-undo-uriloader.patch
Removed Files:
firefox-1.5-dnd-nograb.patch
firefox-1.5-embedwindow-visibility.patch
firefox-1.5-gtk-key-theme-crash.patch
Log Message:
* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc3
- Update to 2.0.0.4 RC3
firefox-2.0.0.4-undo-uriloader.patch:
--- NEW FILE firefox-2.0.0.4-undo-uriloader.patch ---
Index: mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
retrieving revision 1.58.20.1
retrieving revision 1.58
diff -d -u -p -r1.58.20.1 -r1.58
--- mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 16 Apr 2007 18:54:53 -0000 1.58.20.1
+++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58
@@ -1506,8 +1506,13 @@ nsOSHelperAppService::GetFromType(const
nsDependentSubstring majorType(majorTypeStart, majorTypeEnd);
nsDependentSubstring minorType(minorTypeStart, minorTypeEnd);
+ nsAutoString extensions, mime_types_description;
+ LookUpExtensionsAndDescription(majorType,
+ minorType,
+ extensions,
+ mime_types_description);
+
- // First check the user's private mailcap file
nsAutoString mailcap_description, handler, mozillaFlags;
DoLookUpHandlerAndDescription(majorType,
minorType,
@@ -1516,46 +1521,23 @@ nsOSHelperAppService::GetFromType(const
mailcap_description,
mozillaFlags,
PR_TRUE);
-
- LOG(("Private Handler/Description results: handler='%s', description='%s'\n",
- NS_LossyConvertUTF16toASCII(handler).get(),
- NS_LossyConvertUTF16toASCII(mailcap_description).get()));
+
+ if (handler.IsEmpty() && extensions.IsEmpty() &&
+ mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) {
+ // No useful data yet
+
#ifdef MOZ_WIDGET_GTK2
- nsMIMEInfoBase *gnomeInfo = nsnull;
- if (handler.IsEmpty()) {
- // No useful data yet. Check the GNOME registry. Unfortunately, newer
- // GNOME versions no longer have type-to-extension mappings, so we might
- // get back a MIMEInfo without any extensions set. In that case we'll have
- // to look in our mime.types files for the extensions.
LOG(("Looking in GNOME registry\n"));
- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
- if (gnomeInfo && gnomeInfo->HasExtensions()) {
- LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
+ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+ if (gnomeInfo) {
+ LOG(("Got MIMEInfo from GNOME registry\n"));
return gnomeInfo;
}
- }
#endif
-
- // Now look up our extensions
- nsAutoString extensions, mime_types_description;
- LookUpExtensionsAndDescription(majorType,
- minorType,
- extensions,
- mime_types_description);
-
-#ifdef MOZ_WIDGET_GTK2
- if (gnomeInfo) {
- LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
- "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
-
- NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
- gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
- return gnomeInfo;
}
-#endif
- if (handler.IsEmpty()) {
+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
DoLookUpHandlerAndDescription(majorType,
minorType,
typeOptions,
@@ -1565,7 +1547,7 @@ nsOSHelperAppService::GetFromType(const
PR_FALSE);
}
- if (handler.IsEmpty()) {
+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
DoLookUpHandlerAndDescription(majorType,
NS_LITERAL_STRING("*"),
typeOptions,
@@ -1575,7 +1557,7 @@ nsOSHelperAppService::GetFromType(const
PR_TRUE);
}
- if (handler.IsEmpty()) {
+ if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
DoLookUpHandlerAndDescription(majorType,
NS_LITERAL_STRING("*"),
typeOptions,
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 21 Mar 2007 02:40:12 -0000 1.33
+++ .cvsignore 25 May 2007 17:57:09 -0000 1.34
@@ -1,2 +1,2 @@
-firefox-langpacks-2.0.0.3-20070320.tar.bz2
-firefox-2.0.0.3-source.tar.bz2
+firefox-2.0.0.4-source.tar.bz2
+firefox-langpacks-2.0.0.4-20070523.tar.bz2
Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- firefox.spec 17 Apr 2007 21:47:36 -0000 1.181
+++ firefox.spec 25 May 2007 17:57:09 -0000 1.182
@@ -11,8 +11,8 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
-Version: 2.0.0.3
-Release: 4%{?dist}
+Version: 2.0.0.4
+Release: 0.rc3%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
@@ -22,7 +22,7 @@
%define tarball firefox-2.0rc3-source.tar.bz2
%endif
Source0: %{tarball}
-Source2: firefox-langpacks-%{version}-20070320.tar.bz2
+Source2: firefox-langpacks-%{version}-20070523.tar.bz2
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
Source12: firefox-redhat-default-prefs.js
@@ -52,6 +52,7 @@
# local bugfixes
Patch40: firefox-1.5-bullet-bill.patch
+Patch41: firefox-2.0.0.4-undo-uriloader.patch
Patch42: firefox-1.1-uriloader.patch
# font system fixes
@@ -61,10 +62,7 @@
Patch84: firefox-2.0-pango-printing.patch
# Other
-Patch100: firefox-1.5-gtk-key-theme-crash.patch
-Patch101: firefox-1.5-embedwindow-visibility.patch
Patch102: firefox-1.5-theme-change.patch
-Patch103: firefox-1.5-dnd-nograb.patch
Patch104: firefox-1.5-ppc64.patch
%if %{official_branding}
@@ -152,16 +150,14 @@
#%patch26 -p0
#%patch27 -p1
%patch40 -p1 -b .bullet-bill
+%patch41 -p1 -b .undo-uriloader
%patch42 -p0 -b .uriloader
%patch81 -p1 -b .nopangoxft
#%patch82 -p1 -b .pango-mathml
%patch83 -p1 -b .pango-cursor-position
%patch84 -p0 -b .pango-printing
-#%patch100 -p0 -b .gtk-key-theme-crash
-%patch101 -p0 -b .embedwindow-visibility
%patch102 -p0 -b .theme-change
-#%patch103 -p1 -b .dnd-nograb
%patch104 -p1 -b .ppc64
# For branding specific patches.
@@ -420,6 +416,9 @@
#---------------------------------------------------------------------
%changelog
+* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc3
+- Update to 2.0.0.4 RC3
+
* Tue Apr 17 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-4
- Fix permissions of the man page
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 21 Mar 2007 02:40:12 -0000 1.37
+++ sources 25 May 2007 17:57:09 -0000 1.38
@@ -1,2 +1,2 @@
-775913a54f9aae0020947284a6f63cf6 firefox-langpacks-2.0.0.3-20070320.tar.bz2
-24398e3d98673a2a92a01a8f771ca12a firefox-2.0.0.3-source.tar.bz2
+99c14794976b2532addfcd2d836c6bb2 firefox-2.0.0.4-source.tar.bz2
+6356fb7701c91e5dfa38f2aecf4eb156 firefox-langpacks-2.0.0.4-20070523.tar.bz2
--- firefox-1.5-dnd-nograb.patch DELETED ---
--- firefox-1.5-embedwindow-visibility.patch DELETED ---
--- firefox-1.5-gtk-key-theme-crash.patch DELETED ---
- Previous message (by thread): rpms/Pound/F-7 .cvsignore, 1.14, 1.15 Pound.spec, 1.14, 1.15 sources, 1.14, 1.15
- Next message (by thread): rpms/anaconda/F-7 .cvsignore, 1.418, 1.419 anaconda.spec, 1.550, 1.551 sources, 1.543, 1.544
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list