RPM Packaging: add 3.5.13.2 build patches

4 files changed, 232 insertions, 0 deletions

diff --git a/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch b/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch
new file mode 100644
index 000000000..45f75e3c6
--- /dev/null
+++ b/redhat/tdelibs/kdelibs-3.5.13.2-kpassivepopup_latin1.patch
@@ -0,0 +1,11 @@
+--- trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp.ORI	2013-02-16 23:33:04.657067698 +0100
++++ trinity-tdelibs-3.5.13.2/kdeui/kpassivepopup.cpp	2013-02-16 23:34:42.083107895 +0100
+@@ -152,7 +152,7 @@
+     }
+ 
+     if ( !text.isEmpty() ) {
+-        msg = new TQLabel( text, vb, "msg_label" );
++        const char* m = text.latin1(); msg = new TQLabel( TQString::fromUtf8(m), vb, "msg_label" );
+         msg->setAlignment( AlignLeft );
+     }
+ 
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch b/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch
new file mode 100644
index 000000000..dfb472ee1
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-cups_by_default.patch
@@ -0,0 +1,33 @@
+--- ./kdeprint/kmfactory.cpp.ORI	2013-05-09 00:14:51.664045869 +0200
++++ ./kdeprint/kmfactory.cpp	2013-05-09 00:16:59.154367127 +0200
+@@ -249,8 +249,21 @@
+ 		conf->writeEntry("PrintSystem", sys);
+ 		conf->sync();
+ 	}
+-	else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings
++	else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings
+         	sys = "lpdunix";
++	} else {
++		//Always Autodetect
++		//it will not try autodetect if user changes any option
++		//when user force some option, AlwaysSearch will be "no" and then
++		//kprinter will not to try autodetect again.
++		if(conf->readEntry("AlwaysSearch") != "no" ) {
++			sys = autoDetect();
++			conf->writeEntry("PrintSystem",sys);
++			conf->writeEntry("AlwaysSearch","yes");
++			conf->sync();
++		}
++	}
++
+ 	return sys;
+ }
+ 
+@@ -278,6 +291,7 @@
+ 	{
+ 		KConfig	*conf = printConfig();
+ 		conf->setGroup("General");
++		conf->writeEntry("AlwaysSearch","no");
+ 		conf->writeEntry("PrintSystem", syst);
+ 		conf->sync();
+ 
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
new file mode 100644
index 000000000..e56d7559d
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix_kzip_empty_directory.patch
@@ -0,0 +1,38 @@
+--- ./kio/kio/kzip.cpp.ORI	2013-05-31 23:15:23.021298550 +0200
++++ ./kio/kio/kzip.cpp	2013-05-31 23:16:43.525633640 +0200
+@@ -1051,6 +1051,21 @@
+     return true;
+ }
+ 
++bool KZip::writeDir(const TQString& name, const TQString& user, const TQString& group)
++{
++    // Zip files have no explicit directories, they are implicitly created during extraction time
++    // when file entries have paths in them.
++    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
++    TQString dirName = name;
++    if (!name.endsWith("/")) {
++        dirName = dirName.append('/');
++    }
++
++    mode_t perm = 040755;
++    time_t the_time = time(0);
++    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
++}
++
+ // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
+ bool KZip::writeFile( const TQString& name, const TQString& user, const TQString& group, uint size, const char* data )
+ {
+--- ./kio/kio/kzip.h.ORI	2013-05-31 23:18:30.829414791 +0200
++++ ./kio/kio/kzip.h	2013-05-31 23:19:10.763589109 +0200
+@@ -191,10 +191,7 @@
+     /// Closes the archive
+     virtual bool closeArchive();
+ 
+-    /**
+-     * @internal Not needed for zip
+-     */
+-    virtual bool writeDir( const TQString& name, const TQString& user, const TQString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
++    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
+     // TODO(BIC) uncomment and make virtual for KDE 4.
+ //    bool writeDir( const TQString& name, const TQString& user, const TQString& group,
+ //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch
new file mode 100644
index 000000000..28fe715b4
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-xdg_dirs_set_path.patch
@@ -0,0 +1,150 @@
+--- ./kdecore/kglobalsettings.h.Ori	2013-05-08 22:16:42.771982104 +0200
++++ ./kdecore/kglobalsettings.h	2013-05-08 22:18:33.882577602 +0200
+@@ -253,6 +253,29 @@
+      */
+     static TQString documentPath() { initStatic(); return *s_documentPath; }
+ 
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the videos directory
++     */
++    static TQString videosPath() { initStatic(); return *s_videosPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the music directory
++     */
++    static TQString musicPath() { initStatic(); return *s_musicPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the downloads directory
++     */
++    static TQString downloadPath() { initStatic(); return *s_downloadPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the pictures directory
++     */
++    static TQString picturesPath() { initStatic(); return *s_picturesPath; }
+ 
+     /**
+      * The default color to use when highlighting toolbar buttons.
+@@ -560,6 +583,10 @@
+     static TQString* s_autostartPath;
+     static TQString* s_trashPath;
+     static TQString* s_documentPath;
++    static TQString* s_picturesPath;
++    static TQString* s_downloadPath;
++    static TQString* s_musicPath;
++    static TQString* s_videosPath;
+     static TQFont *_generalFont;
+     static TQFont *_fixedFont;
+     static TQFont *_toolBarFont;
+--- ./kdecore/kglobalsettings.cpp.xdg_path	2013-01-09 19:23:09.000000000 +0100
++++ ./kdecore/kglobalsettings.cpp	2013-05-08 22:26:26.451376166 +0200
+@@ -62,6 +62,10 @@
+ TQString* KGlobalSettings::s_autostartPath = 0;
+ TQString* KGlobalSettings::s_trashPath = 0;
+ TQString* KGlobalSettings::s_documentPath = 0;
++TQString* KGlobalSettings::s_videosPath = 0;
++TQString* KGlobalSettings::s_musicPath = 0;
++TQString* KGlobalSettings::s_downloadPath = 0;
++TQString* KGlobalSettings::s_picturesPath = 0;
+ TQFont *KGlobalSettings::_generalFont = 0;
+ TQFont *KGlobalSettings::_fixedFont = 0;
+ TQFont *KGlobalSettings::_toolBarFont = 0;
+@@ -83,7 +87,7 @@
+ 
+ // helper function for reading xdg user dirs: it is required in order to take 
+ // care of locale stuff
+-void readXdgUserDirs(TQString *desktop, TQString *documents)
++void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures)
+ {
+ 	TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
+ 
+@@ -101,6 +105,14 @@
+ 			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
+ 			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_MUSIC_DIR="))
++			*videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_DOWNLOAD_DIR="))
++			*download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_VIDEOS_DIR="))
++			*music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_PICTURES_DIR="))
++			*pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ 
+ 		line = s.readLine();
+ 	}
+@@ -515,30 +527,45 @@
+     s_autostartPath = new TQString();
+     s_trashPath = new TQString();
+     s_documentPath = new TQString();
++    s_videosPath = new TQString();
++    s_musicPath = new TQString();
++    s_downloadPath = new TQString();
++    s_picturesPath = new TQString();
++
+ 
+     KConfigGroup g( KGlobal::config(), "Paths" );
+ 
+-	// Read desktop and documents path using XDG_USER_DIRS
+-	readXdgUserDirs(s_desktopPath, s_documentPath);
++    // Read desktop and documents path using XDG_USER_DIRS
++    readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath);
+ 	
+     if (s_desktopPath->isEmpty() == true) {
+       *s_desktopPath = TQDir::homeDirPath() + "/Desktop/";
+     }
++
+     *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath );
+     if ( !s_desktopPath->endsWith("/") )
+       s_desktopPath->append('/');
+ 
+-    if (s_documentPath->isEmpty() == true) {
+-#ifdef Q_WS_WIN
+-      *s_documentPath = getWin32ShellFoldersPath("Personal");
+-#else
+-      *s_documentPath = TQDir::homeDirPath() + "/Documents/";
+-#endif
+-    }
+     *s_documentPath = TQDir::cleanDirPath( *s_documentPath );
+     if ( !s_documentPath->endsWith("/"))
+       s_documentPath->append('/');
+ 
++    *s_musicPath = TQDir::cleanDirPath( *s_musicPath );
++    if ( !s_musicPath->endsWith("/"))
++      s_musicPath->append('/');
++
++    *s_videosPath = TQDir::cleanDirPath( *s_videosPath );
++    if ( !s_videosPath->endsWith("/"))
++      s_videosPath->append('/');
++
++    *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath );
++    if ( !s_downloadPath->endsWith("/"))
++      s_downloadPath->append('/');
++
++    *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath );
++    if ( !s_picturesPath->endsWith("/"))
++      s_picturesPath->append('/');
++
+     // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
+     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
+     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
+@@ -603,6 +630,14 @@
+     s_desktopPath = 0L;
+     delete s_documentPath;
+     s_documentPath = 0L;
++    delete s_videosPath;
++    s_videosPath = 0L;
++    delete s_picturesPath;
++    s_picturesPath = 0L;
++    delete s_downloadPath;
++    s_downloadPath = 0L;
++    delete s_musicPath;
++    s_musicPath = 0L;
+ }
+ 
+ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings()