RHEL/Fedora: various updates

7 files changed, 454 insertions, 10 deletions

diff --git a/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch b/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
new file mode 100644
index 000000000..35f271e15
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
@@ -0,0 +1,33 @@
+commit b0fa10df6cf9ba377d6bfdef719efc8ca4fe57a0
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337062555 -0500
+
+    Add drag and drop to kate file list in manual mode
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index bc5b0a1..bd2d087 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -102,7 +102,7 @@ KateFileList::KateFileList (KateMainWindow *main,
+   addColumn("Document Name");
+ 
+   setSelectionMode( TQListView::Single );
+-  setSorting( 0, true );
++  setSortType(KateFileList::sortByID);
+   setShowToolTips( false );
+ 
+   setupActions ();
+@@ -408,9 +408,13 @@ void KateFileList::setSortType (int s)
+   m_sort = s;
+   if (m_sort == KateFileList::sortManual) {
+     setSorting( -1, true );
++    setDragEnabled(true);
++    setAcceptDrops(true);
+   }
+   else {
+     setSorting( 0, true );
++    setDragEnabled(false);
++    setAcceptDrops(false);
+     updateSort ();
+   }
+ }
diff --git a/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch b/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
new file mode 100644
index 000000000..5518f13a9
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch
@@ -0,0 +1,167 @@
+commit 46a657f7108284d4f02107d11fa407cbf95b86b9
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337058308 -0500
+
+    Add the ability to reorder documents in kate
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index 8d34c38..bc5b0a1 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -138,8 +138,14 @@ void KateFileList::setupActions ()
+   windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
+   sortAction = new KSelectAction( i18n("Sort &By"), 0,
+       m_main->actionCollection(), "filelist_sortby"  );
++  listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
++  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
++  listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
++  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
++  connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
++  connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+   TQStringList l;
+-  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
++  l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
+   sortAction->setItems( l );
+   connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
+ }
+@@ -353,10 +359,25 @@ void KateFileList::slotMenu ( TQListViewItem *item, const TQPoint &p, int /*col*
+   if (!item)
+     return;
+ 
++  m_clickedMenuItem = item;
++  if (m_clickedMenuItem->itemAbove()) {
++    listMoveFileUp->setEnabled(true);
++  }
++  else {
++    listMoveFileUp->setEnabled(false);
++  }
++  if (m_clickedMenuItem->itemBelow()) {
++    listMoveFileDown->setEnabled(true);
++  }
++  else {
++    listMoveFileDown->setEnabled(false);
++  }
++
+   TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow()));
+ 
+-  if (menu)
++  if (menu) {
+     menu->exec(p);
++  }
+ }
+ 
+ TQString KateFileList::tooltip( TQListViewItem *item, int )
+@@ -385,7 +406,45 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
+ void KateFileList::setSortType (int s)
+ {
+   m_sort = s;
+-  updateSort ();
++  if (m_sort == KateFileList::sortManual) {
++    setSorting( -1, true );
++  }
++  else {
++    setSorting( 0, true );
++    updateSort ();
++  }
++}
++
++void KateFileList::moveFileUp()
++{
++  if (m_clickedMenuItem) {
++    sortAction->setCurrentItem(KateFileList::sortManual);
++    setSortType(KateFileList::sortManual);
++    TQListViewItem* nitemabove = m_clickedMenuItem->itemAbove();
++    if (nitemabove) {
++      nitemabove = nitemabove->itemAbove();
++      if (nitemabove) {
++        m_clickedMenuItem->moveItem(nitemabove);
++      }
++      else {
++        // Qt made this hard
++        nitemabove = m_clickedMenuItem->itemAbove();
++        nitemabove->moveItem(m_clickedMenuItem);
++      }
++    }
++  }
++}
++
++void KateFileList::moveFileDown()
++{
++  if (m_clickedMenuItem) {
++    sortAction->setCurrentItem(KateFileList::sortManual);
++    setSortType(KateFileList::sortManual);
++    TQListViewItem* nitemabove = m_clickedMenuItem->itemBelow();
++    if (nitemabove) {
++      m_clickedMenuItem->moveItem(nitemabove);
++    }
++  }
+ }
+ 
+ void KateFileList::updateSort ()
+@@ -441,6 +500,11 @@ KateFileListItem::KateFileListItem( TQListView* lv,
+     m_edithistpos( 0 ),
+     m_docNumber( _doc->documentNumber() )
+ {
++  // Move this document to the end of the list where it belongs
++  TQListViewItem* lastitem = lv->lastItem();
++  if (lastitem) {
++    moveItem(lastitem);
++  }
+ }
+ 
+ KateFileListItem::~KateFileListItem()
+diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
+index 176898c..e3504cb 100644
+--- a/kate/app/katefilelist.h
++++ b/kate/app/katefilelist.h
+@@ -90,7 +90,8 @@ class KateFileList : public KListView
+     enum sorting {
+       sortByID = 0,
+       sortByName = 1,
+-      sortByURL = 2
++      sortByURL = 2,
++      sortManual = 3
+     };
+ 
+     TQString tooltip( TQListViewItem *item, int );
+@@ -111,6 +112,8 @@ class KateFileList : public KListView
+ 
+   public slots:
+     void setSortType (int s);
++    void moveFileUp();
++    void moveFileDown();
+     void slotNextDocument();
+     void slotPrevDocument();
+ 
+@@ -151,6 +154,8 @@ class KateFileList : public KListView
+     KAction* windowNext;
+     KAction* windowPrev;
+     KSelectAction* sortAction;
++    KAction* listMoveFileUp;
++    KAction* listMoveFileDown;
+ 
+     TQPtrList<KateFileListItem> m_viewHistory;
+     TQPtrList<KateFileListItem> m_editHistory;
+@@ -158,6 +163,8 @@ class KateFileList : public KListView
+     TQColor m_viewShade, m_editShade;
+     bool m_enableBgShading;
+ 
++    TQListViewItem *m_clickedMenuItem;
++
+     class ToolTip *m_tooltip;
+ };
+ 
+diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc
+index 27df006..6e784e9 100644
+--- a/kate/data/kateui.rc
++++ b/kate/data/kateui.rc
+@@ -162,6 +162,9 @@
+   <Action name="file_close"/>
+   <Action name="file_close_all"/>
+   <Separator/>
++  <Action name="filelist_move_up"/>
++  <Action name="filelist_move_down"/>
++  <Separator/>
+   <Action name="filelist_sortby"/>
+ </Menu>
+ 
diff --git a/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch b/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
index 8ac303883..b75f1c84f 100644
--- a/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
+++ b/redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch
@@ -2,14 +2,8 @@ Index: kdebase/kioslave/media/kcmodule/managermoduleview.ui
 ===================================================================
 --- kdebase/kioslave/media/kcmodule/managermoduleview.ui	(revision 604326)
 +++ kdebase/kioslave/media/kcmodule/managermoduleview.ui	(working copy)
-@@ -8,10 +8,13 @@
-         <rect>
-             <x>0</x>
-             <y>0</y>
--            <width>600</width>
--            <height>480</height>
-+            <width>340</width>
-+            <height>476</height>
+@@ -12,6 +12,9 @@
+             <height>480</height>
          </rect>
      </property>
 +    <property name="caption">
diff --git a/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch b/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
new file mode 100644
index 000000000..b83bef726
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
@@ -0,0 +1,22 @@
+commit 9a948c1af9c07bfdc0eb079cc3cbc84e6bd597c6
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337062714 -0500
+
+    Disable keyboard shortcuts for file location moving, as they did not work properly and have very little practical use
+
+diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
+index bd2d087..d2214a4 100644
+--- a/kate/app/katefilelist.cpp
++++ b/kate/app/katefilelist.cpp
+@@ -139,9 +139,9 @@ void KateFileList::setupActions ()
+   sortAction = new KSelectAction( i18n("Sort &By"), 0,
+       m_main->actionCollection(), "filelist_sortby"  );
+   listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
+-  listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
++  //listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
+   listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
+-  listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
++  //listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
+   connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
+   connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+   TQStringList l;
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch b/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch
new file mode 100644
index 000000000..793334e24
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch
@@ -0,0 +1,162 @@
+commit d2f8fca98e6d276f442f90dee48164be15d8e287
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337223371 -0500
+
+    Fix fancy logout not allowing interaction with save dialogs
+    This closes Bug 922
+    Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded
+
+diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
+index 8e41b50..fe8574a 100644
+--- a/krootbacking/krootbacking.cpp
++++ b/krootbacking/krootbacking.cpp
+@@ -54,6 +54,8 @@ public:
+ KRootBacking::KRootBacking()
+     : TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0)
+ {
++    enableExports();
++
+     init();
+ }
+ 
+diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
+index a4ca020..09cb2d7 100644
+--- a/ksmserver/shutdown.cpp
++++ b/ksmserver/shutdown.cpp
+@@ -189,24 +189,6 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
+         // shall we save the session on logout?
+         saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" );
+ 
+-        if (showFancyLogout) {
+-            KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
+-            shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
+-            while (!KSMShutdownIPFeedback::ispainted()) {
+-                tqApp->processEvents();
+-            }
+-        }
+-
+-        // synchronize any folders that were requested for shutdown sync
+-        if (shutdownNotifierIPDlg) {
+-            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
+-        }
+-        KRsync krs(this, "");
+-        krs.executeLogoutAutoSync();
+-        if (shutdownNotifierIPDlg) {
+-            static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
+-        }
+-
+         if ( saveSession )
+             sessionGroup = TQString("Session: ") + SESSION_PREVIOUS_LOGOUT;
+ 
+@@ -252,9 +234,9 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
+             completeShutdownOrCheckpoint();
+     }
+     else {
+-        if (showFancyLogout) {
+-            KSMShutdownIPFeedback::stop();
+-        }
++       if (showFancyLogout) {
++           KSMShutdownIPFeedback::stop();
++       }
+     }
+     dialogActive = false;
+ }
+@@ -502,6 +484,25 @@ void KSMServer::completeShutdownOrCheckpoint()
+     if ( waitForPhase2 )
+         return;
+ 
++    bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true);
++    if (showFancyLogout) {
++        KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
++        shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
++        while (!KSMShutdownIPFeedback::ispainted()) {
++            tqApp->processEvents();
++        }
++    }
++
++    // synchronize any folders that were requested for shutdown sync
++    if (shutdownNotifierIPDlg) {
++        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("..."));
++    }
++    KRsync krs(this, "");
++    krs.executeLogoutAutoSync();
++    if (shutdownNotifierIPDlg) {
++        static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings..."));
++    }
++
+     if ( saveSession )
+         storeSession();
+     else
+diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
+index 163352a..35cae65 100644
+--- a/ksmserver/shutdowndlg.cpp
++++ b/ksmserver/shutdowndlg.cpp
+@@ -528,6 +528,11 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
+ : TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+ 
+ {
++	setShown(false);
++	hide();
++
++	enableExports();
++
+ 	m_sharedRootPixmap = new KRootPixmap(this);
+ 	m_sharedRootPixmap->setCustomPainting(true);
+ 	connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
+@@ -554,15 +559,36 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
+ 	setBackgroundPixmap( m_root );
+ 	setGeometry( TQApplication::desktop()->geometry() );
+ 	setBackgroundMode( TQWidget::NoBackground );
+-
+-	setShown(true);
+ }
+ 
+ void KSMShutdownIPFeedback::showNow()
+ {
++	setShown(true);
++
+ 	TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
+ }
+ 
++void KSMShutdownIPFeedback::enableExports()
++{
++#ifdef Q_WS_X11
++	kdDebug(270) << k_lineinfo << "activating background exports.\n";
++	DCOPClient *client = kapp->dcopClient();
++	if (!client->isAttached()) {
++		client->attach();
++	}
++	TQByteArray data;
++	TQDataStream args( data, IO_WriteOnly );
++	args << 1;
++	
++	TQCString appname( "kdesktop" );
++	int screen_number = DefaultScreen(qt_xdisplay());
++	if ( screen_number )
++	appname.sprintf("kdesktop-screen-%d", screen_number );
++	
++	client->send( appname, "KBackgroundIface", "setExport(int)", data );
++#endif
++}
++
+ KSMShutdownIPFeedback::~KSMShutdownIPFeedback()
+ {
+ 	if (m_sharedRootPixmap) {
+diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
+index db66c55..05ca991 100644
+--- a/ksmserver/shutdowndlg.h
++++ b/ksmserver/shutdowndlg.h
+@@ -97,6 +97,13 @@
+     void slotSetBackgroundPixmap(const TQPixmap &);
+ 
+ private:
++	/**
++	* Asks KDesktop to export the desktop background as a KSharedPixmap.
++	* This method uses DCOP to call KBackgroundIface/setExport(int).
++	*/
++	void enableExports();
++
++private:
+     static KSMShutdownIPFeedback * s_pSelf;
+     KSMShutdownIPFeedback();
+     int m_currentY;
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch b/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
new file mode 100644
index 000000000..99256971b
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
@@ -0,0 +1,38 @@
+commit b45b4bd730da3196a4658773f7eef46e004a39d6
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1337063762 -0500
+
+    Fix KHTML smooth scrolling control center option
+    This closes Bug 1001
+    Thanks to Roman Savochenko for the patch!
+
+diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
+index 0b81421..9e199cb 100644
+--- a/kcontrol/konqhtml/htmlopts.cpp
++++ b/kcontrol/konqhtml/htmlopts.cpp
+@@ -299,7 +299,7 @@ void KMiscHTMLOptions::load( bool useDefaults )
+     KConfig kdeglobals("kdeglobals", true, false);
+     kdeglobals.setReadDefaults( useDefaults );
+ 	 kdeglobals.setGroup("KDE");
+-    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScroll", DEFAULT_SMOOTHSCROLL);
++    bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
+     if (smoothScrolling)
+ 	m_pSmoothScrollingCombo->setCurrentItem( SmoothScrollingAlways );
+     else
+@@ -374,13 +374,13 @@ void KMiscHTMLOptions::save()
+     switch(m_pSmoothScrollingCombo->currentItem())
+     {
+       case SmoothScrollingAlways:
+-        kdeglobals.writeEntry( "SmoothScroll", true );
++        kdeglobals.writeEntry( "SmoothScrolling", true );
+         break;
+       case SmoothScrollingNever:
+-        kdeglobals.writeEntry( "SmoothScroll", false );
++        kdeglobals.writeEntry( "SmoothScrolling", false );
+         break;
+       // case SmoothScrollingWhenEfficient:
+-        // kdeglobals.writeEntry( "SmoothScroll", somethingelse );
++        // kdeglobals.writeEntry( "SmoothScrolling", somethingelse );
+         // break;
+     }
+     kdeglobals.sync();
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index c70115656..825c5268b 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -130,10 +130,22 @@ Patch50:	kdebase-3.5.13-engage_lock_in_near_real_time.patch
 Patch51:	kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch
 ## [kdebase/kdesktop/lock] Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
 Patch52:	kdebase-3.5.13-fix_lock_failure.patch
-## [kdebase/kioslave] Temporary fix for a probable race condition on some systems. [Bug #760]
+## [kdebase/kioslave] Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
 Patch53:	kdebase-3.5.13-fix_race_condition.patch
 ## [kdebase] Adds USB default mount options in control panel [Bug #986]
 Patch54:	kdebase-3.5.13-add_usbstorage_panel.patch
+## [tdebase] Add the ability to reorder documents in kate [Commit #46a657f7]
+Patch55:	kdebase-3.5.13-add_reorder_documents_in_kate.patch
+## [tdebase] Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
+Patch56:	kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch
+## [tdebase] Disable keyboard shortcuts for file location moving, as they did not work properly 
+##  and have very little practical use [Commit #9a948c1a]
+Patch57:	kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch
+## [tdebase] Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
+Patch58:	kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
+## [tdebase] Fix fancy logout not allowing interaction with save dialogs [Bug #922]
+##   Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded [Commit #d2f8fca9]
+Patch59:	kdebase-3.5.13-fix_fancy_logout.patch
 
 ### FEDORA / RHEL distribution-specific settings ###
 
@@ -192,6 +204,7 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	gcc-c++ make
 BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	openssl-devel
 BuildRequires:	avahi-devel avahi-qt3-devel
@@ -220,6 +233,8 @@ BuildRequires:	libXdamage-devel
 BuildRequires:	xorg-x11-font-utils
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	nas-devel
+BuildRequires:	pcre-devel
+BuildRequires:	perl-Digest-MD5
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:	libudev-devel
@@ -380,6 +395,11 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -768,6 +788,14 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %changelog
 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-22
 - Adds panel to choose default mounting options for removable storage [Bug #986]
+- Add the ability to reorder documents in kate [Commit #46a657f7]
+- Add drag and drop to kate file list in manual mode [Commit #b0fa10df]
+- Disable keyboard shortcuts for file location moving, as they did not work properly 
+  and have very little practical use [Commit #9a948c1a]
+- Fix KHTML smooth scrolling control center option [Bug #1001] [Commit #b45b4bd7]
+- Fix fancy logout not allowing interaction with save dialogs [Bug #922]
+  Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or 
+  kdesktop_lock not previously loaded [Commit #d2f8fca9]
 
 * Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-21
 - Commit the rest of 8d521d0b, not merged due to GIT glitch [Commit #49526413]
@@ -777,7 +805,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 - Start minimal dcop system to support twin in tdm [Commit #66a19439]
 - Update lock process to engage the lock in near real time [Commit #8d521d0b]
 - Fix desktop lock failure due to race condition within signal handler between qt and xcb [Commit #67a3a8f3]
-- Temporary fix for a probable race condition on some systems. [Bug #760]
+- Temporary fix for a probable race condition on some systems. [Bug #760] [Commit #d41f5217]
 
 * Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-19
 - Build for Fedora 17