TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent a19285d794
commit d6e4c886a4
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

14
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -8156,9 +8156,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ++
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kdiroperator.h> ++#include <kdiroperator.h>
++#include <kfiledialog.h> ++#include <tdefiledialog.h>
++#include <kfilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++#include <kio/netaccess.h> ++#include <tdeio/netaccess.h>
++#include <klocale.h> ++#include <klocale.h>
++#include <kmessagebox.h> ++#include <kmessagebox.h>
++#include <ktempfile.h> ++#include <ktempfile.h>
@ -8876,8 +8876,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#ifndef _TDEFILEPICKER_HXX_ ++#ifndef _TDEFILEPICKER_HXX_
++#define _TDEFILEPICKER_HXX_ ++#define _TDEFILEPICKER_HXX_
++ ++
++#include <kfiledialog.h> ++#include <tdefiledialog.h>
++#include <kfilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++ ++
++class TQGrid; ++class TQGrid;
++class TQHBox; ++class TQHBox;
@ -12186,7 +12186,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kaboutdata.h> ++#include <kaboutdata.h>
++#include <kapplication.h> ++#include <kapplication.h>
++#include <kcmdlineargs.h> ++#include <kcmdlineargs.h>
++#include <kconfig.h> ++#include <tdeconfig.h>
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kemailsettings.h> ++#include <kemailsettings.h>
++#include <kglobal.h> ++#include <kglobal.h>
@ -12643,7 +12643,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ++
++# special handling for mailto: uris ++# special handling for mailto: uris
++if echo $1 | grep '^mailto:' > /dev/null; then ++if echo $1 | grep '^mailto:' > /dev/null; then
++ kmailservice "$1" & ++ tdemailservice "$1" &
++else ++else
++ kfmclient openURL "$1" & ++ kfmclient openURL "$1" &
++fi ++fi

14
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -8156,9 +8156,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ++
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kdiroperator.h> ++#include <kdiroperator.h>
++#include <kfiledialog.h> ++#include <tdefiledialog.h>
++#include <kfilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++#include <kio/netaccess.h> ++#include <tdeio/netaccess.h>
++#include <klocale.h> ++#include <klocale.h>
++#include <kmessagebox.h> ++#include <kmessagebox.h>
++#include <ktempfile.h> ++#include <ktempfile.h>
@ -8876,8 +8876,8 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#ifndef _TDEFILEPICKER_HXX_ ++#ifndef _TDEFILEPICKER_HXX_
++#define _TDEFILEPICKER_HXX_ ++#define _TDEFILEPICKER_HXX_
++ ++
++#include <kfiledialog.h> ++#include <tdefiledialog.h>
++#include <kfilefiltercombo.h> ++#include <tdefilefiltercombo.h>
++ ++
++class TQGrid; ++class TQGrid;
++class TQHBox; ++class TQHBox;
@ -12186,7 +12186,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#include <kaboutdata.h> ++#include <kaboutdata.h>
++#include <kapplication.h> ++#include <kapplication.h>
++#include <kcmdlineargs.h> ++#include <kcmdlineargs.h>
++#include <kconfig.h> ++#include <tdeconfig.h>
++#include <tdeversion.h> ++#include <tdeversion.h>
++#include <kemailsettings.h> ++#include <kemailsettings.h>
++#include <kglobal.h> ++#include <kglobal.h>
@ -12643,7 +12643,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ++
++# special handling for mailto: uris ++# special handling for mailto: uris
++if echo $1 | grep '^mailto:' > /dev/null; then ++if echo $1 | grep '^mailto:' > /dev/null; then
++ kmailservice "$1" & ++ tdemailservice "$1" &
++else ++else
++ kfmclient openURL "$1" & ++ kfmclient openURL "$1" &
++fi ++fi

14
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -1551,7 +1551,7 @@ index 0000000..d0f1444
+#include <kaboutdata.h> +#include <kaboutdata.h>
+#include <kapplication.h> +#include <kapplication.h>
+#include <kcmdlineargs.h> +#include <kcmdlineargs.h>
+#include <kconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <kemailsettings.h>
+#include <kglobal.h> +#include <kglobal.h>
@ -1767,7 +1767,7 @@ index 0000000..fa05bde
+ +
+# special handling for mailto: uris +# special handling for mailto: uris
+if echo $1 | grep '^mailto:' > /dev/null; then +if echo $1 | grep '^mailto:' > /dev/null; then
+ kmailservice "$1" & + tdemailservice "$1" &
+else +else
+ kfmclient openURL "$1" & + kfmclient openURL "$1" &
+fi +fi
@ -2293,7 +2293,7 @@ index 0000000..d0f1444
+#include <kaboutdata.h> +#include <kaboutdata.h>
+#include <kapplication.h> +#include <kapplication.h>
+#include <kcmdlineargs.h> +#include <kcmdlineargs.h>
+#include <kconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <kemailsettings.h>
+#include <kglobal.h> +#include <kglobal.h>
@ -2722,9 +2722,9 @@ index 779a34d..d52a6a7 100644
+ +
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kdiroperator.h> +#include <kdiroperator.h>
+#include <kfiledialog.h> +#include <tdefiledialog.h>
+#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h>
+#include <kio/netaccess.h> +#include <tdeio/netaccess.h>
+#include <klocale.h> +#include <klocale.h>
+#include <kmessagebox.h> +#include <kmessagebox.h>
+#include <ktempfile.h> +#include <ktempfile.h>
@ -2757,7 +2757,7 @@ index 4d545eb..b0482d8 100644
+ +
#include <cstddef> #include <cstddef>
#include <kfiledialog.h> #include <tdefiledialog.h>
@@ -40,7 +44,11 @@ class QVBox; @@ -40,7 +44,11 @@ class QVBox;
class KDEFileDialog : public KFileDialog class KDEFileDialog : public KFileDialog

16
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -8475,9 +8475,9 @@ index 0000000..46ab20d
+ +
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kdiroperator.h> +#include <kdiroperator.h>
+#include <kfiledialog.h> +#include <tdefiledialog.h>
+#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h>
+#include <kio/netaccess.h> +#include <tdeio/netaccess.h>
+#include <klocale.h> +#include <klocale.h>
+#include <kmessagebox.h> +#include <kmessagebox.h>
+#include <ktempfile.h> +#include <ktempfile.h>
@ -9199,8 +9199,8 @@ index 0000000..f411db5
+ +
+#include <cstddef> +#include <cstddef>
+ +
+#include <kfiledialog.h> +#include <tdefiledialog.h>
+#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h>
+ +
+class TQGrid; +class TQGrid;
+class TQHBox; +class TQHBox;
@ -12223,7 +12223,7 @@ index 0000000..91f59f9
+#include <kaboutdata.h> +#include <kaboutdata.h>
+#include <kapplication.h> +#include <kapplication.h>
+#include <kcmdlineargs.h> +#include <kcmdlineargs.h>
+#include <kconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <kemailsettings.h>
+#include <kglobal.h> +#include <kglobal.h>
@ -13088,7 +13088,7 @@ index 0000000..fa05bde
+ +
+# special handling for mailto: uris +# special handling for mailto: uris
+if echo $1 | grep '^mailto:' > /dev/null; then +if echo $1 | grep '^mailto:' > /dev/null; then
+ kmailservice "$1" & + tdemailservice "$1" &
+else +else
+ kfmclient openURL "$1" & + kfmclient openURL "$1" &
+fi +fi
@ -13514,7 +13514,7 @@ index 0000000..9c9f008
+#include <kaboutdata.h> +#include <kaboutdata.h>
+#include <kapplication.h> +#include <kapplication.h>
+#include <kcmdlineargs.h> +#include <kcmdlineargs.h>
+#include <kconfig.h> +#include <tdeconfig.h>
+#include <tdeversion.h> +#include <tdeversion.h>
+#include <kemailsettings.h> +#include <kemailsettings.h>
+#include <kglobal.h> +#include <kglobal.h>

Write Preview
Loading…
Cancel
Save