From 78f595ee0923905dc422eda16493a363788831ff Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mar 07 2013 12:46:46 +0000 Subject: Merge branch 'master' into f17 --- diff --git a/.gitignore b/.gitignore index 8759200..f53857c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/kde-baseapps-4.8.5.tar.xz -/kde-baseapps-4.9.1.tar.xz -/kde-baseapps-4.9.2.tar.xz -/kde-baseapps-4.9.3.tar.xz -/kde-baseapps-4.9.4.tar.xz -/kde-baseapps-4.9.5.tar.xz +/kde-baseapps-4.10.1.tar.xz 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(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 selectedItems = selectionManager->selectedItems(); - -- for (QList::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) { -+ QList::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; - } - } - diff --git a/kde-baseapps.spec b/kde-baseapps.spec index 237c6e3..edc773c 100644 --- a/kde-baseapps.spec +++ b/kde-baseapps.spec @@ -1,6 +1,6 @@ Name: kde-baseapps Summary: KDE Core Applications -Version: 4.9.5 +Version: 4.10.1 Release: 1%{?dist} License: GPLv2 @@ -11,8 +11,7 @@ URL: https://projects.kde.org/projects/kde/kde-baseapps %else %global stable stable %endif -Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kde-baseapps-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://download.kde.org/%{stable}/%{version}/src/kde-baseapps-%{version}.tar.xz ## upstreamable patches # search path for plugins @@ -58,7 +57,10 @@ Provides: konq-plugins = %{version}-%{release} Provides: konqueror = %{version}-%{release} BuildRequires: desktop-file-utils +BuildRequires: kactivities-devel >= %{version} BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: nepomuk-core-devel >= %{version} +BuildRequires: nepomuk-widgets-devel >= %{version} %if 0%{?fedora} BuildRequires: libtidy-devel %endif @@ -225,7 +227,6 @@ fi %{_kde4_appsdir}/fsview/ %{_kde4_appsdir}/kbookmark/ %{_kde4_appsdir}/kcmcss/ -%{_kde4_appsdir}/kconf_update/* %{_kde4_appsdir}/kcontrol/ %{_kde4_appsdir}/kdm/ %{_kde4_appsdir}/keditbookmarks/ @@ -270,11 +271,29 @@ fi %changelog -* Sat Dec 29 2012 Rex Dieter - 4.9.5-1 -- 4.9.5 +* Sat Mar 02 2013 Rex Dieter 4.10.1-1 +- 4.10.1 -* Mon Dec 10 2012 Than Ngo - 4.9.4-2 -- apply upstream patch to fix regression in dolphin +* Thu Jan 31 2013 Rex Dieter - 4.10.0-1 +- 4.10.0 + +* Sun Jan 20 2013 Rex Dieter - 4.9.98-1 +- 4.9.98 + +* Fri Jan 04 2013 Rex Dieter - 4.9.97-1 +- 4.9.97 + +* Thu Dec 20 2012 Rex Dieter - 4.9.95-1 +- 4.9.95 + +* Thu Dec 13 2012 Rex Dieter 4.9.90-3 +- Dolphin cannot start due to symbol lookup error (#886964) + +* Mon Dec 03 2012 Rex Dieter 4.9.90-2 +- BR: kactivites-devel nepomuk-core-devel + +* Mon Dec 03 2012 Rex Dieter 4.9.90-1 +- 4.9.90 (4.10 beta2) * Mon Dec 03 2012 Than Ngo - 4.9.4-1 - 4.9.4 @@ -481,7 +500,7 @@ fi * Tue Aug 03 2010 Than Ngo - 6:4.5.0-1 - 4.5.0 -* Sat Jul 25 2010 Rex Dieter - 6:4.4.95-1 +* Sun Jul 25 2010 Rex Dieter - 6:4.4.95-1 - 4.5 RC3 (4.4.95) * Wed Jul 07 2010 Rex Dieter - 6:4.4.92-1 @@ -841,175 +860,3 @@ fi * Mon Jan 07 2008 Than Ngo 4.0.0-1 - 4.0.0 - -* Tue Dec 25 2007 Kevin Kofler 3.97.0-5 -- Obsoletes: dolphin, d3lphin, Provides: dolphin (F9+) - -* Fri Dec 14 2007 Rex Dieter 3.97.0-4 -- Obsoletes: -extras (f9+) - -* Wed Dec 12 2007 Kevin Kofler 3.97.0-3 -- rebuild for changed _kde4_includedir - -* Sun Dec 09 2007 Kevin Kofler 3.97.0-2 -- rm konsoleprofile when building as kdebase4, does nothing with KDE 3 konsole - -* Thu Dec 06 2007 Than Ngo 3.97.0-1 -- update to 3.97.0 - -* Sat Dec 01 2007 Kevin Kofler 3.96.2-1 -- merge changes from Sebastian Vahl's version: - - update to 3.96.2, remove beta warnings - - BR: kde-filesystem >= 4 - - only remove conflicts when building as kdebase4, update file list - - run xdg-icon-resource forceupdate for hicolor when building as kdebase -- make this the default kdebase for F9 again - -* Mon Nov 19 2007 Kevin Kofler 3.96.0-4 -- don't list libkdeinit4_*.so, we remove all of them as conflicts - -* Mon Nov 19 2007 Kevin Kofler 3.96.0-3 -- remove new directory/files %{_kde4_datadir}/templates (conflict with KDE 3) - -* Mon Nov 19 2007 Kevin Kofler 3.96.0-2 -- (re)add %{_kde4_iconsdir}/oxygen/*/*/* to file list - -* Mon Nov 19 2007 Kevin Kofler 3.96.0-1 -- update to 3.96.0 -- drop dolphin-desktop patch, fixed upstream -- don't list files which are now in kdebase-runtime -- add Requires: kdebase-runtime - -* Thu Oct 25 2007 Kevin Kofler 3.94.0-2 -- patch dolphin.desktop to get Dolphin to start from the menu - -* Fri Oct 19 2007 Kevin Kofler 3.94.0-1 -- update to 3.94.0 - -* Thu Oct 4 2007 Kevin Kofler 3.93.0-5 -- don't make this the default kdebase on F9 yet -- drop ExcludeArch: ppc64 (#300601) - -* Fri Sep 21 2007 Kevin Kofler 3.93.0-4 -- ExcludeArch: ppc64 (#300601) -- update description - -* Thu Sep 13 2007 Kevin Kofler 3.93.0-3 -- add missing BR alsa-lib-devel - -* Wed Sep 12 2007 Kevin Kofler 3.93.0-2 -- remove files which conflict with KDE 3 -- move devel symlinks to %%{_kde4_libdir}/kde4/devel/ -- Conflicts with KDE 3 versions of dolphin pre d3lphin rename - -* Wed Sep 12 2007 Kevin Kofler 3.93.0-1 -- update to 3.93.0 -- drop kde4home patch (no longer applied) -- drop KDM ConsoleKit patch (KDM is now in kdebase-workspace) -- remove kdebase-kdm Obsoletes/Provides (for the same reason) -- remove KDM (and KDM session) setup code (for the same reason) -- remove rss-glx conflict (Plasma is now in kdebase-workspace) -- remove redhat-startkde patch (startkde is now in kdebase-workspace) -- remove kde4-opt.sh (all the code in it is commented out) -- remove kde4-xdg_menu_prefix.sh (only needed for kdebase-workspace) -- remove bogus BRs on automake and libtool -- remove workspace-only BRs -- add BR qimageblitz-devel, xine-lib-devel (all), libxcb-devel (F8+) -- remove workspace files and directories -- handle icons (moved from kdelibs4) -- add mkdir %%{buildroot} in %%install - -* Tue Aug 14 2007 Rex Dieter 3.92.0-4 -- use macros.kde4 -- License: GPLv2 - -* Mon Jul 30 2007 Kevin Kofler 3.92.0-3 -- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8 -- rss-glx conflict only needed if "%%{_prefix}" == "/usr" -- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel - -* Mon Jul 30 2007 Rex Dieter 3.92.0-2 -- consolekit_kdm patch (#228111, kde#147790) -- update startkde patch - -* Sat Jul 28 2007 Rex Dieter 3.92.0-1 -- kde-3.92 (kde-4-beta1) - -* Wed Jul 25 2007 Than Ngo - 3.91.0-6 -- fix startkde -- add env/shutdown directory - -* Thu Jul 19 2007 Rex Dieter 3.91.0-5 -- kde4.desktop: fix session Name - -* Tue Jul 17 2007 Rex Dieter 3.91.0-4 -- cleanup/fix kde4.desktop -- kdepimlibs4->kdepimlibs - -* Thu Jun 29 2007 Rex Dieter 3.91.0-3 -- fix %%_sysconfdir for %%_prefix != /usr case. - -* Thu Jun 28 2007 Rex Dieter 3.91.0-2 -- updated kde4home.diff -- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags) - -* Wed Jun 27 2007 Rex Dieter 3.91.0-1 -- kde-3.91.0 -- CMAKE_BUILD_TYPE=debug - -* Sat Jun 23 2007 Rex Dieter 3.90.1-2 -- specfile cleanup (%%prefix issues mostly) - -* Sun May 13 2007 Kevin Kofler 3.90.1-1 -- update to 3.90.1 -- bump cmake BR to 2.4.5 as required upstream now -- don't set execute bits by hand anymore, cmake has been fixed -- use multilibs in /opt/kde4 -- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel -- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel - in case we want to drop the Rs on these from kdelibs4-devel -- consistently add all BRs as -devel Rs, not just almost all, until we can - figure out which, if any, are really needed -- BR libsmbclient-devel instead of samba on F>=7, EL>=6 - -* Fri Mar 23 2007 Kevin Kofler 3.80.3-4 -- restore minimum version requirement for cmake -- build against libxklavier on EL5 -- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed - -* Mon Mar 05 2007 Rex Dieter 3.80.3-3 -- +eXecute perms for %%{_prefix}/lib/* - -* Fri Feb 23 2007 Kevin Kofler 3.80.3-2 -- rebuild for patched FindKDE4Internal.cmake - -* Wed Feb 21 2007 Kevin Kofler 3.80.3-1 -- update to 3.80.3 -- update and improve parallel-installability patch -- drop obsolete joydevice.h patch -- remove translations of "KDE" without the "4" from kde4.desktop -- resync BR and -devel Requires -- don't set LD_LIBRARY_PATH -- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work -- fix missing underscore in _datadir -- install kde4.desktop in install, not prep -- fix invalid syntax in kde4.desktop - -* Wed Nov 29 2006 Chitlesh Goorah 3.80.2-0.3.20061003svn -- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake -- compiling with QA_RPATHS=0x0003; export QA_RPATHS - -* Sun Nov 26 2006 Chitlesh Goorah 3.80.2-0.2.20061003svn -- parallel build support -- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath -- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR -- spec file cleanups and added clean up in %%install -- fixed PATH for libkdecore.so.5; cannot open shared object file; -- added Logitech mouse support -- added dbus-devel, hal-devel and more as BR -- fixed broken joydevice.h - Kevin Kofler -- added file kde4.desktop - -* Sun Oct 08 2006 Kevin Kofler 3.80.2-0.1.20061003svn -- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM) -- apply parallel-installability patch diff --git a/sources b/sources index 7cd127e..17c4488 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -510440a4efc787e3fbb7d13e24ce821c kde-baseapps-4.9.5.tar.xz +e675ad3fb14275cf70610074b44de066 kde-baseapps-4.10.1.tar.xz