From cca0de488610fcbf1320613e1b5f7505aefb90ea Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 2 Sep 2008 09:56:16 +0000 Subject: [PATCH] apply patch to fix regression in khtml --- kdelibs-4.1.1-kde#169447-khtml-regression.patch | 13 +++++++++++++ kdelibs.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.1.1-kde#169447-khtml-regression.patch diff --git a/kdelibs-4.1.1-kde#169447-khtml-regression.patch b/kdelibs-4.1.1-kde#169447-khtml-regression.patch new file mode 100644 index 0000000..7db8926 --- /dev/null +++ b/kdelibs-4.1.1-kde#169447-khtml-regression.patch @@ -0,0 +1,13 @@ +Index: khtml/rendering/render_layer.cpp +=================================================================== +--- khtml/rendering/render_layer.cpp (Revision 855359) ++++ khtml/rendering/render_layer.cpp (Revision 855360) +@@ -397,7 +397,7 @@ + } + } + } +- count = sc->m_negZOrderList ? sc->m_negZOrderList->count() : 0; ++ count = sc->m_posZOrderList ? sc->m_posZOrderList->count() : 0; + if ( count > 0 ) { + needUpdate = true; + for (uint i = 0; i < count; i++) { diff --git a/kdelibs.spec b/kdelibs.spec index cff5a04..b4d3c6b 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.1 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -81,6 +81,7 @@ Patch18: kdelibs-4.1.0-kstandarddirs.patch Patch19: kdelibs-4.1.0-#455130.patch ## upstream patches +Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} @@ -207,6 +208,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch19 -p1 -b .#455130 ## upstream patches +%patch100 -p0 -b .kde#169447-khtml-regression %build @@ -367,6 +369,9 @@ rm -rf %{buildroot} %changelog +* Tue Sep 02 2008 Than Ngo 4.1.1-4 +- apply patch to fix regression in khtml + * Mon Sep 01 2008 Than Ngo 4.1.1-3 - respun