From d7c8276a83dd8a141c2337291b449b0f028075a5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 25 Sep 2018 01:21:23 +0900 Subject: Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define. Signed-off-by: Michele Calgaro --- libreoffice/3.3.3/patches/libreoffice-trinity.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libreoffice/3.3.3') 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)"!="" -- cgit v1.2.3