From 4309299f894b056eab3d0c00775f545443ab4920 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 19:00:17 -0600 Subject: Rename KDE_VERSION to TDE_VERSION --- libreoffice/3.3.2/patches/libreoffice-trinity.diff | 2 +- libreoffice/3.3.3/patches/libreoffice-trinity.diff | 2 +- libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff index 33a5530..078ae0e 100644 --- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff @@ -254,7 +254,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++#include ++ ++int main(int argc, char **argv) { -++ if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0; +++ if (TDE_VERSION_MAJOR == 3 && 2 <= TDE_VERSION_MINOR && TDE_VERSION_MINOR <= 6) return 0; ++ else return 1; ++} ++ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([TDE version too old or too recent, please use another version of TDE or disable TDE address book support])]) diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index 65658e8..91eac6f 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -254,7 +254,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++#include ++ ++int main(int argc, char **argv) { -++ if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0; +++ if (TDE_VERSION_MAJOR == 3 && 2 <= TDE_VERSION_MINOR && TDE_VERSION_MINOR <= 6) return 0; ++ else return 1; ++} ++ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([TDE version too old or too recent, please use another version of TDE or disable TDE address book support])]) diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index fccd9f4..0d7e9c5 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -266,7 +266,7 @@ index 3b48331..2888cbb 100644 +#include + +int main(int argc, char **argv) { -+ if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0; ++ if (TDE_VERSION_MAJOR == 3 && 2 <= TDE_VERSION_MINOR && TDE_VERSION_MINOR <= 6) return 0; + else return 1; +} + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([TDE version too old or too recent, please use another version of TDE or disable TDE address book support])]) -- cgit v1.2.3