diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:06:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:06:52 -0600 |
| commit | d6e4c886a43466f3218112c810f2f06d52bfb7a7 (patch) | |
| tree | d98dda99f9305dd5671052b2e63e2933912b956b /libreoffice/3.3.3/patches/libreoffice-trinity.diff | |
| parent | a19285d794c0e4e2cf10b4a63812d646e97bbb3c (diff) | |
| download | thirdparty-d6e4c886a43466f3218112c810f2f06d52bfb7a7.tar.gz thirdparty-d6e4c886a43466f3218112c810f2f06d52bfb7a7.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/3.3.3/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index 605462f..6839de0 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -8156,9 +8156,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ ++#include <tdeversion.h> ++#include <kdiroperator.h> -++#include <kfiledialog.h> -++#include <kfilefiltercombo.h> -++#include <kio/netaccess.h> +++#include <tdefiledialog.h> +++#include <tdefilefiltercombo.h> +++#include <tdeio/netaccess.h> ++#include <klocale.h> ++#include <kmessagebox.h> ++#include <ktempfile.h> @@ -8876,8 +8876,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++#ifndef _TDEFILEPICKER_HXX_ ++#define _TDEFILEPICKER_HXX_ ++ -++#include <kfiledialog.h> -++#include <kfilefiltercombo.h> +++#include <tdefiledialog.h> +++#include <tdefilefiltercombo.h> ++ ++class TQGrid; ++class TQHBox; @@ -12186,7 +12186,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++#include <kaboutdata.h> ++#include <kapplication.h> ++#include <kcmdlineargs.h> -++#include <kconfig.h> +++#include <tdeconfig.h> ++#include <tdeversion.h> ++#include <kemailsettings.h> ++#include <kglobal.h> @@ -12643,7 +12643,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ ++# special handling for mailto: uris ++if echo $1 | grep '^mailto:' > /dev/null; then -++ kmailservice "$1" & +++ tdemailservice "$1" & ++else ++ kfmclient openURL "$1" & ++fi |