rpms/xulrunner/F-13 mozilla-575836.patch, NONE, 1.1 xulrunner.spec, 1.203, 1.204
Christopher Aillon
caillon at fedoraproject.org
Fri Jul 23 20:30:40 UTC 2010
Author: caillon
Update of /cvs/pkgs/rpms/xulrunner/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2906
Modified Files:
xulrunner.spec
Added Files:
mozilla-575836.patch
Log Message:
* Fri Jul 23 2010 Christopher Aillon <caillon at redhat.com> - 1.9.2.7-2
- Add patch for mozbz#575836 (1.9.2.8)
mozilla-575836.patch:
nsObjectFrame.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE mozilla-575836.patch ---
# HG changeset patch
# User Chris Jones <jones.chris.g at gmail.com>
# Date 1279831451 14400
# Node ID 96ae337c41fbff7c1c96ddca599ee5997ffed406
# Parent 5d60b8125b69637e8e139b3449936f15892f9bdf
Bug 575836: Fix logic here. r=jst r=josh
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -3588,9 +3588,10 @@ nsresult nsPluginInstanceOwner::EnsureCa
// to the bottom of the array if there isn't already a "src" specified.
PRUint16 numRealAttrs = mNumCachedAttrs;
nsAutoString data;
- if (mContent->Tag() == nsGkAtoms::object
- && !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src)
- && mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data)) {
+ if (mContent->Tag() == nsGkAtoms::object &&
+ !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) &&
+ mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data) &&
+ !data.IsEmpty()) {
mNumCachedAttrs++;
}
@@ -3648,7 +3649,7 @@ nsresult nsPluginInstanceOwner::EnsureCa
}
// if the conditions above were met, copy the "data" attribute to a "src" array entry
- if (data.Length()) {
+ if (!data.IsEmpty()) {
mCachedAttrParamNames [nextAttrParamIndex] = ToNewUTF8String(NS_LITERAL_STRING("SRC"));
mCachedAttrParamValues[nextAttrParamIndex] = ToNewUTF8String(data);
nextAttrParamIndex++;
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-13/xulrunner.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- xulrunner.spec 20 Jul 2010 10:43:33 -0000 1.203
+++ xulrunner.spec 23 Jul 2010 20:30:40 -0000 1.204
@@ -16,7 +16,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9.2.7
-Release: 1%{?pretag}%{?dist}
+Release: 2%{?pretag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -42,6 +42,7 @@ Patch20: mozilla-192-pkgconfig.pa
# Upstream patches
Patch100: mozilla-ps-pdf-simplify-operators.patch
+Patch101: mozilla-575836.patch
# ---------------------------------------------------
@@ -136,6 +137,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
%patch20 -p1 -b .pk
%patch100 -p1 -b .ps-pdf-simplify-operators
+%patch101 -p1 -b .575836
%{__rm} -f .mozconfig
@@ -434,6 +436,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Fri Jul 23 2010 Christopher Aillon <caillon at redhat.com> - 1.9.2.7-2
+- Add patch for mozbz#575836 (1.9.2.8)
+
* Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.7-1
- Update to 1.9.2.7
More information about the scm-commits
mailing list