diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:58:32 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:58:32 +0200 |
| commit | d8e1ce857bedb9d018ae0918b4c90686d604c2df (patch) | |
| tree | 111a8759c0599ce2be8d25946d21dee4f69923b9 /redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch | |
| parent | 8743b3f65cd27e30aefe49f127105aa305a86051 (diff) | |
| download | tde-packaging-d8e1ce857bedb9d018ae0918b4c90686d604c2df.tar.gz tde-packaging-d8e1ce857bedb9d018ae0918b4c90686d604c2df.zip | |
RPM Packaging: add 3.5.13.2 build patches
Diffstat (limited to 'redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch')
| -rw-r--r-- | redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch new file mode 100644 index 000000000..b9b0ec5fa --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-bookmark_global_copy.patch @@ -0,0 +1,27 @@ +--- ./libkonq/konqbookmarkmanager.h.ori 2013-05-08 23:26:03.558587419 +0200 ++++ ./libkonq/konqbookmarkmanager.h 2013-05-08 23:29:25.317517880 +0200 +@@ -3,6 +3,8 @@ + + #include <kbookmarkmanager.h> + #include <kstandarddirs.h> ++#include <kurl.h> ++#include <kio/job.h> + #include <libkonq_export.h> + + class LIBKONQ_EXPORT KonqBookmarkManager +@@ -11,7 +13,14 @@ + static KBookmarkManager * self() { + if ( !s_bookmarkManager ) + { +- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); ++ TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) ); ++ TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true); ++ if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) { ++ KIO::file_copy( ++ KURL::fromPathOrURL( globalBookmarkFile ), ++ KURL::fromPathOrURL( bookmarksFile ), -1, false, false ++ ); ++ } + s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); + } + return s_bookmarkManager; |