diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 01:21:23 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 01:21:23 +0900 |
| commit | d7c8276a83dd8a141c2337291b449b0f028075a5 (patch) | |
| tree | 32d7da08d7f8e2dc391659420a370a21518e066f /libreoffice/3.3.3/patches/libreoffice-trinity.diff | |
| parent | 36ab8c1905ec4aa4eb6b13acb2444035145dbf27 (diff) | |
| download | thirdparty-d7c8276a83dd8a141c2337291b449b0f028075a5.tar.gz thirdparty-d7c8276a83dd8a141c2337291b449b0f028075a5.zip | |
Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'libreoffice/3.3.3/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index a2c5b65..2870392 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -226,7 +226,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++ fi ++ ++ dnl Set the variables -++ TDE_CFLAGS="-I$qt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DTQT_THREAD_SUPPORT" +++ TDE_CFLAGS="-I$qt_incdir -I$tde_incdir -I/usr/include/tqt -DTQT_THREAD_SUPPORT" ++ TDE_LIBS="-L$tde_libdir -L$qt_libdir -lkdeui -lkdecore -ltqt -lqt-mt" ++fi ++AC_SUBST(TDE_CFLAGS) @@ -12750,7 +12750,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++# 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:=-lkdeui -lkdecore -ltqt -lqt-mt ++SOLARLIB+=-L$(TDE_ROOT)/lib ++.ENDIF # "$(TDE_ROOT)"!="" |