summaryrefslogtreecommitdiffstats
path: root/libreoffice
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-31 21:52:45 -0600
committerTimothy Pearson <[email protected]>2013-01-31 21:52:45 -0600
commitec18d4e99fd89a10514f6dea8a4af3209b47be01 (patch)
tree79cb5fea5311758d9a8ba9be1c4ab41dc43de3d5 /libreoffice
parent0233a7aae09c5c066b09e188649ccc10676fc1dc (diff)
downloadthirdparty-ec18d4e99fd89a10514f6dea8a4af3209b47be01.tar.gz
thirdparty-ec18d4e99fd89a10514f6dea8a4af3209b47be01.zip
Rename KStartup for enhanced compatibility with KDE4
Diffstat (limited to 'libreoffice')
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff4
-rw-r--r--libreoffice/3.3.3/patches/libreoffice-trinity.diff4
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff4
3 files changed, 6 insertions, 6 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 497aad9..667ecba 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -15342,10 +15342,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++ if( ! m_bStartupDone )
++ {
-++ KStartupInfo::appStarted();
+++ TDEStartupInfo::appStarted();
++ m_bStartupDone = true;
++ #if OSL_DEBUG_LEVEL > 1
-++ fprintf( stderr, "called KStartupInfo::appStarted()\n" );
+++ fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
++ #endif
++ }
++}
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 9e26dfd..82674d9 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -15342,10 +15342,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{
++ if( ! m_bStartupDone )
++ {
-++ KStartupInfo::appStarted();
+++ TDEStartupInfo::appStarted();
++ m_bStartupDone = true;
++ #if OSL_DEBUG_LEVEL > 1
-++ fprintf( stderr, "called KStartupInfo::appStarted()\n" );
+++ fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
++ #endif
++ }
++}
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 984ccfa..d9ce39d 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -16096,10 +16096,10 @@ index 0000000..adeb628
+{
+ if( ! m_bStartupDone )
+ {
-+ KStartupInfo::appStarted();
++ TDEStartupInfo::appStarted();
+ m_bStartupDone = true;
+ #if OSL_DEBUG_LEVEL > 1
-+ fprintf( stderr, "called KStartupInfo::appStarted()\n" );
++ fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
+ #endif
+ }
+}