Contents of /trunk/mozilla-firefox/patches/mozilla-firefox-11.0-fix-disabled-ogg-ftbfs.patch
Parent Directory | Revision Log
Revision 1734 -
(show annotations)
(download)
Wed Apr 11 13:45:43 2012 UTC (12 years, 5 months ago) by niro
File size: 2966 byte(s)
Wed Apr 11 13:45:43 2012 UTC (12 years, 5 months ago) by niro
File size: 2966 byte(s)
-added patch to fix ftbfs with disabled ogg support
1 | diff -Naur '--exclude=*.orig' '--exclude=.mozconfig' '--exclude=configure' '--exclude=*.mk' '--exclude=*.pyc' mozilla-release/content/html/document/src/nsHTMLContentSink.cpp mozilla-release-magellan/content/html/document/src/nsHTMLContentSink.cpp |
2 | --- mozilla-release/content/html/document/src/nsHTMLContentSink.cpp 2012-03-13 02:36:41.000000000 +0100 |
3 | +++ mozilla-release-magellan/content/html/document/src/nsHTMLContentSink.cpp 2012-04-11 15:38:14.466982524 +0200 |
4 | @@ -808,8 +808,8 @@ |
5 | break; |
6 | |
7 | case eHTMLTag_button: |
8 | - case eHTMLTag_audio: |
9 | - case eHTMLTag_video: |
10 | +// case eHTMLTag_audio: |
11 | +// case eHTMLTag_video: |
12 | content->DoneCreatingElement(); |
13 | break; |
14 | |
15 | diff -Naur '--exclude=*.orig' '--exclude=.mozconfig' '--exclude=configure' '--exclude=*.mk' '--exclude=*.pyc' mozilla-release/content/xml/document/src/nsXMLContentSink.cpp mozilla-release-magellan/content/xml/document/src/nsXMLContentSink.cpp |
16 | --- mozilla-release/content/xml/document/src/nsXMLContentSink.cpp 2012-03-13 02:36:44.000000000 +0100 |
17 | +++ mozilla-release-magellan/content/xml/document/src/nsXMLContentSink.cpp 2012-04-11 15:47:38.549982523 +0200 |
18 | @@ -1077,9 +1077,10 @@ |
19 | if (nodeInfo->NamespaceID() == kNameSpaceID_XHTML) { |
20 | if (nodeInfo->NameAtom() == nsGkAtoms::input || |
21 | nodeInfo->NameAtom() == nsGkAtoms::button || |
22 | - nodeInfo->NameAtom() == nsGkAtoms::menuitem || |
23 | - nodeInfo->NameAtom() == nsGkAtoms::audio || |
24 | - nodeInfo->NameAtom() == nsGkAtoms::video) { |
25 | + nodeInfo->NameAtom() == nsGkAtoms::menuitem) { |
26 | + //nodeInfo->NameAtom() == nsGkAtoms::menuitem || |
27 | + //nodeInfo->NameAtom() == nsGkAtoms::audio || |
28 | + //nodeInfo->NameAtom() == nsGkAtoms::video) { |
29 | content->DoneCreatingElement(); |
30 | } else if (nodeInfo->NameAtom() == nsGkAtoms::head && !mCurrentHead) { |
31 | mCurrentHead = content; |
32 | diff -Naur '--exclude=*.orig' '--exclude=.mozconfig' '--exclude=configure' '--exclude=*.mk' '--exclude=*.pyc' mozilla-release/content/xslt/src/xslt/txMozillaXMLOutput.cpp mozilla-release-magellan/content/xslt/src/xslt/txMozillaXMLOutput.cpp |
33 | --- mozilla-release/content/xslt/src/xslt/txMozillaXMLOutput.cpp 2012-03-13 02:36:44.000000000 +0100 |
34 | +++ mozilla-release-magellan/content/xslt/src/xslt/txMozillaXMLOutput.cpp 2012-04-11 15:51:59.674982523 +0200 |
35 | @@ -338,9 +338,10 @@ |
36 | } else if (ns == kNameSpaceID_XHTML && |
37 | (localName == nsGkAtoms::input || |
38 | localName == nsGkAtoms::button || |
39 | - localName == nsGkAtoms::menuitem || |
40 | - localName == nsGkAtoms::audio || |
41 | - localName == nsGkAtoms::video )) { |
42 | + localName == nsGkAtoms::menuitem )) { |
43 | + //localName == nsGkAtoms::menuitem || |
44 | + //localName == nsGkAtoms::audio || |
45 | + //localName == nsGkAtoms::video )) { |
46 | element->DoneCreatingElement(); |
47 | } |
48 | } |
49 |