diff options
| author | Timothy Pearson <[email protected]> | 2011-11-15 19:00:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-15 19:00:17 -0600 |
| commit | 4309299f894b056eab3d0c00775f545443ab4920 (patch) | |
| tree | adb69488d8eb29b3c004887aa08e992e6710a5ce /libreoffice | |
| parent | a512a0bb01959fcd8fecbc79b4f54ec4ca868062 (diff) | |
| download | thirdparty-4309299f894b056eab3d0c00775f545443ab4920.tar.gz thirdparty-4309299f894b056eab3d0c00775f545443ab4920.zip | |
Rename KDE_VERSION to TDE_VERSION
Diffstat (limited to 'libreoffice')
| -rw-r--r-- | libreoffice/3.3.2/patches/libreoffice-trinity.diff | 2 | ||||
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 2 | ||||
| -rw-r--r-- | 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 <kdeversion.h> ++ ++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 <kdeversion.h> ++ ++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 <kdeversion.h> + +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])]) |