From d6e4c886a43466f3218112c810f2f06d52bfb7a7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:06:52 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 libreoffice/3.3.2/patches/libreoffice-trinity.diff       | 14 +++++++-------
 libreoffice/3.3.3/patches/libreoffice-trinity.diff       | 14 +++++++-------
 .../git_05_11_2012/patches/libreoffice-trinity.diff      | 14 +++++++-------
 .../git_10_28_2011/patches/libreoffice-trinity.diff      | 16 ++++++++--------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index d5df657..35715cb 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/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
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
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index 66fc4a0..139b439 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -1551,7 +1551,7 @@ index 0000000..d0f1444
 +#include <kaboutdata.h>
 +#include <kapplication.h>
 +#include <kcmdlineargs.h>
-+#include <kconfig.h>
++#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
 +#include <kglobal.h>
@@ -1767,7 +1767,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
@@ -2293,7 +2293,7 @@ index 0000000..d0f1444
 +#include <kaboutdata.h>
 +#include <kapplication.h>
 +#include <kcmdlineargs.h>
-+#include <kconfig.h>
++#include <tdeconfig.h>
 +#include <tdeversion.h>
 +#include <kemailsettings.h>
 +#include <kglobal.h>
@@ -2722,9 +2722,9 @@ index 779a34d..d52a6a7 100644
 +
 +#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>
@@ -2757,7 +2757,7 @@ index 4d545eb..b0482d8 100644
 +
  #include <cstddef>
  
- #include <kfiledialog.h>
+ #include <tdefiledialog.h>
 @@ -40,7 +44,11 @@ class QVBox;
  
  class KDEFileDialog : public KFileDialog
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>
-- 
cgit v1.2.3