summaryrefslogtreecommitdiffstats
path: root/libreoffice/git_10_28_2011
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-16 15:47:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-16 15:47:16 -0600
commitbcd8a46ad5b5a1bd9256da26f1d384a8e303f6b5 (patch)
treeeec9399f3d3dfb1326cf8c3abeecdebd5a710de4 /libreoffice/git_10_28_2011
parent4309299f894b056eab3d0c00775f545443ab4920 (diff)
downloadthirdparty-bcd8a46ad5b5a1bd9256da26f1d384a8e303f6b5.tar.gz
thirdparty-bcd8a46ad5b5a1bd9256da26f1d384a8e303f6b5.zip
Fix up last commit
Diffstat (limited to 'libreoffice/git_10_28_2011')
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff8
1 files changed, 4 insertions, 4 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 0d7e9c5..8dbcaaf 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -263,7 +263,7 @@ index 3b48331..2888cbb 100644
+ CXXFLAGS="$CXXFLAGS $TDE_CFLAGS"
+ AC_MSG_CHECKING([whether TDE is between 3.2 and 3.6])
+ AC_TRY_RUN([
-+#include <kdeversion.h>
++#include <tdeversion.h>
+
+int main(int argc, char **argv) {
+ if (TDE_VERSION_MAJOR == 3 && 2 <= TDE_VERSION_MINOR && TDE_VERSION_MINOR <= 6) return 0;
@@ -8473,7 +8473,7 @@ index 0000000..46ab20d
+#define emit
+#endif
+
-+#include <kdeversion.h>
++#include <tdeversion.h>
+#include <kdiroperator.h>
+#include <kfiledialog.h>
+#include <kfilefiltercombo.h>
@@ -12224,7 +12224,7 @@ index 0000000..91f59f9
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <kconfig.h>
-+#include <kdeversion.h>
++#include <tdeversion.h>
+#include <kemailsettings.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>
@@ -13515,7 +13515,7 @@ index 0000000..9c9f008
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <kconfig.h>
-+#include <kdeversion.h>
++#include <tdeversion.h>
+#include <kemailsettings.h>
+#include <kglobal.h>
+#include <kglobalsettings.h>