- khtml crasher (kdebug#199557)
This commit is contained in:
parent
a5e81cafd2
commit
c48ed134f0
20
kdelibs-4.3.1-kdebug#199557.patch
Normal file
20
kdelibs-4.3.1-kdebug#199557.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp 2009/07/31 10:31:46 1005095
|
||||||
|
+++ branches/KDE/4.3/kdelibs/kdecore/localization/kencodingdetector.cpp 2009/07/31 10:33:05 1005096
|
||||||
|
@@ -889,7 +889,7 @@
|
||||||
|
const char *autoDetectedEncoding;
|
||||||
|
if ((c1 == 0xFE && c2 == 0xFF) || (c1 == 0xFF && c2 == 0xFE))
|
||||||
|
{
|
||||||
|
- autoDetectedEncoding = "ISO-10646-UCS-2";
|
||||||
|
+ autoDetectedEncoding = "UTF-16";
|
||||||
|
}
|
||||||
|
else if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF)
|
||||||
|
{
|
||||||
|
@@ -908,7 +908,7 @@
|
||||||
|
int nul_count_even = (c2 != 0) + (c4 != 0) + (c6 != 0) + (c8 != 0) + (c10 != 0);
|
||||||
|
int nul_count_odd = (c1 != 0) + (c3 != 0) + (c5 != 0) + (c7 != 0) + (c9 != 0);
|
||||||
|
if ((nul_count_even==0 && nul_count_odd==5) || (nul_count_even==5 && nul_count_odd==0))
|
||||||
|
- autoDetectedEncoding = "ISO-10646-UCS-2";
|
||||||
|
+ autoDetectedEncoding = "UTF-16";
|
||||||
|
else
|
||||||
|
autoDetectedEncoding = 0;
|
||||||
|
}
|
@ -85,6 +85,8 @@ Patch20: kdelibs-4.1.70-cmake.patch
|
|||||||
# 4.3 branch
|
# 4.3 branch
|
||||||
# http://bugs.kde.org/202550
|
# http://bugs.kde.org/202550
|
||||||
Patch100: kdelibs-4.3.1-kdebug#202550.patch
|
Patch100: kdelibs-4.3.1-kdebug#202550.patch
|
||||||
|
# http://bugs.kde.org/199557
|
||||||
|
Patch101: kdelibs-4.3.1-kdebug#199557.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.5.0
|
BuildRequires: qt4-devel >= 4.5.0
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
# qt4%{_?_isa} isn't provided yet -- Rex
|
||||||
@ -220,6 +222,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.3
|
# 4.3
|
||||||
%patch100 -p4 -b .kdebug#202550
|
%patch100 -p4 -b .kdebug#202550
|
||||||
|
%patch101 -p4 -b .kdebug#199557
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -404,6 +407,7 @@ rm -rf %{buildroot}
|
|||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
|
* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
|
||||||
- microblog crashes plasma on show friends toggle (kdebug#202550)
|
- microblog crashes plasma on show friends toggle (kdebug#202550)
|
||||||
|
- khtml crasher (kdebug#199557)
|
||||||
|
|
||||||
* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
|
* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
|
||||||
- 4.3.0
|
- 4.3.0
|
||||||
|
Loading…
Reference in New Issue
Block a user