* Fri Feb 12 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-5

- khtml_scrolling patch
- drop khtml_svg_no_var_tracking_assignments patch
This commit is contained in:
Rex Dieter 2010-02-12 16:49:50 +00:00
parent d38683ca2c
commit 94a35b3080
2 changed files with 43 additions and 5 deletions

View File

@ -0,0 +1,32 @@
SVN commit 1089160 by ggarand:
automatically merged revision 1089159:
Critical performance fix:
There is a huge difference of behaviour between DEBUG and RELEASE
builds of Qt 4.6, that breaks scrolling in KHTML.
Using QWidget::scroll() on a widget that doesn't have WA_OpaquePaintEvent
attribute set works just fine in Debug, but completely breaks down in
Release, causing the whole view to get repainted always.
CCMAIL: kde-packager@kde.org
M +6 -0 khtmlview.cpp
--- branches/KDE/4.4/kdelibs/khtml/khtmlview.cpp #1089159:1089160
@@ -604,6 +604,12 @@
setWidget( new QWidget(this) );
widget()->setAttribute( Qt::WA_NoSystemBackground );
+ // Do *not* remove this attribute frivolously.
+ // You might not notice a change of behaviour in Debug builds
+ // but removing opaque events will make QWidget::scroll fail horribly
+ // in Release builds.
+ widget()->setAttribute( Qt::WA_OpaquePaintEvent );
+
verticalScrollBar()->setCursor( Qt::ArrowCursor );
horizontalScrollBar()->setCursor( Qt::ArrowCursor );

View File

@ -1,14 +1,14 @@
%define attica_ver 0.1.2
%define phonon_ver 4.3.80
%define soprano_ver 2.3.70
%define soprano_ver 2.4.0
%define strigi_ver 0.7.1
# to build/include apidocs or not
%define apidocs 1
Summary: KDE Libraries
Version: 4.4.0
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -90,6 +90,7 @@ Patch27: kdelibs-4.3.98-no_rpath.patch
# upstreamable
# 4.4 upstream
Patch100: kdelibs-4.4.0-khtml_scrolling.patch
# security fix
## Not Upstreamed? why not ? -- Rex
@ -232,14 +233,15 @@ format for easy browsing.
%if 0%{?rhel} > 5
%patch24 -p1 -b .drkonq
%endif
%if 0%{?fedora} > 11
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
%endif
#if 0%{?fedora} > 11
#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
#endif
%patch27 -p1 -b .no_rpath
# upstreamable patches
# upstream patches
%patch100 -p4 -b .khtml_scrolling
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -431,6 +433,10 @@ rm -rf %{buildroot}
%changelog
* Fri Feb 12 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-5
- khtml_scrolling patch
- drop khtml_svg_no_var_tracking_assignments patch
* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-4
- depend on version of phonon,strigi,soprano built against