summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-09-29 13:37:37 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-09-29 13:37:37 +0200
commitb4b507c636506960fb306de332ec30be399758dc (patch)
treeffb4ce999cd5efe03a7cfee6c48a0cba49ba97af /redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
parentf9a697dd364d6be35ec52794e97bca3187a06777 (diff)
parent1baab4923d9eec2ce99b1434d00c6d64a874f119 (diff)
downloadtde-packaging-b4b507c636506960fb306de332ec30be399758dc.tar.gz
tde-packaging-b4b507c636506960fb306de332ec30be399758dc.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/dependencies/tqca-tls/tqca-tls-qt3.patch')
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-qt3.patch105
1 files changed, 0 insertions, 105 deletions
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
deleted file mode 100644
index 29f1f207c..000000000
--- a/redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- tqca-tls-master/configure.qt 2012-06-20 03:30:48.000000000 +0200
-+++ tqca-tls-master/configure 2013-05-28 20:30:52.827808679 +0200
-@@ -60,7 +60,7 @@
- if [ "$QC_DEBUG" = "Y" ]; then
- echo \$QTDIR not set... trying to find Qt manually
- fi
-- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
-+ for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
- if [ -d "$p/mkspecs" ]; then
- QTDIR=$p
- break;
-@@ -79,15 +79,15 @@
- fi
- fi
-
--if [ ! -x "$QTDIR/bin/tqmake" ]; then
-+if [ ! -x "$QTDIR/bin/qmake" ]; then
- if [ "$QC_DEBUG" = "Y" ]; then
-- echo Warning: tqmake not in \$QTDIR/bin/tqmake
-+ echo Warning: qmake not in \$QTDIR/bin/qmake
- echo trying to find it in \$PATH
- fi
-- qm=`type -p tqmake`
-+ qm=`type -p qmake`
- if [ -x "$qm" ]; then
- if [ "$QC_DEBUG" = "Y" ]; then
-- echo tqmake found in $qm
-+ echo qmake found in $qm
- fi
- else
- echo fail
-@@ -96,12 +96,12 @@
- echo or I missdetected \$QTDIR=$QTDIR
- echo
- echo Please set \$QTDIR manually and make sure that
-- echo \$QTDIR/bin/tqmake exists.
-+ echo \$QTDIR/bin/qmake exists.
- echo
- exit 1;
- fi
- else
-- qm=$QTDIR/bin/tqmake
-+ qm=$QTDIR/bin/qmake
- fi
-
- gen_files() {
-@@ -184,7 +184,9 @@
- conf->addLib("-lssl -lcrypto");
-
- // Make sure tqtinterface can be found
-- conf->addIncludePath("/usr/include/tqt");
-+ conf->addIncludePath("/usr/include/tqt");
-+ // Make sure tqt3 can be found
-+ conf->addIncludePath("${QTINC:-${QTDIR}/include}");
-
- return true;
- }
-@@ -476,7 +478,7 @@
-
- TQString str;
- str += "# qconf\n";
-- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n';
-+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n';
- if(!conf->DEFINES.isEmpty())
- str += "DEFINES += " + conf->DEFINES + '\n';
- if(!conf->INCLUDEPATH.isEmpty())
-@@ -511,7 +513,7 @@
- TEMPLATE = app
- CONFIG += qt x11 thread console
- TARGET = conf
--INCLUDEPATH += '/usr/include/tqt'
-+INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}'
-
- DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
- DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
-@@ -537,16 +539,16 @@
- )
-
- if [ "$?" != "0" ]; then
-- rm -rf .qconftemp
-+# rm -rf .qconftemp
- echo fail
- echo
- echo "There was an error compiling 'conf'. Be sure you have a proper"
- echo "TQt 3.x Multithreaded (MT) build environment set up."
-- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then
-- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then
-+ if [ ! -f "${QTLIB:-${QTDIR}/lib}/libqt-mt.so.3" ]; then
-+ if [ ! -f "${QTLIB:-${QTDIR}/lib64}/libqt-mt.so.3" ]; then
- echo
- echo "One possible reason is that you don't have"
-- echo "libtqt-mt.so.3 installed in $QTDIR/lib/"
-+ echo "libqt-mt.so.3 installed in $QTDIR/lib/"
- echo "or $QTDIR/lib64/."
- fi
- fi
-@@ -575,7 +577,7 @@
- if [ -x "./qcextra" ]; then
- ./qcextra
- fi
--# run tqmake
-+# run qmake
- if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then
- $qm QMAKE_STRIP=true qca-tls.pro
- else