trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: June 2012

tqca/tqca-tls FTBFS: Proposed patches

From: Darrell Anderson <humanreadable@...>
Date: Tue, 19 Jun 2012 19:20:32 -0700 (PDT)
qmake has been renamed to tqmake.

Proposed patch for tqca:

============================================
diff -urN tqca/configure tqca.new/configure
--- tqca/configure  2012-06-12 12:34:36.000000000 -0500
+++ tqca.new/configure  2012-06-19 21:14:05.000000000 -0500
@@ -71,15 +71,15 @@
  fi
 fi

-if [ ! -x "$QTDIR/bin/qmake" ]; then
+if [ ! -x "$QTDIR/bin/tqmake" ]; then
  if [ "$QC_DEBUG" = "Y" ]; then
-   echo Warning: qmake not in \$QTDIR/bin/qmake
+   echo Warning: tqmake not in \$QTDIR/bin/tqmake
    echo trying to find it in \$PATH
  fi
- qm=`type -p qmake`
+ qm=`type -p tqmake`
  if [ -x "$qm" ]; then
    if [ "$QC_DEBUG" = "Y" ]; then
-     echo qmake found in $qm
+     echo tqmake found in $qm
    fi
  else
    echo fail
@@ -88,12 +88,12 @@
    echo or I missdetected \$QTDIR=$QTDIR
    echo
    echo Please set \$QTDIR manually and make sure that
-   echo \$QTDIR/bin/qmake exists.
+   echo \$QTDIR/bin/tqmake exists.
    echo
    exit 1;
  fi
 else
- qm=$QTDIR/bin/qmake
+ qm=$QTDIR/bin/tqmake
 fi

 gen_files() {
@@ -480,7 +480,7 @@
 if [ -x "./qcextra" ]; then
  ./qcextra
 fi
-# run qmake
+# run tqmake
 $qm qca.pro
 if [ "$?" != "0" ]; then
  echo
diff -urN tqca/qca.pro tqca.new/qca.pro
--- tqca/qca.pro  2012-05-27 17:58:16.000000000 -0500
+++ tqca.new/qca.pro  2012-06-19 21:14:13.000000000 -0500
@@ -1,4 +1,4 @@
-# qca qmake profile
+# qca tqmake profile

 TEMPLATE = lib
 CONFIG += qt thread release
============================================

Proposed patch for tqca-tls:

diff -urN tqca-tls/configure tqca-tls.new/configure
--- tqca-tls/configure  2012-06-12 12:34:50.000000000 -0500
+++ tqca-tls.new/configure  2012-06-19 21:17:33.000000000 -0500
@@ -79,15 +79,15 @@
  fi
 fi

-if [ ! -x "$QTDIR/bin/qmake" ]; then
+if [ ! -x "$QTDIR/bin/tqmake" ]; then
  if [ "$QC_DEBUG" = "Y" ]; then
-   echo Warning: qmake not in \$QTDIR/bin/qmake
+   echo Warning: tqmake not in \$QTDIR/bin/tqmake
    echo trying to find it in \$PATH
  fi
- qm=`type -p qmake`
+ qm=`type -p tqmake`
  if [ -x "$qm" ]; then
    if [ "$QC_DEBUG" = "Y" ]; then
-     echo qmake found in $qm
+     echo tqmake 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/qmake exists.
+   echo \$QTDIR/bin/tqmake exists.
    echo
    exit 1;
  fi
 else
- qm=$QTDIR/bin/qmake
+ qm=$QTDIR/bin/tqmake
 fi

 gen_files() {
@@ -575,7 +575,7 @@
 if [ -x "./qcextra" ]; then
  ./qcextra
 fi
-# run qmake
+# run tqmake
 if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then
  $qm QMAKE_STRIP=true qca-tls.pro
 else
diff -urN tqca-tls/qca-tls.pro tqca-tls.new/qca-tls.pro
--- tqca-tls/qca-tls.pro  2012-05-27 17:58:17.000000000 -0500
+++ tqca-tls.new/qca-tls.pro  2012-06-19 21:17:22.000000000 -0500
@@ -1,4 +1,4 @@
-# qca-tls qmake profile
+# qca-tls tqmake profile

 TEMPLATE = lib
 CONFIG  += qt thread release plugin
============================================

Darrell