[arch-commits] Commit in kdebase-workspace/trunk (5 files)
Andrea Scarpino
andrea at archlinux.org
Mon Feb 28 23:53:59 UTC 2011
Date: Monday, February 28, 2011 @ 18:53:58
Author: andrea
Revision: 111773
KDE 4.6.1
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/fix-MALLOC_CHECK.patch
kdebase-workspace/trunk/fix-plasma-crash-on-exit.patch
kdebase-workspace/trunk/fix-window-geometry-settings.patch
kdebase-workspace/trunk/set-horos-theme.patch
------------------------------------+
PKGBUILD | 24 +-----
fix-MALLOC_CHECK.patch | 23 ------
fix-plasma-crash-on-exit.patch | 127 -----------------------------------
fix-window-geometry-settings.patch | 18 ----
set-horos-theme.patch | 13 ---
5 files changed, 5 insertions(+), 200 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-28 23:53:55 UTC (rev 111772)
+++ PKGBUILD 2011-02-28 23:53:58 UTC (rev 111773)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz <pierre at archlinux.de>
pkgname=kdebase-workspace
-pkgver=4.6.0
-pkgrel=3
+pkgver=4.6.1
+pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -26,32 +26,18 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch'
- 'set-horos-theme.patch'
- 'fix-MALLOC_CHECK.patch'
- 'fix-plasma-crash-on-exit.patch'
- 'fix-window-geometry-settings.patch')
-sha1sums=('c192f712d16617e625acc84fcd9e0546df887a70'
+ 'fixpath.patch' 'terminate-server.patch')
+sha1sums=('e37691d88ddbf92cc95ec39849a1331404c84fd5'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd1f74ba2c7e2580d32b16ab88b0e6e804951e663'
- 'd8d6ac7f1b25a30fdd0d6a182e2ac6c6f2a28cd7'
- '7b7789c3276b67d1c4c462c2d2347db59650aefb'
- '2d3b67038d92687b51d0dbb0b9875705ddba8953')
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- # Already fixed upstream
- patch -Np0 -i ${srcdir}/set-horos-theme.patch
- patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch
- patch -Np1 -i ${srcdir}/fix-plasma-crash-on-exit.patch
- patch -Np1 -i ${srcdir}/fix-window-geometry-settings.patch
-
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
Deleted: fix-MALLOC_CHECK.patch
===================================================================
--- fix-MALLOC_CHECK.patch 2011-02-28 23:53:55 UTC (rev 111772)
+++ fix-MALLOC_CHECK.patch 2011-02-28 23:53:58 UTC (rev 111773)
@@ -1,23 +0,0 @@
-Index: startkde.cmake
-===================================================================
---- startkde.cmake (revision 1217283)
-+++ startkde.cmake (revision 1217284)
-@@ -36,18 +36,6 @@
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
-
--# Enable lightweight memory corruption checker if not already set
--# -- this is for trunk only, we remove it for releases
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
-- # Extract the first two components of the version from the output.
-- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
--
-- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
-- test $glibc_version \> 2.08 && MALLOC_CHECK_=3
--
-- export MALLOC_CHECK_
--fi
--
- # in case we have been started with full pathname spec without being in PATH
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
- if [ -n "$bindir" ]; then
Deleted: fix-plasma-crash-on-exit.patch
===================================================================
--- fix-plasma-crash-on-exit.patch 2011-02-28 23:53:55 UTC (rev 111772)
+++ fix-plasma-crash-on-exit.patch 2011-02-28 23:53:58 UTC (rev 111773)
@@ -1,127 +0,0 @@
-commit 92f71adb8bb6e46d4a3187ab8824c859312e9136
-Author: Aaron Seigo <aseigo at kde.org>
-Date: Tue Feb 1 12:54:44 2011 -0800
-
- try to avoid doing any work when we are deleting
-
-diff --git a/plasma/generic/applets/notifications/ui/notificationgroup.cpp b/plasma/generic/applets/notifications/ui/notificationgroup.cpp
-index 1f7c0b8..6bbf43c 100644
---- a/plasma/generic/applets/notifications/ui/notificationgroup.cpp
-+++ b/plasma/generic/applets/notifications/ui/notificationgroup.cpp
-@@ -66,6 +66,8 @@ NotificationGroup::NotificationGroup(Extender *parent, uint groupId)
-
- NotificationGroup::~NotificationGroup()
- {
-+ m_extenderItemsForNotification.clear();
-+ m_notificationForExtenderItems.clear();
- qDeleteAll(m_notifications);
- }
-
-@@ -137,6 +139,11 @@ void NotificationGroup::addNotification(Notification *notification)
-
- void NotificationGroup::extenderItemDestroyed(Plasma::ExtenderItem *object)
- {
-+ if (m_extenderItemsForNotification.isEmpty()) {
-+ // either we aren't tracking this notification or else we're being deleted
-+ return;
-+ }
-+
- Notification *n = m_notificationForExtenderItems.value(object);
-
- if (n) {
-@@ -148,10 +155,16 @@ void NotificationGroup::extenderItemDestroyed(Plasma::ExtenderItem *object)
-
- void NotificationGroup::removeNotification(Notification *notification)
- {
-+ if (m_extenderItemsForNotification.isEmpty()) {
-+ // either we aren't tracking this notification or else we're being deleted
-+ return;
-+ }
-+
- Plasma::ExtenderItem *item = m_extenderItemsForNotification.value(notification);
- if (item) {
- m_notificationForExtenderItems.remove(item);
- }
-+
- m_extenderItemsForNotification.remove(notification);
- m_notifications.removeAll(notification);
- QString applicationName = m_appForNotification.value(notification);
-diff --git a/plasma/generic/applets/notifications/ui/notifications.cpp b/plasma/generic/applets/notifications/ui/notifications.cpp
-index 9b1a7c0..c7aa6dd 100644
---- a/plasma/generic/applets/notifications/ui/notifications.cpp
-+++ b/plasma/generic/applets/notifications/ui/notifications.cpp
-@@ -106,6 +106,9 @@ Notifications::~Notifications()
- {
- // stop listening to the manager
- disconnect(m_manager, 0, this, 0);
-+ if (m_notificationStackDialog) {
-+ disconnect(m_notificationStackDialog, 0, this, 0);
-+ }
-
- foreach (Notification *notification, m_manager->notifications()) {
- // we don't want a destroyed managed after the destruction of manager
-@@ -342,10 +345,10 @@ void Notifications::initExtenderItem(Plasma::ExtenderItem *extenderItem)
- return;
- }
-
-- if (extenderItem->config().readEntry("type", "") == "job") {
-+ if (extenderItem->config().readEntry("type", QString()) == "job") {
- extenderItem->setWidget(new JobWidget(0, extenderItem));
-- //unknown type, this should never happen
- } else {
-+ //unknown type, this should never happen
- extenderItem->destroy();
- }
-
-commit 1fc6c46a49695ec6ad6cd80a8459c5c083de8e06
-Author: Aaron Seigo <aseigo at kde.org>
-Date: Tue Feb 1 12:54:25 2011 -0800
-
- make them all uniqueconnections
-
-diff --git a/plasma/generic/applets/notifications/ui/notificationstack.cpp b/plasma/generic/applets/notifications/ui/notificationstack.cpp
-index 2f68961..3b53559 100644
---- a/plasma/generic/applets/notifications/ui/notificationstack.cpp
-+++ b/plasma/generic/applets/notifications/ui/notificationstack.cpp
-@@ -54,11 +54,9 @@ NotificationStack::~NotificationStack()
- void NotificationStack::addNotification(Notification *notification)
- {
- m_canDismissTimer->start(1000);
-- connect(notification, SIGNAL(notificationDestroyed(Notification *)), this, SLOT(removeNotification(Notification *)));
-- connect(notification, SIGNAL(expired(Notification *)), this, SLOT(delayedRemoveNotification(Notification *)));
--
-- disconnect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *)));
-- connect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *)));
-+ connect(notification, SIGNAL(notificationDestroyed(Notification *)), this, SLOT(removeNotification(Notification *)), Qt::UniqueConnection);
-+ connect(notification, SIGNAL(expired(Notification *)), this, SLOT(delayedRemoveNotification(Notification *)), Qt::UniqueConnection);
-+ connect(notification, SIGNAL(changed(Notification *)), this, SLOT(notificationChanged(Notification *)), Qt::UniqueConnection);
-
- NotificationWidget *notificationWidget = new NotificationWidget(notification, this);
- notificationWidget->installEventFilter(this);
-commit f0f66f023e6f2896bcc2ea67d7922fc0745ff7b5
-Author: Aaron Seigo <aseigo at kde.org>
-Date: Tue Feb 1 12:54:10 2011 -0800
-
- simplification
-
-diff --git a/plasma/generic/applets/notifications/ui/notificationwidget.cpp b/plasma/generic/applets/notifications/ui/notificationwidget.cpp
-index 7764ede..3f87cfe 100644
---- a/plasma/generic/applets/notifications/ui/notificationwidget.cpp
-+++ b/plasma/generic/applets/notifications/ui/notificationwidget.cpp
-@@ -43,7 +43,6 @@
-
- #include <Plasma/Animation>
- #include <Plasma/Animator>
--#include <Plasma/Extender>
- #include <Plasma/Frame>
- #include <Plasma/IconWidget>
- #include <Plasma/Label>
-@@ -170,7 +169,7 @@ NotificationWidget::NotificationWidget(Notification *notification, QGraphicsWidg
- d->notification = notification;
-
- connect(d->signalMapper, SIGNAL(mapped(const QString &)),
-- d->notification.data(), SLOT(triggerAction(const QString &)));
-+ notification, SLOT(triggerAction(const QString &)));
- connect(notification, SIGNAL(changed()),
- this, SLOT(updateNotification()));
- connect(notification, SIGNAL(destroyed()),
Deleted: fix-window-geometry-settings.patch
===================================================================
--- fix-window-geometry-settings.patch 2011-02-28 23:53:55 UTC (rev 111772)
+++ fix-window-geometry-settings.patch 2011-02-28 23:53:58 UTC (rev 111773)
@@ -1,18 +0,0 @@
---- kdebase-workspace-4.6.0/kwin/effects/configs_builtins.cpp~ 2011-02-09 23:11:21.970007079 -0800
-+++ kdebase-workspace-4.6.0/kwin/effects/configs_builtins.cpp 2011-02-09 23:10:54.123340156 -0800
-@@ -33,6 +33,7 @@
- #include "shadow/shadow_config.h"
- #include "showfps/showfps_config.h"
- #include "thumbnailaside/thumbnailaside_config.h"
-+#include "windowgeometry/windowgeometry_config.h"
- #include "zoom/zoom_config.h"
-
- #ifdef KWIN_HAVE_OPENGL_COMPOSITING
-@@ -71,6 +72,7 @@
- KWIN_EFFECT_CONFIG_SINGLE( shadow, ShadowEffectConfig )
- KWIN_EFFECT_CONFIG_SINGLE( showfps, ShowFpsEffectConfig )
- KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig )
-+ KWIN_EFFECT_CONFIG_SINGLE( windowgeometry, WindowGeometryConfig )
- KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig )
-
- #ifdef KWIN_HAVE_OPENGL_COMPOSITING
Deleted: set-horos-theme.patch
===================================================================
--- set-horos-theme.patch 2011-02-28 23:53:55 UTC (rev 111772)
+++ set-horos-theme.patch 2011-02-28 23:53:58 UTC (rev 111773)
@@ -1,13 +0,0 @@
-Index: kdm/config.def
-===================================================================
---- kdm/config.def (revision 1216141)
-+++ kdm/config.def (revision 1216142)
-@@ -2680,7 +2680,7 @@
- Type: string
- Default: ""
- User: greeter
--Instance: */KDMDATA "/themes/oxygen-air"
-+Instance: */KDMDATA "/themes/horos"
- Comment: &
- Description:
- The theme to use for the greeter. Can point to either a directory or an XML
More information about the arch-commits
mailing list