From 46784b8f5188b9253e65bb9684e94ba350f059aa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 28 Feb 2010 14:10:25 +0000 Subject: [PATCH] * Sat Feb 27 2010 Rex Dieter - 6:4.4.1-1 - 4.4.1 --- .cvsignore | 2 +- kdelibs-4.4.0-khtml_scrolling.patch | 32 ---------- kdelibs-4.4.0-krunner-crash-kde#227118.patch | 15 ----- kdelibs-4.4.0-nepomuk_memleak.patch | 23 ------- kdelibs-4.4.0-plasma-crash-kde#226823.patch | 63 -------------------- kdelibs.spec | 15 ++--- sources | 2 +- 7 files changed, 7 insertions(+), 145 deletions(-) delete mode 100644 kdelibs-4.4.0-khtml_scrolling.patch delete mode 100644 kdelibs-4.4.0-krunner-crash-kde#227118.patch delete mode 100644 kdelibs-4.4.0-nepomuk_memleak.patch delete mode 100644 kdelibs-4.4.0-plasma-crash-kde#226823.patch diff --git a/.cvsignore b/.cvsignore index ff4ea46..49749b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-4.4.0.tar.bz2 +kdelibs-4.4.1.tar.bz2 diff --git a/kdelibs-4.4.0-khtml_scrolling.patch b/kdelibs-4.4.0-khtml_scrolling.patch deleted file mode 100644 index 728c168..0000000 --- a/kdelibs-4.4.0-khtml_scrolling.patch +++ /dev/null @@ -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 ); - diff --git a/kdelibs-4.4.0-krunner-crash-kde#227118.patch b/kdelibs-4.4.0-krunner-crash-kde#227118.patch deleted file mode 100644 index 0b9e174..0000000 --- a/kdelibs-4.4.0-krunner-crash-kde#227118.patch +++ /dev/null @@ -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 ++) { diff --git a/kdelibs-4.4.0-nepomuk_memleak.patch b/kdelibs-4.4.0-nepomuk_memleak.patch deleted file mode 100644 index b8a620d..0000000 --- a/kdelibs-4.4.0-nepomuk_memleak.patch +++ /dev/null @@ -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 diff --git a/kdelibs-4.4.0-plasma-crash-kde#226823.patch b/kdelibs-4.4.0-plasma-crash-kde#226823.patch deleted file mode 100644 index 83dffec..0000000 --- a/kdelibs-4.4.0-plasma-crash-kde#226823.patch +++ /dev/null @@ -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 - diff --git a/kdelibs.spec b/kdelibs.spec index ce26a52..69d56f7 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -7,8 +7,8 @@ %define apidocs 1 Summary: KDE Libraries -Version: 4.4.0 -Release: 9%{?dist} +Version: 4.4.1 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -90,10 +90,6 @@ Patch27: kdelibs-4.3.98-no_rpath.patch # upstreamable # 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 ## Not Upstreamed? why not ? -- Rex @@ -245,10 +241,6 @@ format for easy browsing. # upstreamable 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 %patch200 -p1 -b .CVE-2009-2702 @@ -440,6 +432,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 27 2010 Rex Dieter - 6:4.4.1-1 +- 4.4.1 + * Fri Feb 19 2010 Rex Dieter - 6:4.4.0-9 - -devel: Provides: nepomuk-devel, Requires: soprano-devel diff --git a/sources b/sources index 9580046..ee7a6b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -957bca85de744a9ddd316fd85e882b40 kdelibs-4.4.0.tar.bz2 +5057908fb9dcf7997a87fe27a382bfc9 kdelibs-4.4.1.tar.bz2