diff options
7 files changed, 11 insertions, 11 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff index d27a7f2..36cf795 100644 --- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.2/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)"!="" 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)"!="" diff --git a/libreoffice/4.0.1/patches/libreoffice-debian.diff b/libreoffice/4.0.1/patches/libreoffice-debian.diff index 0a2cc58..aaa6a9d 100644 --- a/libreoffice/4.0.1/patches/libreoffice-debian.diff +++ b/libreoffice/4.0.1/patches/libreoffice-debian.diff @@ -223,7 +223,7 @@ diff -urN original/libreoffice-4.0.1~rc1/debian/patches/tde-update-r14.diff tde/ +@@ -10258,7 +10258,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) + + 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt" ++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" + fi diff --git a/libreoffice/4.0.3/patches/libreoffice-debian.diff b/libreoffice/4.0.3/patches/libreoffice-debian.diff index 06ec30e..51de593 100644 --- a/libreoffice/4.0.3/patches/libreoffice-debian.diff +++ b/libreoffice/4.0.3/patches/libreoffice-debian.diff @@ -222,7 +222,7 @@ diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff +@@ -10258,7 +10258,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) + + 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt" ++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" + fi diff --git a/libreoffice/git_02_24_2013/patches/libreoffice-trinity.diff b/libreoffice/git_02_24_2013/patches/libreoffice-trinity.diff index fdf1fc1..289d8be 100644 --- a/libreoffice/git_02_24_2013/patches/libreoffice-trinity.diff +++ b/libreoffice/git_02_24_2013/patches/libreoffice-trinity.diff @@ -5,7 +5,7 @@ index 29d38a9..9363015 100644 @@ -10377,7 +10377,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt" + TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" fi 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" diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index 473edb2..b53cbc8 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -238,7 +238,7 @@ index 3b48331..2888cbb 100644 + 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) @@ -13120,7 +13120,7 @@ index 74ed8d5..d6ce918 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:=-lkdeui -lkdecore -ltqt -lqt-mt +SOLARLIB+=-L$(TDE_ROOT)/lib +.ENDIF # "$(TDE_ROOT)"!="" |