diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:52 -0600 |
| commit | d6e4c886a43466f3218112c810f2f06d52bfb7a7 (patch) | |
| tree | d98dda99f9305dd5671052b2e63e2933912b956b /libreoffice/git_10_28_2011/patches | |
| 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/git_10_28_2011/patches')
| -rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index bc5b297..4da7df0 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -8475,9 +8475,9 @@ index 0000000..46ab20d + +#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> @@ -9199,8 +9199,8 @@ index 0000000..f411db5 + +#include <cstddef> + -+#include <kfiledialog.h> -+#include <kfilefiltercombo.h> ++#include <tdefiledialog.h> ++#include <tdefilefiltercombo.h> + +class TQGrid; +class TQHBox; @@ -12223,7 +12223,7 @@ index 0000000..91f59f9 +#include <kaboutdata.h> +#include <kapplication.h> +#include <kcmdlineargs.h> -+#include <kconfig.h> ++#include <tdeconfig.h> +#include <tdeversion.h> +#include <kemailsettings.h> +#include <kglobal.h> @@ -13088,7 +13088,7 @@ index 0000000..fa05bde + +# special handling for mailto: uris +if echo $1 | grep '^mailto:' > /dev/null; then -+ kmailservice "$1" & ++ tdemailservice "$1" & +else + kfmclient openURL "$1" & +fi @@ -13514,7 +13514,7 @@ index 0000000..9c9f008 +#include <kaboutdata.h> +#include <kapplication.h> +#include <kcmdlineargs.h> -+#include <kconfig.h> ++#include <tdeconfig.h> +#include <tdeversion.h> +#include <kemailsettings.h> +#include <kglobal.h> |