TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 6 years ago
parent 36ab8c1905
commit d7c8276a83
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -226,7 +226,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ fi ++ fi
++ ++
++ dnl Set the variables ++ 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" ++ TDE_LIBS="-L$tde_libdir -L$qt_libdir -lkdeui -lkdecore -ltqt -lqt-mt"
++fi ++fi
++AC_SUBST(TDE_CFLAGS) ++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 ++# enable building/linking TDE-dependent code in both OOo and SO build environment
++.IF "$(ENABLE_TDE)" != "" ++.IF "$(ENABLE_TDE)" != ""
++.IF "$(TDE_ROOT)"!="" ++.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 ++TDE_LIBS:=-lkdeui -lkdecore -ltqt -lqt-mt
++SOLARLIB+=-L$(TDE_ROOT)/lib ++SOLARLIB+=-L$(TDE_ROOT)/lib
++.ENDIF # "$(TDE_ROOT)"!="" ++.ENDIF # "$(TDE_ROOT)"!=""

4
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -226,7 +226,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ fi ++ fi
++ ++
++ dnl Set the variables ++ 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" ++ TDE_LIBS="-L$tde_libdir -L$qt_libdir -lkdeui -lkdecore -ltqt -lqt-mt"
++fi ++fi
++AC_SUBST(TDE_CFLAGS) ++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 ++# enable building/linking TDE-dependent code in both OOo and SO build environment
++.IF "$(ENABLE_TDE)" != "" ++.IF "$(ENABLE_TDE)" != ""
++.IF "$(TDE_ROOT)"!="" ++.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 ++TDE_LIBS:=-lkdeui -lkdecore -ltqt -lqt-mt
++SOLARLIB+=-L$(TDE_ROOT)/lib ++SOLARLIB+=-L$(TDE_ROOT)/lib
++.ENDIF # "$(TDE_ROOT)"!="" ++.ENDIF # "$(TDE_ROOT)"!=""

2
libreoffice/4.0.1/patches/libreoffice-debian.diff
Unescape View File

@ -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".]) +@@ -10258,7 +10258,7 @@ your TDE installation by exporting TDEDIR before running "configure".])
+ +
+ dnl Set the variables + 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" ++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt"
+ fi + fi

2
libreoffice/4.0.3/patches/libreoffice-debian.diff
Unescape View File

@ -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".]) +@@ -10258,7 +10258,7 @@ your TDE installation by exporting TDEDIR before running "configure".])
+ +
+ dnl Set the variables + 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" ++ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt"
+ fi + fi

2
libreoffice/git_02_24_2013/patches/libreoffice-trinity.diff
Unescape View File

@ -5,7 +5,7 @@ index 29d38a9..9363015 100644
@@ -10377,7 +10377,7 @@ your TDE installation by exporting TDEDIR before running "configure".]) @@ -10377,7 +10377,7 @@ your TDE installation by exporting TDEDIR before running "configure".])
dnl Set the variables 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 -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
+ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt" + TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt"
fi fi

4
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -310,7 +310,7 @@ index e3943eb..093bfca 100644
+ fi + fi
+ +
+ dnl Set the variables + 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" + TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeui -ltdecore -ltqt -ltqt-mt"
+fi +fi
+AC_SUBST(TDE_CFLAGS) +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 +# enable building/linking TDE-dependent code in both OOo and SO build environment
+.IF "$(ENABLE_TDE)" != "" +.IF "$(ENABLE_TDE)" != ""
+.IF "$(TDE_ROOT)"!="" +.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 +TDE_LIBS:=-ltdeui -ltdecore -ltqt -ltqt-mt
+SOLARLIB+=-L$(TDE_ROOT)/lib +SOLARLIB+=-L$(TDE_ROOT)/lib
+.IF "$(OS)$(CPU)" == "LINUXX" +.IF "$(OS)$(CPU)" == "LINUXX"

4
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -238,7 +238,7 @@ index 3b48331..2888cbb 100644
+ fi + fi
+ +
+ dnl Set the variables + 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" + TDE_LIBS="-L$tde_libdir -L$qt_libdir -lkdeui -lkdecore -ltqt -lqt-mt"
+fi +fi
+AC_SUBST(TDE_CFLAGS) +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 +# enable building/linking TDE-dependent code in both OOo and SO build environment
+.IF "$(ENABLE_TDE)" != "" +.IF "$(ENABLE_TDE)" != ""
+.IF "$(TDE_ROOT)"!="" +.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 +TDE_LIBS:=-lkdeui -lkdecore -ltqt -lqt-mt
+SOLARLIB+=-L$(TDE_ROOT)/lib +SOLARLIB+=-L$(TDE_ROOT)/lib
+.ENDIF # "$(TDE_ROOT)"!="" +.ENDIF # "$(TDE_ROOT)"!=""

Write Preview
Loading…
Cancel
Save