diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-02 23:18:26 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-02 23:18:26 +0200 |
| commit | 04dae637208c43e774f6b8d92f717c03b15ea9a9 (patch) | |
| tree | 3aac8e8f2bdab72f3d31d29623f8251536deabe4 /redhat/dependencies | |
| parent | 9deeed971d2b07c3f855e0af3e6c9f047ae46e89 (diff) | |
| download | tde-packaging-04dae637208c43e774f6b8d92f717c03b15ea9a9.tar.gz tde-packaging-04dae637208c43e774f6b8d92f717c03b15ea9a9.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/dependencies')
3 files changed, 14 insertions, 5 deletions
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch index 4b01321ad..29f1f207c 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch +++ b/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch @@ -49,7 +49,7 @@ // Make sure tqtinterface can be found - conf->addIncludePath("/usr/include/tqt"); -+ conf->addIncludePath("/opt/trinity/include/tqt"); ++ conf->addIncludePath("/usr/include/tqt"); + // Make sure tqt3 can be found + conf->addIncludePath("${QTINC:-${QTDIR}/include}"); @@ -69,7 +69,7 @@ CONFIG += qt x11 thread console TARGET = conf -INCLUDEPATH += '/usr/include/tqt' -+INCLUDEPATH += '/opt/trinity/include/tqt' '${QTINC:-${QTDIR}/include}' ++INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}' DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' diff --git a/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch b/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch index 0cb99b0e6..f608bc6c8 100644 --- a/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch +++ b/redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch @@ -96,7 +96,7 @@ TARGET = conf -INCLUDEPATH += '/usr/include/tqt' +INCLUDEPATH += '${QTINC:-${QTDIR}/include}' -+INCLUDEPATH += '/opt/trinity/include/tqt' ++INCLUDEPATH += '/usr/include/tqt' DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch index 0323dee9c..3922b6e27 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch @@ -1,5 +1,14 @@ ---- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ORI 2013-07-02 19:27:56.391143562 +0200 -+++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro 2013-07-02 19:30:59.279346578 +0200 +--- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ftbfs 2013-07-21 10:56:22.714582322 +0200 ++++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro 2013-09-02 20:00:39.455251114 +0200 +@@ -27,7 +27,7 @@ + TARGET = qscintilla + # DESTDIR = $(QTDIR)/lib + CONFIG += qt warn_off release dll thread +-INCLUDEPATH = . ../include ../src /usr/include/tqt ++INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3 + DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER + + HEADERS = \ @@ -211,10 +211,10 @@ qscintilla_ru.ts |