RHEL/Fedora: updates kdelibs 3.5.13

4 files changed, 66 insertions, 15 deletions

diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
new file mode 100644
index 000000000..45b622f5b
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch
@@ -0,0 +1,22 @@
+--- a/dcop/dcoptypes.h.ORI	2012-04-24 16:24:05.448308109 -0400
++++ a/dcop/dcoptypes.h	2012-04-24 16:43:55.299809919 -0400
+@@ -22,6 +22,9 @@
+ #ifndef DCOPTYPES_H
+ #define DCOPTYPES_H
+ 
++// generic template fallback for unknown types
++template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
++
+ #include <dcopref.h>
+ 
+ // standard c/c++ types
+@@ -70,9 +73,6 @@
+ // And some KDE types
+ class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }
+ 
+-// generic template fallback for unknown types
+-template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
+-
+ // type initialization for standard c/c++ types
+ inline void dcopTypeInit(bool& b){b=false;}
+ inline void dcopTypeInit(char& c){c=0;}
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
new file mode 100644
index 000000000..c6792dfdc
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch
@@ -0,0 +1,20 @@
+diff -urN tdelibs/kio/kio/kdirwatch.cpp tdelibs.new/kio/kio/kdirwatch.cpp
+--- tdelibs/kio/kio/kdirwatch.cpp	2012-04-05 13:26:08.000000000 -0500
++++ tdelibs.new/kio/kio/kdirwatch.cpp	2012-04-08 17:51:15.000000000 -0500
+@@ -1155,6 +1155,7 @@
+     if(!e->dirty) return NoChange;
+     e->dirty = false;
+   }
++  if (e->isDir) return Changed;
+ #endif
+ 
+   // Shouldn't happen: Ignore "unknown" notification method
+@@ -1184,6 +1185,8 @@
+   if (exists) {
+ 
+     if (e->m_status == NonExistent) {
++      // ctime is the 'creation time' on windows, but with qMax
++      // we get the latest change of any kind, on any platform.
+       e->m_ctime = stat_buf.st_ctime;
+       e->m_status = Normal;
+       e->m_nlink = stat_buf.st_nlink;
diff --git a/redhat/kdelibs/tdelibs-r14.spec b/redhat/kdelibs/tdelibs-r14.spec
index bbbcf60da..0dbf4a796 100755
--- a/redhat/kdelibs/tdelibs-r14.spec
+++ b/redhat/kdelibs/tdelibs-r14.spec
@@ -67,7 +67,7 @@ Requires:		avahi-tqt
 Obsoletes:		trinity-kdelibs <= 3.5.13
 
 %if "%{?_prefix}" == "/usr"
-Provides:	kdelibs%{?_qt_suffix} = %{version}
+Provides:		kdelibs%{?_qt_suffix} = %{version}
 Obsoletes:		kdelibs%{?_qt_suffix} <= 3.5.10
 %endif
 
@@ -124,6 +124,7 @@ export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
 cd build
 %cmake \
   -DHAVE_REAL_TQT=ON \
+  -DHTML_INSTALL_DIR=%{tde_docdir}/HTML \
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \
   -DWITH_LIBART=ON \
@@ -203,13 +204,13 @@ EOF
 %{_bindir}/kcmshell
 %{_bindir}/kconf_update
 %{_bindir}/kcookiejar
-%{_bindir}/kde-config
+%{_bindir}/tde-config
 %{_bindir}/kde-menu
 %{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
+%{_bindir}/tdeinit
+%{_bindir}/tdeinit_shutdown
+%{_bindir}/tdeinit_wrapper
+%{_bindir}/tdesu_stub
 %{_bindir}/kdontchangethehostname
 %{_bindir}/kdostartupconfig
 %{_bindir}/kfile
@@ -235,11 +236,11 @@ EOF
 %{_bindir}/make_driver_db_lpr
 %{_bindir}/meinproc
 %{_bindir}/networkstatustestservice
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
+%{_bindir}/start_tdeinit
+%{_bindir}/start_tdeinit_wrapper
 %attr(4755,root,root) %{_bindir}/kgrantpty
 %{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit_*.so
+%{_libdir}/libtdeinit_*.so
 %{_libdir}/lib*.la
 %{tde_libdir}/
 %{_datadir}/applications/kde/*.desktop
@@ -300,10 +301,8 @@ EOF
 %{_includedir}/
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
-%exclude %{_libdir}/libkdeinit_*.so
-
-# New in TDE 3.5.13
-%{_datadir}/cmake/kdelibs.cmake
+%exclude %{_libdir}/libtdeinit_*.so
+%{_datadir}/cmake/tdelibs.cmake
 
 %files apidocs
 %defattr(-,root,root,-)
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index c6a44125f..2ed52e51b 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 7
+%define release 8
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -52,12 +52,16 @@ Patch14:	kdelibs-3.5.13-enable_fam_gamin.patch
 Patch15:	kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
 ## [kdelibs/kdeprint] Fix add printer [Bug #383]
 Patch16:	kdelibs-3.5.13-fix_add_printer.patch
+## [kdelibs/kio/kdirwatch] Fix "Konqueror: Does not update file pane with file changes" [Bug #756]
+Patch17:	kdelibs-3.5.13-fix_kdirwatch.patch
+## [kdelibs/dcop] Fix 'dcoptypes.h' for compilation with GCC 4.7
+Patch18:	kdelibs-3.5.13-fix_dcoptypes_h.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	avahi-devel
-BuildRequires:	lua-devel
+#BuildRequires:	lua-devel
 BuildRequires:	krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	bzip2-devel
@@ -131,6 +135,8 @@ format for easy browsing
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 
 %build
@@ -331,6 +337,10 @@ EOF
 
 
 %changelog
+* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8
+- Fix "Konqueror: Does not update file pane with file changes" [Bug #756] 
+- Fix compilation with GCC 4.7
+
 * Sat Jan 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
 - Fix UTF8 Encoding for WebDAV directories
 - Fix hardcoded path in 'add printer' [Bug #383]