Compare commits

...

17 Commits

Author SHA1 Message Date
Rex Dieter 36d1aa2f4f * Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.5-2
- Requires: oxygen-icon-theme (ensures default fallback is present)
- up attica,phonon,strigi min deps
2010-07-16 13:59:17 +00:00
Than Ngo fad363a8e6 4.4.4 2010-05-30 15:15:39 +00:00
Rex Dieter 11d4f8b520 sync w/devel 2010-05-16 18:48:52 +00:00
Than Ngo aa3a8d524d respin 2010-05-05 10:14:41 +00:00
Rex Dieter db7c7267ae * Fri Apr 30 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.3-1
- 4.4.3
2010-04-30 19:16:43 +00:00
Rex Dieter e04f4f7282 * Sat Apr 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-4
- fix kidletime (kde#231628,kde#227279,kde#218468)
- kate part ignores japanese input from input method (#585242,kde#206455)
2010-04-24 20:46:43 +00:00
Rex Dieter 70455ce4be * Thu Apr 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-3
- cleanup/fix webkitkde Obsoletes a bit more (#582469)
- (Build)Requies: cmake >= 2.6.4
2010-04-15 12:08:22 +00:00
Rex Dieter 651086dfb3 * Fri Apr 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-2
- Obsoletes: webkitkde < 0.0.6 (#576634)
2010-04-13 15:23:50 +00:00
Rex Dieter af07ff83ea sync w/devel branch for 4.4.2 goodness 2010-04-02 15:40:15 +00:00
Rex Dieter 0bdfff2747 * Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-9
- refresh kdelibs-4.4.2-kpixmapcache.patch
2010-03-25 14:15:00 +00:00
Rex Dieter 8a400538e9 * Sat Mar 20 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-7
- KDE default in noisy debug mode to stdout/stderr (kde#227089)
- backport trunk/ fix building against qt-4.7
2010-03-20 14:33:33 +00:00
Lukas Tinkl b4956f6eef fix crash in kpixmapcache (#568389) 2010-03-17 13:04:54 +00:00
Rex Dieter f1887a3a54 * Tue Mar 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-4
- Requires: hal (for solid)
- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace)
- drop Requires: coreutils grep (F-12+)
- make Requires: kdelibs-common versioned
2010-03-10 02:10:55 +00:00
Lukas Tinkl 6ac872d787 KDE 4.4.1 2010-03-02 14:12:52 +00:00
Rex Dieter 3ba941973f * Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-1
- 4.4.1
2010-02-28 14:10:27 +00:00
Rex Dieter 159370a095 * Fri Feb 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-9
- -devel: Provides: nepomuk-devel, Requires: soprano-devel
2010-02-19 17:37:55 +00:00
Jesse Keating 9d3e009191 Initialize branch F-13 for kdelibs 2010-02-17 01:45:06 +00:00
11 changed files with 305 additions and 201 deletions

View File

@ -1 +1,2 @@
kdelibs-4.4.0.tar.bz2 kdelibs-4.4.3.tar.bz2
kdelibs-4.4.4.tar.bz2

1
branch Normal file
View File

@ -0,0 +1 @@
F-13

View File

@ -1,11 +0,0 @@
diff -up kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames kdelibs-4.3.3/khtml/CMakeLists.txt
--- kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames 2009-08-27 03:19:09.000000000 -0500
+++ kdelibs-4.3.3/khtml/CMakeLists.txt 2009-11-13 17:43:07.618002091 -0600
@@ -194,6 +194,7 @@ set(khtmldom_STAT_SRCS
)
#set_source_files_properties(${khtmldom_STAT_SRCS} PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
+set_source_files_properties(${khtmlsvg_STAT_SRCS} PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
# khtml/misc/Makefile.am: khtmlmisc

View File

@ -1,32 +0,0 @@
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,15 +0,0 @@
Index: plasma/runnercontext.cpp
===================================================================
--- plasma/runnercontext.cpp (Revision 1090801)
+++ plasma/runnercontext.cpp (Revision 1090802)
@@ -128,6 +128,10 @@
components.pop_back();
}
+ if (components.isEmpty()) {
+ return true;
+ }
+
QString correctPath;
const unsigned initialComponents = components.size();
for (unsigned i = 0; i < initialComponents - 1; i ++) {

View File

@ -1,23 +0,0 @@
SVN commit 1087530 by trueg:
Backport of mem/dbus connection leak.
CCMAIL: faure@kde.org, release-team@kde.org, thiago@kde.org
M +1 -0 queryserviceclient.cpp
--- branches/KDE/4.4/kdelibs/nepomuk/query/queryserviceclient.cpp #1087529:1087530
@@ -177,6 +177,7 @@
Nepomuk::Query::QueryServiceClient::~QueryServiceClient()
{
close();
+ delete d->queryServiceInterface;
delete d;
}
_______________________________________________
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team

View File

@ -1,63 +0,0 @@
Index: plasma/applet.cpp
===================================================================
--- plasma/applet.cpp (Revision 1090827)
+++ plasma/applet.cpp (Revision 1090828)
@@ -1712,6 +1712,7 @@
return;
}
+ d->publishUI.publishCheckbox = 0;
if (d->package && d->configLoader) {
KConfigDialog *dialog = 0;
@@ -1878,29 +1879,31 @@
}
#ifdef ENABLE_REMOTE_WIDGETS
- q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
+ if (publishUI.publishCheckbox) {
+ q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
- if (publishUI.publishCheckbox->isChecked()) {
- QString resourceName =
- i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
- "%1 on %2", q->name(), QHostInfo::localHostName());
- q->publish(Plasma::ZeroconfAnnouncement, resourceName);
- if (publishUI.allUsersCheckbox->isChecked()) {
- if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
- AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
- rule->setPolicy(AuthorizationRule::Allow);
- rule->setTargets(AuthorizationRule::AllUsers);
- AuthorizationManager::self()->d->rules.append(rule);
+ if (publishUI.publishCheckbox->isChecked()) {
+ QString resourceName =
+ i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
+ "%1 on %2", q->name(), QHostInfo::localHostName());
+ q->publish(Plasma::ZeroconfAnnouncement, resourceName);
+ if (publishUI.allUsersCheckbox->isChecked()) {
+ if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
+ AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
+ rule->setPolicy(AuthorizationRule::Allow);
+ rule->setTargets(AuthorizationRule::AllUsers);
+ AuthorizationManager::self()->d->rules.append(rule);
+ }
+ } else {
+ AuthorizationRule *matchingRule =
+ AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
+ if (matchingRule) {
+ AuthorizationManager::self()->d->rules.removeAll(matchingRule);
+ }
}
} else {
- AuthorizationRule *matchingRule =
- AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
- if (matchingRule) {
- AuthorizationManager::self()->d->rules.removeAll(matchingRule);
- }
+ q->unpublish();
}
- } else {
- q->unpublish();
}
#endif

View File

@ -0,0 +1,168 @@
--- branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp 2010/01/24 02:37:20 1079318
+++ branches/KDE/4.4/kdelibs/kdeui/util/kpixmapcache.cpp 2010/03/25 02:24:54 1107210
@@ -40,6 +40,7 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klockfile.h>
+#include <ksavefile.h>
#include <ksvgrenderer.h>
#include <kdefakes.h>
@@ -633,6 +634,10 @@
qint32 leftchild, rightchild;
stream >> fkey >> foffset >> timesused >> lastused >> leftchild >> rightchild;
+ if (fkey.isEmpty()) {
+ return start;
+ }
+
if (key < fkey) {
if (leftchild) {
return binarySearchKey(stream, key, leftchild);
@@ -660,12 +665,23 @@
// exist yet and there are no entries. Otherwise, do a binary search
// starting from the root node.
if (!stream.atEnd()) {
+ // One exception is that the root node may exist but be invalid,
+ // which can happen when the cache data is discarded. This is
+ // represented by an empty fkey
+ QString fkey;
+ stream >> fkey;
+
+ if (fkey.isEmpty()) {
+ delete device;
+ return -1;
+ }
+
int nodeoffset = binarySearchKey(stream, key, mIndexRootOffset);
// Load the found entry and check if it's the one we're looking for.
device->seek(nodeoffset);
- QString fkey;
stream >> fkey;
+
if (fkey == key) {
// Read offset and statistics
qint32 foffset;
@@ -814,7 +830,9 @@
QString fkey;
stream.device()->seek(parentoffset);
stream >> fkey;
- if (key == fkey) {
+
+ // The key would be empty if the cache had been discarded.
+ if (key == fkey || fkey.isEmpty()) {
// We're overwriting an existing entry
offset = parentoffset;
}
@@ -1195,16 +1213,14 @@
return false;
}
- d->invalidateMmapFiles();
- d->unmmapFiles();
-
- d->mEnabled = false;
-
KPCLockFile lock(d->mLockFileName);
// Hope we got the lock...
+ d->invalidateMmapFiles();
+ d->mEnabled = false;
+
// Create index file
- QFile indexfile(d->mIndexFile);
+ KSaveFile indexfile(d->mIndexFile);
if (!indexfile.open(QIODevice::WriteOnly)) {
kError() << "Couldn't create index file" << d->mIndexFile;
return false;
@@ -1212,7 +1228,7 @@
d->mCacheId = ::time(0);
d->mTimestamp = ::time(0);
-
+
// We can't know the full size until custom headers written.
// mmapFiles() will take care of correcting the size.
KPixmapCacheIndexHeader indexHeader = { {0}, KPIXMAPCACHE_VERSION, 0, d->mCacheId, d->mTimestamp };
@@ -1221,7 +1237,7 @@
indexfile.write(reinterpret_cast<char*>(&indexHeader), sizeof indexHeader);
// Create data file
- QFile datafile(d->mDataFile);
+ KSaveFile datafile(d->mDataFile);
if (!datafile.open(QIODevice::WriteOnly)) {
kError() << "Couldn't create data file" << d->mDataFile;
return false;
@@ -1243,40 +1259,54 @@
// Close the files and mmap them (if mmapping is used)
indexfile.close();
datafile.close();
+ indexfile.finalize();
+ datafile.finalize();
+
d->mEnabled = true;
d->mmapFiles();
+
return true;
}
void KPixmapCache::deleteCache(const QString& name)
{
- foreach (KPixmapCache::Private *d, Private::mCaches) {
- if (d->mName == name && d->mInited) {
- d->q->discard();
- }
- }
+ QString indexFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + name + ".index");
+ QString dataFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + name + ".data");
+
+ QFile::remove(indexFile);
+ QFile::remove(dataFile);
}
void KPixmapCache::discard()
{
- d->invalidateMmapFiles();
- d->unmmapFiles();
- d->mInited = false;
+ // To "discard" the cache we simply have to make sure that every that
+ // was in there before is no longer present when we search for them.
+ // Easiest way to do *that* is to simply delete the index.
+
+ KPCLockFile lock(d->mLockFileName);
+ if(!lock.isValid()) {
+ kError(264) << "Unable to lock pixmap cache when trying to discard it";
+ return;
+ }
+
+ QIODevice *device = d->indexDevice();
+ if (!device) {
+ kError(264) << "Unable to access index when trying to discard cache";
+ return;
+ }
+
+ device->seek(d->mIndexRootOffset);
+ QDataStream stream(device);
+
+ // Stream an empty QString as the hash key to signify that the cache
+ // has been discarded.
+ stream << QString();
if (d->mUseQPixmapCache) {
// TODO: This is broken, it removes every cached QPixmap in the whole
// process, not just this KPixmapCache.
QPixmapCache::clear();
}
-
- QString indexFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + d->mName + ".index");
- QString dataFile = KGlobal::dirs()->locateLocal("cache", "kpc/" + d->mName + ".data");
-
- QFile::remove(indexFile);
- QFile::remove(dataFile);
-
- // No need to remove the lockfile
- d->init();
}
void KPixmapCache::removeEntries(int newsize)

View File

@ -1,14 +1,14 @@
%define attica_ver 0.1.2 %define attica_ver 0.1.3
%define phonon_ver 4.3.80 %define phonon_ver 4.4.0
%define soprano_ver 2.4.0 %define soprano_ver 2.4.0
%define strigi_ver 0.7.1 %define strigi_ver 0.7.2
# to build/include apidocs or not # to build/include apidocs or not
%define apidocs 1 %define apidocs 1
Summary: KDE Libraries Summary: KDE Libraries
Version: 4.4.0 Version: 4.4.5
Release: 8%{?dist} Release: 2%{?dist}
Name: kdelibs Name: kdelibs
Epoch: 6 Epoch: 6
@ -25,29 +25,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde4-macros(api) >= 2
BuildRequires: kde-filesystem >= 4-23 BuildRequires: kde-filesystem >= 4-23
%if 0%{?fedora} && 0%{?fedora} < 12
# used in kde.(sh|csh) # used in kde.(sh|csh)
Requires: coreutils grep Requires: coreutils grep
# dbus-launch needed here? don't think so, but be safe and keep %endif
# for now -- Rex
Requires: dbus-x11
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: kde-filesystem >= 4-23 Requires: kde-filesystem >= 4-23
Requires: kde-settings Requires: kde-settings
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info # versioned dep ok, as long as it comes from *here*
Requires: kdelibs-common Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: hal
Requires: hunspell Requires: hunspell
# beware of possible bootstrapping problems -- Rex
Requires: oxygen-icon-theme >= %{version}
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver}) %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
Requires: phonon%{?_isa} >= %{phonon_version} Requires: phonon%{?_isa} >= %{phonon_version}
Requires: shared-desktop-ontologies Requires: shared-desktop-ontologies
Requires: shared-mime-info
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver}) %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
Requires: soprano%{?_isa} >= %{soprano_version} Requires: soprano%{?_isa} >= %{soprano_version}
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver}) %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
Requires: strigi-libs%{?_isa} >= %{strigi_version} Requires: strigi-libs%{?_isa} >= %{strigi_version}
Source1: kde4.sh
Source2: kde4.csh
# make -devel packages parallel-installable # make -devel packages parallel-installable
Patch0: kdelibs-4.3.85-parallel_devel.patch Patch0: kdelibs-4.3.85-parallel_devel.patch
# fix kde#149705 # fix kde#149705
@ -71,16 +71,12 @@ Patch11: kdelibs-4.3.80-policykit-workaround.patch
Patch12: kdelibs-4.1.0-xdg-menu.patch Patch12: kdelibs-4.1.0-xdg-menu.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.2.85-libexecdir.patch Patch14: kdelibs-4.2.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch
# COMMENT ME PLEASE # COMMENT ME PLEASE
Patch20: kdelibs-4.1.70-cmake.patch Patch20: kdelibs-4.1.70-cmake.patch
# disable drkonqi by default, RHEL prefers/wants abrt # disable drkonqi by default, RHEL prefers/wants abrt
Patch24: kdelibs-4.3.1-drkonq.patch Patch24: kdelibs-4.3.1-drkonq.patch
# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
# workaound for low-mem systems (ppc64), tracking here (for now),
# https://bugzilla.redhat.com/show_bug.cgi?id=539697
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
# die rpath die, since we're using standard paths, we can avoid # die rpath die, since we're using standard paths, we can avoid
# this extra hassle (even though cmake is *supposed* to not add standard # this extra hassle (even though cmake is *supposed* to not add standard
# paths (like /usr/lib64) already! With this, we can drop # paths (like /usr/lib64) already! With this, we can drop
@ -89,14 +85,12 @@ Patch27: kdelibs-4.3.98-no_rpath.patch
# upstreamable # upstreamable
# 4.4 upstream ## 4.4 upstream
Patch100: kdelibs-4.4.0-khtml_scrolling.patch
Patch101: kdelibs-4.4.0-nepomuk_memleak.patch
patch102: kdelibs-4.4.0-krunner-crash-kde#227118.patch
Patch103: kdelibs-4.4.0-plasma-crash-kde#226823.patch
# security fix ## trunk upstream
## Not Upstreamed? why not ? -- Rex
## security fix
# Not Upstreamed? why not ? -- Rex
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
%if 0%{?fedora} && 0%{?fedora} < 13 %if 0%{?fedora} && 0%{?fedora} < 13
@ -104,6 +98,7 @@ Conflicts: kdebase-workspace-libs < 4.3.80
%endif %endif
BuildRequires: qt4-devel >= 4.6.0 BuildRequires: qt4-devel >= 4.6.0
BuildRequires: qt4-webkit-devel
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
Requires: xdg-utils Requires: xdg-utils
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
@ -115,7 +110,7 @@ BuildRequires: automoc4 >= 0.9.88
BuildRequires: avahi-devel BuildRequires: avahi-devel
BuildRequires: bison flex BuildRequires: bison flex
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: cmake >= 2.6.2-3 BuildRequires: cmake >= 2.6.4
BuildRequires: cups-devel cups BuildRequires: cups-devel cups
BuildRequires: enchant-devel BuildRequires: enchant-devel
BuildRequires: gamin-devel BuildRequires: gamin-devel
@ -144,8 +139,6 @@ BuildRequires: zlib-devel
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel %define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
%{?x_deps:BuildRequires: %{x_deps}} %{?x_deps:BuildRequires: %{x_deps}}
BuildRequires: openssh-clients
BuildRequires: subversion
%if 0%{?apidocs} %if 0%{?apidocs}
BuildRequires: doxygen BuildRequires: doxygen
@ -159,6 +152,10 @@ Provides: kross(qtscript) = %{version}-%{release}
Provides: kdelibs-experimental = %{version}-%{release} Provides: kdelibs-experimental = %{version}-%{release}
Obsoletes: kdelibs-experimental < 4.3.75 Obsoletes: kdelibs-experimental < 4.3.75
%if 0%{?fedora} && 0%{?fedora} < 15
Obsoletes: webkitkde < 0.0.6
%endif
%description %description
Libraries for KDE 4. Libraries for KDE 4.
@ -177,31 +174,32 @@ Conflicts: kdebase-runtime < 4.2.90
%endif %endif
%if 0%{?fedora} && 0%{?fedora} < 13 %if 0%{?fedora} && 0%{?fedora} < 13
Conflicts: kdebase-workspace-devel < 4.3.80 Conflicts: kdebase-workspace-devel < 4.3.80
Obsoletes: kdelibs-experimental-devel < 4.3.75
Provides: kdelibs-experimental-devel = %{version}-%{release}
%endif
%if 0%{?fedora} && 0%{?fedora} < 15
Obsoletes: webkitkde-devel < 0.0.6
%endif %endif
Provides: plasma-devel = %{version}-%{release} Provides: plasma-devel = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: kdelibs4-devel < %{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release}
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}} %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
Obsoletes: kdelibs-experimental-devel < 4.3.75
Provides: kdelibs-experimental-devel = %{version}-%{release}
Obsoletes: webkitkde-devel < 0.0.3
Requires: attica-devel >= %{attica_ver} Requires: attica-devel >= %{attica_ver}
Requires: automoc4 >= 0.9.88 Requires: automoc4 >= 0.9.88
Requires: cmake >= 2.6.2-3 Requires: cmake >= 2.6.4
Requires: openssl-devel Requires: openssl-devel
Requires: phonon-devel Requires: phonon-devel
Provides: nepomuk-devel = %{version}-%{release}
# considered part of nepomuk-devel # considered part of nepomuk-devel
Requires: shared-desktop-ontologies-devel Requires: shared-desktop-ontologies-devel soprano-devel
Requires: qt4-devel Requires: qt4-devel
Requires: qt4-webkit-devel
# do we really still need all these below? -- Rex # do we really still need all these below? -- Rex
Requires: strigi-devel Requires: strigi-devel
Requires: bzip2-devel gamin-devel libacl-devel Requires: bzip2-devel gamin-devel libacl-devel
%{?x_deps:Requires: %{x_deps}} %{?x_deps:Requires: %{x_deps}}
Provides: kdelibs-experimental-devel = %{version}-%{release}
Obsoletes: kdelibs-experimental-devel < %{version}-%{release}
%description devel %description devel
This package includes the header files you will need to compile This package includes the header files you will need to compile
applications for KDE 4. applications for KDE 4.
@ -236,18 +234,11 @@ format for easy browsing.
%if 0%{?rhel} > 5 %if 0%{?rhel} > 5
%patch24 -p1 -b .drkonq %patch24 -p1 -b .drkonq
%endif %endif
#if 0%{?fedora} > 11
#patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
#endif
%patch27 -p1 -b .no_rpath %patch27 -p1 -b .no_rpath
# upstreamable patches # upstreamable patches
# upstream patches # upstream patches
%patch100 -p4 -b .khtml_scrolling
%patch101 -p4 -b .nepomuk_memleak
%patch102 -p0 -b .krunner-crash-kde#227118
%patch103 -p0 -b .plasma-crash-kde#226823
# security fix # security fix
%patch200 -p1 -b .CVE-2009-2702 %patch200 -p1 -b .CVE-2009-2702
@ -302,11 +293,6 @@ do
done done
popd popd
%if 0%{?fedora} && 0%{?fedora} < 12
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
%endif
# fix Sonnet documentation multilib conflict # fix Sonnet documentation multilib conflict
bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
sed -i -e 's!<a name="id[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache sed -i -e 's!<a name="id[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
@ -348,9 +334,6 @@ rm -rf %{buildroot}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS README TODO %doc AUTHORS README TODO
%doc COPYING.LIB %doc COPYING.LIB
%if 0%{?fedora} && 0%{?fedora} < 12
%config(noreplace) %{_sysconfdir}/profile.d/*
%endif
%{_kde4_bindir}/* %{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4 %exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/* %{_kde4_appsdir}/*
@ -375,7 +358,24 @@ rm -rf %{buildroot}
%{_kde4_libdir}/kconf_update_bin/ %{_kde4_libdir}/kconf_update_bin/
%dir %{_kde4_libdir}/kde4/ %dir %{_kde4_libdir}/kde4/
%{_kde4_libdir}/kde4/*.so %{_kde4_libdir}/kde4/*.so
%{_kde4_libexecdir}/* %{_kde4_libexecdir}/filesharelist
%{_kde4_libexecdir}/fileshareset
%{_kde4_libexecdir}/kauth-policy-gen
%{_kde4_libexecdir}/kcmremotewidgetshelper
%{_kde4_libexecdir}/kconf_update
%{_kde4_libexecdir}/kdesu_stub
%{_kde4_libexecdir}/kdontchangethehostname
%{_kde4_libexecdir}/kio_http_cache_cleaner
%{_kde4_libexecdir}/kioslave
%{_kde4_libexecdir}/klauncher
%{_kde4_libexecdir}/kmailservice
# see kio/misc/kpac/README.wpad
%attr(4755,root,root) %{_kde4_libexecdir}/kpac_dhcp_helper
%{_kde4_libexecdir}/ksendbugmail
%{_kde4_libexecdir}/ktelnetservice
%{_kde4_libexecdir}/lnusertemp
%{_kde4_libexecdir}/start_kdeinit
%{_kde4_libexecdir}/start_kdeinit_wrapper
%{_kde4_libdir}/kde4/plugins/ %{_kde4_libdir}/kde4/plugins/
%{_kde4_sysconfdir}/xdg/menus/*.menu %{_kde4_sysconfdir}/xdg/menus/*.menu
%{_mandir}/man1/checkXML.1* %{_mandir}/man1/checkXML.1*
@ -439,6 +439,87 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.5-2
- Requires: oxygen-icon-theme (ensures default fallback is present)
- up attica,phonon,strigi min deps
* Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.5-1
- 4.4.5
* Sun May 30 2010 Than Ngo <than@redhat.com> - 6:4.4.4-1
- 4.4.4
* Sun May 16 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-5
- Web proxy auto-discovery (WPAD) fails (#592658)
* Sat May 08 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-4
- -devel: Req: qt4-webkit-devel
* Sat May 08 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-3
- BR: qt4-webkit-devel
* Wed May 05 2010 Than Ngo <than@redhat.com> - 6:4.4.3-2
- respin
* Fri Apr 30 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.3-1
- 4.4.3
* Sun Apr 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-5
- rebuild (soprano)
* Sat Apr 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-4
- fix kidletime (kde#231628,kde#227279,kde#218468)
- kate part ignores japanese input from input method (#585242,kde#206455)
* Thu Apr 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-3
- cleanup/fix webkitkde Obsoletes a bit more (#582469)
- (Build)Requies: cmake >= 2.6.4
* Fri Apr 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.2-2
- Obsoletes: webkitkde < 0.0.6 (#576634)
* Mon Mar 29 2010 Lukas Tinkl <ltinkl@redhat.com> - 6:4.4.2-1
- 4.4.2
* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-10
- drop BR: openssh-clients subversion
* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-9
- refresh kdelibs-4.4.2-kpixmapcache.patch
* Wed Mar 24 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-8
- Obsoletes: webkitkde (#576634)
* Sat Mar 20 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.1-7
- KDE default in noisy debug mode to stdout/stderr (kde#227089)
- backport trunk/ fix building against qt-4.7
* Wed Mar 17 2010 Lukas Tinkl <ltinkl@redhat.com> - 6:4.4.1-6
- fix crash in KPixmapCache (bug#568389)
* Tue Mar 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-5
- rebuild (soprano)
* Tue Mar 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-4
- Requires: hal (for solid)
- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace)
- drop Requires: coreutils grep (F-12+)
- make Requires: kdelibs-common versioned
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-3
- put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid
%%_libdir/kde/devel rpaths (#568495)
* Sun Feb 28 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-2
- update no_rpath patch, revert back to
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE (#568495)
* Sat Feb 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.1-1
- 4.4.1
* Fri Feb 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-9
- -devel: Provides: nepomuk-devel, Requires: soprano-devel
* Tue Feb 16 2010 Than Ngo <than@redhat.com> - 6:4.4.0-8 * Tue Feb 16 2010 Than Ngo <than@redhat.com> - 6:4.4.0-8
- krunner crash patch (kde#227118) - krunner crash patch (kde#227118)
- plasma crash patch (kde#226823) - plasma crash patch (kde#226823)

View File

@ -1,3 +0,0 @@
%_kde4_version @@VERSION@@

View File

@ -1 +1 @@
957bca85de744a9ddd316fd85e882b40 kdelibs-4.4.0.tar.bz2 1cfd94108b7654589268c0d9776fd361 kdelibs-4.4.4.tar.bz2