[packages/kde4-kdebase] - up to 4.9.5
arekm
arekm at pld-linux.org
Sat Jan 5 09:35:42 CET 2013
commit bf5a4ee41ec3e04bdfd5d7849223c878b2dd50d1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Jan 5 09:35:39 2013 +0100
- up to 4.9.5
kde-baseapps-4.9.4-fix-bugs-311206-311246.diff | 232 -------------------------
kde4-kdebase.spec | 8 +-
2 files changed, 3 insertions(+), 237 deletions(-)
---
diff --git a/kde4-kdebase.spec b/kde4-kdebase.spec
index e77fdf7..d0de3ed 100644
--- a/kde4-kdebase.spec
+++ b/kde4-kdebase.spec
@@ -15,14 +15,13 @@ Summary(ru.UTF-8): K Desktop Environment - базовые файлы
Summary(uk.UTF-8): K Desktop Environment - базові файли
Summary(zh_CN.UTF-8): KDE核心
Name: kde4-kdebase
-Version: 4.9.4
-Release: 2
+Version: 4.9.5
+Release: 1
License: GPL
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
-# Source0-md5: a8fb5329986598d155e9861ea638da65
+# Source0-md5: 510440a4efc787e3fbb7d13e24ce821c
Patch100: %{name}-branch.diff
-Patch0: kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
URL: http://www.kde.org/
BuildRequires: QtCore-devel >= %{qtver}
BuildRequires: QtNetwork-devel >= %{qtver}
@@ -249,7 +248,6 @@ Biblioteki współdzielone konquerora.
%prep
%setup -q -n %{orgname}-%{version}
#%patch100 -p0
-%patch0 -p1
for f in $(find . -name '*.desktop'); do
if grep -q '\[ven\]' $f; then
diff --git a/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
deleted file mode 100644
index 9f328ec..0000000
--- a/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
- m_additionalInfoTextColor(),
- m_overlay(),
- m_rating(),
-- m_roleEditor(0)
-+ m_roleEditor(0),
-+ m_oldRoleEditor(0)
- {
- }
-
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
- m_textInfo.clear();
-
- delete m_roleEditor;
-+ delete m_oldRoleEditor;
- }
-
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
- return;
-+ } else if (m_oldRoleEditor) {
-+ // Delete the old editor before constructing the new one to
-+ // prevent a memory leak.
-+ m_oldRoleEditor->deleteLater();
-+ m_oldRoleEditor = 0;
- }
-
- Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
-
- void KStandardItemListWidget::closeRoleEditor()
- {
-+ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
- if (m_roleEditor->hasFocus()) {
- // If the editing was not ended by a FocusOut event, we have
- // to transfer the keyboard focus back to the KItemListContainer.
- scene()->views()[0]->parentWidget()->setFocus();
- }
-
-- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
-- // Do not delete the role editor using deleteLater() because we might be
-- // inside a nested event loop which has been started by one of its event
-- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
-- m_roleEditor->deleteWhenIdle();
-+ m_oldRoleEditor = m_roleEditor;
-+ m_roleEditor->hide();
- m_roleEditor = 0;
- }
-
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
- QPixmap m_rating;
-
- KItemListRoleEditor* m_roleEditor;
-+ KItemListRoleEditor* m_oldRoleEditor;
-
- friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
- // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
- KTextEdit(parent),
- m_index(0),
- m_role(),
-- m_blockFinishedSignal(false),
-- m_eventHandlingLevel(0),
-- m_deleteAfterEventHandling(false)
-+ m_blockFinishedSignal(false)
- {
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
- return m_role;
- }
-
--void KItemListRoleEditor::deleteWhenIdle()
--{
-- if (m_eventHandlingLevel > 0) {
-- // We are handling an event at the moment. It could be that we
-- // are in a nested event loop run by contextMenuEvent() or a
-- // call of mousePressEvent() which results in drag&drop.
-- // -> do not call deleteLater() to prevent a crash when we
-- // return from the nested event loop.
-- m_deleteAfterEventHandling = true;
-- } else {
-- deleteLater();
-- }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
- if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
-
- bool KItemListRoleEditor::event(QEvent* event)
- {
-- ++m_eventHandlingLevel;
--
- if (event->type() == QEvent::FocusOut) {
- QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
- if (focusEvent->reason() != Qt::PopupFocusReason) {
- emitRoleEditingFinished();
- }
- }
--
-- const int result = KTextEdit::event(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
-- ++m_eventHandlingLevel;
-- const bool result = KTextEdit::viewportEvent(event);
-- --m_eventHandlingLevel;
--
-- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
-- // Schedule this object for deletion and make sure that we do not try
-- // to deleteLater() again when the DeferredDelete event is received.
-- deleteLater();
-- m_deleteAfterEventHandling = false;
-- }
--
-- return result;
-+ return KTextEdit::event(event);
- }
-
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
- return;
- case Qt::Key_Enter:
- case Qt::Key_Return:
-- // TODO: find a better way to fix the bug 309760
-- clearFocus(); // emitRoleEditingFinished(); results in a crash
-+ emitRoleEditingFinished();
- event->accept();
- return;
- default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
- void setRole(const QByteArray& role);
- QByteArray role() const;
-
-- /**
-- * Calls deleteLater() if no event is being handled at the moment.
-- * Otherwise, the deletion is deferred until the event handling is
-- * finished. This prevents that the deletion happens inside a nested
-- * event loop which might be run in contextMenuEvent() or
-- * mouseMoveEvent() because this would probably cause a crash.
-- */
-- void deleteWhenIdle();
--
- virtual bool eventFilter(QObject* watched, QEvent* event);
-
- signals:
-@@ -64,7 +55,6 @@ signals:
-
- protected:
- virtual bool event(QEvent* event);
-- virtual bool viewportEvent(QEvent* event);
- virtual void keyPressEvent(QKeyEvent* event);
-
- private slots:
-@@ -85,8 +75,6 @@ private:
- int m_index;
- QByteArray m_role;
- bool m_blockFinishedSignal;
-- int m_eventHandlingLevel;
-- bool m_deleteAfterEventHandling;
- };
-
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
-
- QSet<int> selectedItems = selectionManager->selectedItems();
-
-- for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+ QList<KUrl>::iterator it = m_selectedUrls.begin();
-+ while (it != m_selectedUrls.end()) {
- const int index = m_model->index(*it);
- if (index >= 0) {
- selectedItems.insert(index);
-- m_selectedUrls.erase(it);
-+ it = m_selectedUrls.erase(it);
-+ } else {
-+ ++it;
- }
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase.git/commitdiff/bf5a4ee41ec3e04bdfd5d7849223c878b2dd50d1
More information about the pld-cvs-commit
mailing list