rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Thu Sep 25 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-1

Browse Source 
- kde-4.1.2
This commit is contained in:
Rex Dieter 2008-09-28 20:33:08 +00:00
parent c82873486b
commit 51fa7b6153
14 changed files with 9 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1,2 +1 @@
kdelibs-4.0.99.tar.bz2
kdelibs-4.1.0.tar.bz2
kdelibs-4.1.2.tar.bz2

17
kdelibs-4.0.5-fedora-buildtype.patch
View File

@ -1,17 +0,0 @@
diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake 2008-03-27 21:33:23.000000000 +0100
+++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake 2008-03-31 17:34:40.000000000 +0200
@@ -882,11 +882,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ set(CMAKE_CXX_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ set(CMAKE_C_FLAGS_FEDORA "-DNDEBUG -DQT_NO_DEBUG")
if (CMAKE_SYSTEM_NAME MATCHES Linux)
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")

12
kdelibs-4.1.0-#455130.patch
View File

@ -1,12 +0,0 @@
diff -ur kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp
--- kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp 2008-06-25 09:57:24.000000000 +0200
+++ kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp 2008-08-29 14:48:54.000000000 +0200
@@ -393,7 +393,7 @@
QString result;
QByteArray oldpath = qgetenv( "PATH" );
- QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
+ QByteArray newpath = QFile::encodeName( KGlobal::hasMainComponent() ? KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) : QString() );
if( !newpath.isEmpty() && !oldpath.isEmpty() )
newpath += KPATH_SEPARATOR;
newpath += oldpath;

204
kdelibs-4.1.1-kde#157789.patch
View File

@ -1,204 +0,0 @@
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.cpp kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp
--- kdelibs-4.1.1/khtml/imload/animprovider.cpp 2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.cpp 2008-09-19 01:00:47.000000000 +0200
@@ -38,6 +38,8 @@
void AnimProvider::switchFrame()
{
+ if (animationAdvice == KHTMLSettings::KAnimationDisabled)
+ return;
shouldSwitchFrame = true;
image->notifyPerformUpdate();
}
@@ -47,6 +49,11 @@
ImageManager::animTimer()->destroyed(this);
}
+void AnimProvider::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+ animationAdvice = newAdvice;
+}
+
}
// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/animprovider.h kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h
--- kdelibs-4.1.1/khtml/imload/animprovider.h 2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/animprovider.h 2008-09-19 01:04:49.000000000 +0200
@@ -25,6 +25,8 @@
#ifndef ANIM_PROVIDER_H
#define ANIM_PROVIDER_H
+#include <khtml_settings.h>
+
class QPainter;
namespace khtmlImLoad {
@@ -44,11 +46,13 @@
PixmapPlane* curFrame;
Image* image;
bool shouldSwitchFrame; //Set by AnimTimer
+ KHTMLSettings::KAnimationAdvice animationAdvice;
void nextFrame(); //Helper that goes to next frame or wraps around
public:
AnimProvider(PixmapPlane* plane, Image* img):frame0(plane), curFrame(plane),
- image(img), shouldSwitchFrame(false)
+ image(img), shouldSwitchFrame(false),
+ animationAdvice(KHTMLSettings::KAnimationEnabled)
{}
void switchFrame();
@@ -62,6 +66,11 @@
//Must be implemented to paint the given region. Note that clipping to the
//overall canvas will be performed already
virtual void paint(int dx, int dy, QPainter* p, int sx, int sy, int width, int height) = 0;
+
+ /**
+ Enables or disables animations
+ */
+ void setShowAnimations(KHTMLSettings::KAnimationAdvice);
};
}
diff -ur kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp
--- kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp 2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/decoders/gifloader.cpp 2008-09-19 01:00:59.000000000 +0200
@@ -212,7 +212,11 @@
++frame;
if (frame >= frameInfo.size())
+ {
+ if (animationAdvice == KHTMLSettings::KAnimationLoopOnce)
+ animationAdvice = KHTMLSettings::KAnimationDisabled;
frame = 0;
+ }
nextFrame();
}
diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp
--- kdelibs-4.1.1/khtml/imload/image.cpp 2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp 2008-09-19 02:20:03.000000000 +0200
@@ -48,6 +48,7 @@
inError = false;
width = height = 0;
+ animationAdvice = KHTMLSettings::KAnimationEnabled;
noUpdates();
}
@@ -214,6 +215,9 @@
}
else
{
+ if (original && original->animProvider)
+ original->animProvider->setShowAnimations(animationAdvice);
+
fullyDecoded = true;
owner->imageDone(this);
}
@@ -452,6 +456,16 @@
return original->parent->format.hasAlpha();
}
+void Image::setShowAnimations(KHTMLSettings::KAnimationAdvice newAdvice)
+{
+ if (animationAdvice != newAdvice)
+ {
+ animationAdvice = newAdvice;
+ if (original && original->animProvider)
+ original->animProvider->setShowAnimations(newAdvice);
+ }
+}
+
}
// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff -ur kdelibs-4.1.1/khtml/imload/image.h kdelibs-4.1.1-kde#157789/khtml/imload/image.h
--- kdelibs-4.1.1/khtml/imload/image.h 2008-05-21 13:06:09.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.h 2008-09-19 01:09:46.000000000 +0200
@@ -30,6 +30,8 @@
#include <QTimer>
#include <QPair>
#include <QMap>
+
+#include <khtml_settings.h>
#include "imageformat.h"
@@ -92,6 +94,11 @@
(but see CanvasImage)
*/
QImage* qimage() const;
+
+ /**
+ Enables or disables animations
+ */
+ void setShowAnimations(KHTMLSettings::KAnimationAdvice);
private:
//Interface to the loader.
friend class ImageLoader;
@@ -165,6 +172,7 @@
int width, height;
PixmapPlane* original;
QMap<QPair<int, int>, PixmapPlane*> scaled;
+ KHTMLSettings::KAnimationAdvice animationAdvice;
};
diff -ur kdelibs-4.1.1/khtml/misc/loader.cpp kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp
--- kdelibs-4.1.1/khtml/misc/loader.cpp 2008-08-28 10:08:06.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.cpp 2008-09-19 01:03:07.000000000 +0200
@@ -422,7 +422,7 @@
m_status = Unknown;
imgSource = 0;
setAccept( acceptHeader );
- m_showAnimations = dl->showAnimations();
+ i->setShowAnimations(dl->showAnimations());
m_loading = true;
if ( KHTMLGlobal::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
@@ -807,30 +807,8 @@
void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
{
- (void) showAnimations;
-#if 0
- m_showAnimations = showAnimations;
- if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
-#ifdef __GNUC__
-#warning QDataSource
-#endif
- // imgSource->cleanBuffer();
- delete p;
- p = new QPixmap(m->framePixmap());
-#ifdef __GNUC__
-#warning QMovie requires different API now
-#endif
- //m->disconnectUpdate( this, SLOT( movieUpdated( const QRect &) ));
- //m->disconnectStatus( this, SLOT( movieStatus( int ) ));
- // m->disconnectResize( this, SLOT( movieResize( const QSize& ) ) );
- QTimer::singleShot(0, this, SLOT( deleteMovie()));
- imgSource = 0;
- }
-#endif
-
-#ifdef __GNUC__
-#warning "Use largeimagelib to disable animation"
-#endif
+ if (i)
+ i->setShowAnimations(showAnimations);
}
// void CachedImage::deleteMovie()
diff -ur kdelibs-4.1.1/khtml/misc/loader.h kdelibs-4.1.1-kde#157789/khtml/misc/loader.h
--- kdelibs-4.1.1/khtml/misc/loader.h 2008-05-21 13:05:54.000000000 +0200
+++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.h 2008-09-19 02:15:41.000000000 +0200
@@ -363,7 +363,6 @@
bool typeChecked : 1;
bool isFullyTransparent : 1;
bool monochrome : 1;
- KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
friend class Cache;
friend class ::KHTMLPart;

13
kdelibs-4.1.1-kde#169447-khtml-regression.patch
View File

@ -1,13 +0,0 @@
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++) {

16
kdelibs-4.1.1-kde#856379-cookiejar.patch
View File

@ -1,16 +0,0 @@
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp (revision 856378)
+++ kioslave/http/kcookiejar/kcookiejar.cpp (revision 856379)
@@ -516,8 +516,10 @@
extractDomains(_fqdn, domains);
if (domains.count() > 3)
_domain = domains[3];
+ else if ( domains.count() > 0 )
+ _domain = domains[0];
else
- _domain = domains[0];
+ _domain = L1("");
}
QString KCookieJar::stripDomain(const KHttpCookie& cookie)

42
kdelibs-4.1.1-kde#856403-urlnav.patch
View File

@ -1,42 +0,0 @@
Index: kfile/kurlnavigator.cpp
===================================================================
--- kfile/kurlnavigator.cpp (revision 856402)
+++ kfile/kurlnavigator.cpp (revision 856403)
@@ -344,6 +344,7 @@
// initialize the path box of the traditional view
m_pathBox = new KUrlComboBox(KUrlComboBox::Both, true, q);
m_pathBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+ m_pathBox->installEventFilter(q);
KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
m_pathBox->setCompletionObject(kurlCompletion);
@@ -1122,6 +1123,16 @@
QWidget::resizeEvent(event);
}
+bool KUrlNavigator::eventFilter(QObject* watched, QEvent* event)
+{
+ if ((watched == d->m_pathBox) && (event->type() == QEvent::FocusIn)) {
+ requestActivation();
+ setFocus();
+ }
+
+ return QWidget::eventFilter(watched, event);
+}
+
int KUrlNavigator::historySize() const
{
return d->m_history.count();
Index: kfile/kurlnavigator.h
===================================================================
--- kfile/kurlnavigator.h (revision 856402)
+++ kfile/kurlnavigator.h (revision 856403)
@@ -312,6 +312,8 @@
/* @see QWidget::resizeEvent() */
virtual void resizeEvent(QResizeEvent* event);
+ virtual bool eventFilter(QObject* watched, QEvent* event);
+
private:
Q_PRIVATE_SLOT(d, void slotReturnPressed(const QString& text))
Q_PRIVATE_SLOT(d, void slotReturnPressed())

13
kdelibs-4.1.1-kde#858795-mimeassoc.patch
View File

@ -1,13 +0,0 @@
Index: kded/kmimeassociations.cpp
===================================================================
--- kded/kmimeassociations.cpp (revision 858794)
+++ kded/kmimeassociations.cpp (revision 858795)
@@ -62,7 +62,7 @@
const QString mimeappsFile = mimeappsIter.previous();
kDebug(7021) << "Parsing" << mimeappsFile;
parseMimeAppsList(mimeappsFile, basePreference);
- basePreference -= 50;
+ basePreference += 50;
}
return true;
}

14
kdelibs-4.1.1-kde#860005-emoticons.patch
View File

@ -1,14 +0,0 @@
Index: kutils/kemoticons/kemoticonstheme.cpp
===================================================================
--- kutils/kemoticons/kemoticonstheme.cpp (revision 860004)
+++ kutils/kemoticons/kemoticonstheme.cpp (revision 860005)
@@ -161,6 +161,9 @@
QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
{
QList<Token> tokens = tokenize(text, mode | SkipHTML);
+ if (tokens.isEmpty() && !text.isEmpty())
+ return text;
+
QString result;
foreach(const Token &token , tokens) {

24
kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
View File

@ -1,24 +0,0 @@
Index: khtml/rendering/render_layer.cpp
===================================================================
--- khtml/rendering/render_layer.cpp (revision 860094)
+++ khtml/rendering/render_layer.cpp (revision 860095)
@@ -715,9 +715,6 @@
for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
child->updateLayerPositions(rootLayer);
- // Fire the scroll DOM event.
- m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
-
// Just schedule a full repaint of our object.
if (repaint)
m_object->repaint(RealtimePriority);
@@ -728,6 +725,9 @@
if (m_vBar)
m_vBar->setValue(m_scrollY);
}
+
+ // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us.
+ m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
}
void RenderLayer::updateScrollPositionFromScrollbars()

69
kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
View File

@ -1,69 +0,0 @@
Index: khtml/ecma/kjs_proxy.h
===================================================================
--- khtml/ecma/kjs_proxy.h (Revision 854182)
+++ khtml/ecma/kjs_proxy.h (Revision 854183)
@@ -62,6 +62,7 @@
virtual KJS::Interpreter *interpreter() = 0;
virtual void setDebugEnabled(bool enabled) = 0;
+ virtual bool debugEnabled() const = 0;
virtual void showDebugWindow(bool show=true) = 0;
virtual bool paused() const = 0;
virtual void dataReceived() = 0;
Index: khtml/ecma/kjs_events.cpp
===================================================================
--- khtml/ecma/kjs_events.cpp (Revision 854182)
+++ khtml/ecma/kjs_events.cpp (Revision 854183)
@@ -62,18 +62,18 @@
void JSEventListener::handleEvent(DOM::Event &evt)
{
-#ifdef KJS_DEBUGGER
- //### This is the wrong place to do this --- we need
- // a more global/general stategy to prevent unwanted event loop recursion issues.
- if (DebugWindow::window() && DebugWindow::window()->inSession())
- return;
-#endif
KHTMLPart *part = qobject_cast<KHTMLPart*>(static_cast<Window*>(win.get())->part());
KJSProxy *proxy = 0L;
if (part)
proxy = part->jScript();
if (proxy && listener && listener->implementsCall()) {
+#ifdef KJS_DEBUGGER
+ //### This is the wrong place to do this --- we need
+ // a more global/general stategy to prevent unwanted event loop recursion issues.
+ if (proxy->debugEnabled() && DebugWindow::window()->inSession())
+ return;
+#endif
ref();
KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp (Revision 854182)
+++ khtml/ecma/kjs_proxy.cpp (Revision 854183)
@@ -60,6 +60,7 @@
virtual KJS::Interpreter *interpreter();
virtual void setDebugEnabled(bool enabled);
+ virtual bool debugEnabled() const;
virtual void showDebugWindow(bool show=true);
virtual bool paused() const;
virtual void dataReceived();
@@ -279,6 +280,15 @@
#endif
}
+bool KJSProxyImpl::debugEnabled() const
+{
+#ifdef KJS_DEBUGGER
+ return m_debugEnabled;
+#else
+ return false;
+#endif
+}
+
void KJSProxyImpl::showDebugWindow(bool /*show*/)
{
#ifdef KJS_DEBUGGER

40
kdelibs-4.1.1-kutils-fixes.patch
View File

@ -1,40 +0,0 @@
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp (revision 856658)
+++ kutils/kpluginselector.cpp (revision 856659)
@@ -410,7 +410,8 @@
if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
(!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
- !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive))) {
+ !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
+ !pluginInfo.service()->noDisplay()) {
listToAdd << pluginEntry;
if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp (revision 856718)
+++ kutils/kpluginselector.cpp (revision 856719)
@@ -411,7 +411,7 @@
if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
(!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
!pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
- !pluginInfo.service()->noDisplay()) {
+ (pluginInfo.service().isNull() || !pluginInfo.service()->noDisplay())) {
listToAdd << pluginEntry;
if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kcmoduleproxy.cpp
===================================================================
--- kutils/kcmoduleproxy.cpp (revision 857917)
+++ kutils/kcmoduleproxy.cpp (revision 857918)
@@ -228,7 +228,7 @@
Q_Q(KCModuleProxy);
changed = c;
emit q->changed(c);
- emit q->changed(this);
+ emit q->changed(q);
}
void KCModuleProxyPrivate::_k_moduleDestroyed()

39
kdelibs.spec
View File

@ -1,8 +1,8 @@
%define _default_patch_fuzz 2
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.1
Release: 12%{?dist}
Version: 4.1.2
Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -71,30 +71,13 @@ Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
# workaround for policykit
Patch11: kdelibs-4.0.2-policykit-workaround.patch
Patch12: kdelibs-4.1.0-xdg-menu.patch
# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
Patch13: kdelibs-4.0.5-fedora-buildtype.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.0.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
Patch18: kdelibs-4.1.0-kstandarddirs.patch
# fix running commands in kglobalconfig before KComponentData init (#455130)
Patch19: kdelibs-4.1.0-#455130.patch
Patch20: kdelibs-4.1.1-cmake.patch
## upstream patches
Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
Patch103: kdelibs-4.1.1-kutils-fixes.patch
Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch
Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch
Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
# make "Stop Animations" work again in Konqueror
# https://bugs.kde.org/show_bug.cgi?id=157789
# submitted upstream (attached to above bug report)
Patch109: kdelibs-4.1.1-kde#157789.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@ -215,23 +198,11 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch10 -p1 -b .no-cache-kdeglobals-paths
%patch11 -p1 -b .policykit
%patch12 -p1 -b .Administration-menu
%patch13 -p1 -b .fedora-buildtype
%patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs
%patch19 -p1 -b .#455130
%patch20 -p1 -b .cmake
## upstream patches
%patch100 -p0 -b .kde#169447-khtml-regression
%patch101 -p0 -b .kde#856379-cookiejar
%patch102 -p0 -b .kde#856403-urlnav
%patch103 -p0 -b .kutils-fixes
%patch104 -p0 -b .kdeui-widgets-fixes
%patch105 -p0 -b .kde#858795-mimeassoc
%patch106 -p0 -b .kde#860095-khtml-scroll-crash
%patch107 -p0 -b .kde#860005-emoticons
%patch108 -p0 -b .kde#170461-khtml-regression
%patch109 -p1 -b .kde#157789
%build
@ -392,6 +363,9 @@ rm -rf %{buildroot}
%changelog
* Thu Sep 25 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-1
- kde-4.1.2
* Fri Sep 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.1-12
- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
@ -407,13 +381,14 @@ rm -rf %{buildroot}
mail text not being displayed in KMail when kdebase-runtime wasn't
installed.
* Tue Sep 16 2008 Than Ngo <than@redhat.com> 4.1.1-9
* Wed Sep 17 2008 Than Ngo <than@redhat.com> 4.1.1-9
- #461725, revert the patch to fix the regression
* Sat Sep 13 2008 Than Ngo <than@redhat.com> 4.1.1-8
- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
* Sat Sep 13 2008 Than Ngo <than@redhat.com> 4.1.1-7
- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
- fix install problem with cmake > 2.5
* Mon Sep 08 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-6

2
sources
View File

@ -1 +1 @@
d75ec557cd864e3f9150059c3e58ed61 kdelibs-4.1.1.tar.bz2
cb5f43d2b11669fb17b0a1ecf3736c17 kdelibs-4.1.2.tar.bz2