diff --git a/.gitignore b/.gitignore index 020fc01..f875a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ xulrunner-1.9.1.9.source.tar.bz2 xulrunner-1.9.1.10.source.tar.bz2 xulrunner-1.9.1.11.source.tar.bz2 +/xulrunner-1.9.1.12.source.tag.bz2 +/xulrunner-1.9.1.12.source.tar.bz2 diff --git a/mozilla-575836.patch b/mozilla-575836.patch deleted file mode 100644 index 5f21e7b..0000000 --- a/mozilla-575836.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Chris Jones -# Date 1279837785 14400 -# Node ID 2f748ad22bbbf50c47fb0783e8f948917f3e8990 -# Parent 3e8356d36728e61162b9d02b54676aef7b07f178 -Bug 575836: Fix logic here. r=jst r=josh a=beltzner - -diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp ---- a/layout/generic/nsObjectFrame.cpp -+++ b/layout/generic/nsObjectFrame.cpp -@@ -3144,9 +3144,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++; - } - -@@ -3194,7 +3195,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++; - - diff --git a/sources b/sources index f80c8c6..6c2a41c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be1b607d3f610d6c07322859b65ed494 xulrunner-1.9.1.11.source.tar.bz2 +bd1e27ef2494954dd920dede9165e9db xulrunner-1.9.1.12.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 76a3443..97a6715 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -14,8 +14,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.1.11 -Release: 2%{?dist} +Version: 1.9.1.12 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -41,7 +41,6 @@ Patch10: mozilla-191-pkgconfig.patch # Upstream patches Patch100: mozilla-ps-pdf-simplify-operators.patch Patch101: xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch -Patch102: mozilla-575836.patch # --------------------------------------------------- @@ -168,8 +167,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch100 -p1 -b .ps-pdf-simplify-operators %patch101 -p2 -b .sparc-linux-sync_instruction_memory -%patch102 -p1 -b .575837 - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -483,6 +480,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Sep 6 2010 Jan Horak - 1.9.1.12-1 +- Update to 1.9.1.12 + * Fri Jul 23 2010 Christopher Aillon - 1.9.1.11-2 - Add patch for mozbz#575836 (1.9.1.12)