RHEL/Fedora: updates kdebase 3.5.13

4 files changed, 121 insertions, 17 deletions

diff --git a/redhat/kdebase/1333232616:f752bcbf6585c61f414963ad83e1300a1da08504.diff b/redhat/kdebase/1333232616:f752bcbf6585c61f414963ad83e1300a1da08504.diff
new file mode 100644
index 000000000..015270759
--- /dev/null
+++ b/redhat/kdebase/1333232616:f752bcbf6585c61f414963ad83e1300a1da08504.diff
@@ -0,0 +1,18 @@
+commit f752bcbf6585c61f414963ad83e1300a1da08504
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1333232616 -0500
+
+    Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
+
+diff --git a/kioslave/system/entries/documents.desktop b/kioslave/system/entries/documents.desktop
+index e5fc3d1..d65cc3d 100644
+--- a/kioslave/system/entries/documents.desktop
++++ b/kioslave/system/entries/documents.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=Link
+-Path=$( kxdglauncher --getpath --xdgname DOCUMENTS )
++URL=$( kxdglauncher --getpath --xdgname DOCUMENTS )
+ Icon=folder_man
+ Name=Documents Folder
+ Name[af]=Dokument Gids
diff --git a/redhat/kdebase/1335166907:e72f4926c094b2bd94501518fbcd2a3e66a74f6a.diff b/redhat/kdebase/1335166907:e72f4926c094b2bd94501518fbcd2a3e66a74f6a.diff
new file mode 100644
index 000000000..64dfa8e21
--- /dev/null
+++ b/redhat/kdebase/1335166907:e72f4926c094b2bd94501518fbcd2a3e66a74f6a.diff
@@ -0,0 +1,57 @@
+commit e72f4926c094b2bd94501518fbcd2a3e66a74f6a
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1335166907 -0500
+
+    Fix sftp failure on newer systems
+    This closes Bug 897
+
+diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
+index 2ccab59..3393f89 100644
+--- a/kioslave/sftp/ksshprocess.cpp
++++ b/kioslave/sftp/ksshprocess.cpp
+@@ -569,7 +569,9 @@ TQString KSshProcess::getLine() {
+         // If we still don't have anything in our buffer so there must
+         // not be anything on the pty or stderr. Setup a select()
+         // to wait for some data from SSH.
+-        if( buffer.empty() ) {
++        // Hack around select() failure on newer systems
++        unsigned long milliseconds = 0;
++        while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
+             //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
+             //    "Line buffer empty, calling select() to wait for data." << endl;
+             int errfd = ssh.stderrFd();
+@@ -616,14 +618,18 @@ TQString KSshProcess::getLine() {
+             // had data on it first.
+             if( FD_ISSET(ptyfd, &rfds) ) {
+                 ptyLine = ssh.readLineFromPty(false);
+-                buffer.prepend(TQString(ptyLine));
++                if (ptyLine.size() > 0) {
++                    buffer.prepend(TQString(ptyLine));
++                }
+                 //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
+                 //    "line from pty -" << ptyLine  << endl;
+             }
+-            
++
+             if( FD_ISSET(errfd, &rfds) ) {
+                 errLine = ssh.readLineFromStderr(false);
+-                buffer.prepend(TQString(errLine));
++                if (errLine.size() > 0) {
++                    buffer.prepend(TQString(errLine));
++                }
+                 //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
+                 //    "line from err -" << errLine << endl;
+             }
+@@ -637,7 +643,11 @@ TQString KSshProcess::getLine() {
+                 kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
+                     "Exception on std err file descriptor." << endl;
+             }
+-            
++
++            if (buffer.size() == 0) {
++                milliseconds++;
++                usleep(1000);
++            }
+         }
+     }
+    
diff --git a/redhat/kdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch b/redhat/kdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch
new file mode 100644
index 000000000..2b3d38880
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch
@@ -0,0 +1,19 @@
+commit bd9c1479d7a965959147398d71f18be62b2aa8b6
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date:   1333232418 -0500
+
+    Ensure pagersettings.kcfg is installed.
+
+diff --git a/kicker/applets/minipager/CMakeLists.txt b/kicker/applets/minipager/CMakeLists.txt
+index b9ca9c7..a90269c 100644
+--- a/kicker/applets/minipager/CMakeLists.txt
++++ b/kicker/applets/minipager/CMakeLists.txt
+@@ -27,7 +27,7 @@ link_directories(
+ ##### other data ################################
+ 
+ install( FILES minipagerapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+-
++install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+ 
+ ##### minipager_panelapplet (module) ############
+ 
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index dd5bf82ab..ebd1b3464 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 17
+%define release 18
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -50,31 +50,27 @@ Source5:	pamd.kscreensaver-trinity%{?dist}
 # [kdebase] Fix corrupted PNG images [Bug #298]
 Source6:	tiles-fixed-png-images.tar.gz
 
-# TDE unofficial patches, fixing FTBFS
-## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
+# TDE 3.5.13 patches
+## [kdebase/kdm] adds gcrypt support [Bug #624]
+Patch7:		kdebase-3.5.13-kdm-crypt.patch
+## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes [RHEL/Fedora]
 Patch8:		kdebase-3.5.13-mediamanager_ftbfs.patch
-## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 [RHEL/Fedora]
 Patch9:		kdebase-3.5.13-startkde_ldpreload.patch
-
-# TDE for RHEL/Fedora specific patches
-## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
+## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box [RHEL/Fedora]
 Patch10:	kdebase-3.5.13-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
 Patch11:	kdebase-3.5.12-desktop-openterminalhere.patch
-## [kdebase/kioslave] Forces HAL backend to use HAL mount options
+## [kdebase/kioslave] Forces HAL backend to use HAL mount options [RHEL/Fedora]
 Patch12:	kdebase-3.5.12-halmountoptions.patch
-## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
+## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
 Patch13:	kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues [Bug #508]
 Patch14:	kdebase-3.5.13-kickoff_unstable.patch
-## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
+## [kdebase/startkde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
 Patch15:	kdebase-3.5.13-startkde_icon.patch
 ## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location [Bug #741]
 Patch16:	kdebase-3.5.13-startkde_directories.patch
-
-# TDE unofficial patches for enhanced features or bugfixes.
-## [kdebase/kdm] adds gcrypt support [Bug #624]
-Patch7:		kdebase-3.5.13-kdm-crypt.patch
 ## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration [Bug #244]
 Patch20:	kdebase-3.5.13-kate_mru.patch
 ## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714]
@@ -95,7 +91,7 @@ Patch27:	kdebase-3.5.13-restore_kde3_clock.patch
 Patch28:	kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
 ## [kdebase/kdesktop/lock] Fix multihead screen locking [Bug #669]
 Patch29:	kdebase-3.5.13-fix_multihead_desktop_lock.patch
-## [kdebase/kdm/kfrontend] Allows to hide KDM menu button
+## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
 Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
 ## [kdebase/kxkb] Enables xtest support
 Patch31:	kdebase-3.5.13-enable_xtest_support.patch
@@ -123,6 +119,12 @@ Patch41:	kdebase-3.5.13-fix_potential_ABI_compat_problem.patch
 Patch42:	kdebase-3.5.13-fix_translations_in_desktop_files.patch
 ## [kdebase/kate] Kate: fix focus broken when using the --use parameter [Bug #692]
 Patch43:	kdebase-3.5.13-kate_focus_fix.patch
+## [kdebase/kicker] Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
+Patch44:	kdebase-3.5.13-ensure_pagersettings_is_installed.patch
+## [kdebase] Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
+Patch45:	1333232616:f752bcbf6585c61f414963ad83e1300a1da08504.diff
+## [kdebase/kioslave] Fix sftp failure on newer systems [Bug #897]
+Patch46:	1335166907:e72f4926c094b2bd94501518fbcd2a3e66a74f6a.diff
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
@@ -344,6 +346,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -730,6 +735,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-18
+- Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
+- Fix "Malformed URL $( kxdglauncher --getpath xdgname DOCUMENTS )" error dialog.
+- Fix sftp failure on newer systems [Bug #897]
+
 * Sun Apr 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-17
 - do not show hostname in titlebar if it's FQDN of localhost [Bug #889]
 - Adds option to disable desktop switch on mouse wheel cycling [Bug #908]