diff options
Diffstat (limited to 'libreoffice/git_05_11_2012')
-rw-r--r-- | libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff index a94d52f..875f719 100644 --- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff +++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff @@ -310,7 +310,7 @@ index e3943eb..093bfca 100644 + fi + + dnl Set the variables -+ TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DTQT_THREAD_SUPPORT" ++ TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DTQT_THREAD_SUPPORT" + TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeui -ltdecore -ltqt -ltqt-mt" +fi +AC_SUBST(TDE_CFLAGS) @@ -1799,7 +1799,7 @@ index 3093d58..fa304d9 100644 +# enable building/linking TDE-dependent code in both OOo and SO build environment +.IF "$(ENABLE_TDE)" != "" +.IF "$(TDE_ROOT)"!="" -+TDE_CFLAGS:=-I$(TDE_ROOT)/include -I/usr/include/tqt -DQT_CLEAN_NAMESPACE ++TDE_CFLAGS:=-I$(TDE_ROOT)/include -I/usr/include/tqt +TDE_LIBS:=-ltdeui -ltdecore -ltqt -ltqt-mt +SOLARLIB+=-L$(TDE_ROOT)/lib +.IF "$(OS)$(CPU)" == "LINUXX" |