- kshareddatacache fix for zime shifts, just in time for DST (kde#253795)
This commit is contained in:
parent
612c898d8c
commit
d2a8823cf6
22
kdelibs-4.5.2-kshareddatecache_time.patch
Normal file
22
kdelibs-4.5.2-kshareddatecache_time.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- branches/KDE/4.5/kdelibs/kdecore/util/kshareddatacache.cpp 2010/09/29 02:49:40 1180816
|
||||
+++ branches/KDE/4.5/kdelibs/kdecore/util/kshareddatacache.cpp 2010/10/21 00:17:48 1187999
|
||||
@@ -1156,11 +1156,17 @@
|
||||
IndexTableEntry *entriesIndex = indexTable();
|
||||
|
||||
// Update page table first
|
||||
- uint firstPage = entriesIndex[index].firstPage;
|
||||
- if ((qint32)index != pageTableEntries[firstPage].index) {
|
||||
+ pageID firstPage = entriesIndex[index].firstPage;
|
||||
+ if (firstPage < 0 || firstPage >= pageTableSize()) {
|
||||
+ kError(264) << "Removing" << index << "which is already marked as empty!";
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (index != static_cast<uint>(pageTableEntries[firstPage].index)) {
|
||||
kError(264) << "Removing" << index << "will not work as it is assigned"
|
||||
<< "to page" << firstPage << "which is itself assigned to"
|
||||
<< "entry" << pageTableEntries[firstPage].index << "instead!";
|
||||
+ return;
|
||||
}
|
||||
|
||||
uint entriesToRemove = intCeil(entriesIndex[index].totalItemSize, cachePageSize());
|
@ -12,7 +12,7 @@
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.5.2
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -93,6 +93,8 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
||||
Patch100: kdelibs-4.5.2-comic_applet_kde253387.patch
|
||||
# http://websvn.kde.org/?view=revision&revision=1186278
|
||||
Patch101: kdelibs-4.5.2-kio_krun_services.patch
|
||||
# http://websvn.kde.org/?revision=1187999&view=revision
|
||||
Patch102: kdelibs-4.5.2-kshareddatecache_time.patch
|
||||
|
||||
## trunk upstream
|
||||
Patch150: kdelibs-4.5.2-krun-kde#253294.patch
|
||||
@ -266,6 +268,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
# upstream patches
|
||||
%patch100 -p4 -b .comic_applet_kde253387
|
||||
%patch101 -p4 -b .kio_krun_services
|
||||
%patch102 -p4 -b .kshareddatecache_time
|
||||
%patch150 -p1 -b .kde#253294
|
||||
%patch151 -p3 -b .plasma_wallpaper_configchanged
|
||||
|
||||
@ -512,6 +515,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-8
|
||||
- kshareddatacache fix for zime shifts, just in time for DST (kde#253795)
|
||||
|
||||
* Fri Oct 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-7
|
||||
- backport configChanged() for wallpaper
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user