RPM packaging: update tdebase R14

pull/3/head
François Andriot 11 years ago
parent b17dd09e6a
commit 470510a717

@ -1,27 +0,0 @@
--- ./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 <tdeio/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 ) {
+ TDEIO::file_copy(
+ KURL::fromPathOrURL( globalBookmarkFile ),
+ KURL::fromPathOrURL( bookmarksFile ), -1, false, false
+ );
+ }
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;

File diff suppressed because it is too large Load Diff

@ -97,9 +97,7 @@ Patch105: tdebase-14.0.0-konsole_wordseps.patch
# Patches from Mandriva # Patches from Mandriva
Patch201: tdebase-14.0.0-vibrate_dialog.patch Patch201: tdebase-14.0.0-vibrate_dialog.patch
Patch203: tdebase-14.0.0-kdesktop_crossfade.patch
Patch205: tdebase-14.0.0-suspend_unmount.patch Patch205: tdebase-14.0.0-suspend_unmount.patch
Patch206: tdebase-14.0.0-bookmark_global_copy.patch
# Experimental patches # Experimental patches
Patch301: tdebase-14.0.0-kcm_xcursor_applytheme.patch Patch301: tdebase-14.0.0-kcm_xcursor_applytheme.patch
@ -3337,9 +3335,7 @@ Windows and Samba shares.
%patch105 -p1 -b .konsolewordseps %patch105 -p1 -b .konsolewordseps
%patch201 -p1 -b .vibrate_dialog %patch201 -p1 -b .vibrate_dialog
%patch203 -p1 -b .kdesktop_crossfade
%patch205 -p1 -b .suspend_unmount %patch205 -p1 -b .suspend_unmount
%patch206 -p1 -b .bookmark_global_copy
%patch301 -p1 -b .kcmxcursor %patch301 -p1 -b .kcmxcursor
%patch302 -p1 -b .twintranslation %patch302 -p1 -b .twintranslation

Loading…
Cancel
Save