[med-svn] [clustalx] 04/04: Package now builds using Qt5

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository clustalx.

commit c66f8fe5d3e4c6709b6a99fd63ddedc7fad2b671
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 11 13:54:59 2017 +0200

    Package now builds using Qt5
---
 debian/changelog         |  1 +
 debian/patches/qt5.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 00dd48c..8fd8387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ clustalx (2.1+lgpl-6) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * cme fix dpkg-copyright
   * port to Qt5
+    Closes: #874851
 
   [ Steffen Moeller ]
   * debian/upstream/metadata:
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 684c3cc..96b108c 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -2,6 +2,7 @@ Author: Andreas Tille <tille at debian.org>
 Last-Update: Mon, 11 Sep 2017 09:30:38 +0200
 Description: Porting to Qt5 following the hints at
    https://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5#QtWidgets_as_a_Separate_Module
+   https://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5#toAscii.28.29_and_fromAscii.28.29_Methods_are_deprecated
 
 --- a/clustalx.pro
 +++ b/clustalx.pro
@@ -142,6 +143,15 @@ Description: Porting to Qt5 following the hints at
  #include "PSPrinter.h"
  #include "ColorFileXmlParser.h"
  #include "clustalW/general/userparams.h"
+@@ -594,7 +594,7 @@ void PSPrinter::printHeaderLine(ofstream
+     {
+         psX = blockLeft + (i - fr) * CHARWIDTH; 
+         (*psOutFile) << "(";
+-        (*psOutFile) << data->seqHeader[ix][i].toAscii();
++        (*psOutFile) << data->seqHeader[ix][i].toLatin1();
+         (*psOutFile) << ") ";
+         (*psOutFile) << psX << " " << psY << " " << psX << " " 
+                      << psY << " 1.0 1.0 1.0 color_inv\n";
 --- a/PairwiseParams.cpp
 +++ b/PairwiseParams.cpp
 @@ -18,7 +18,7 @@
@@ -241,3 +251,45 @@ Description: Porting to Qt5 following the hints at
  #include <QPixmap>
  #include <QFile>
  #include <iostream>
+--- a/ColorParameters.cpp
++++ b/ColorParameters.cpp
+@@ -154,8 +154,8 @@ QColor ColorParameters::getResidueColor(
+ {
+     int i, j;
+     QChar colorParRes;
+-    char showRes = res.toAscii();
+-    char showCon = consensus.toAscii();
++    char showRes = res.toLatin1();
++    char showCon = consensus.toLatin1();
+     
+     for(i = 0; i < colorPar.size(); i++)
+     {
+@@ -171,7 +171,7 @@ QColor ColorParameters::getResidueColor(
+                 
+                 for(j = 0; j < colorPar[i].consensusConditionList.size(); j++)
+                 {
+-                    char temp = colorPar[i].consensusConditionList[j].toAscii();
++                    char temp = colorPar[i].consensusConditionList[j].toLatin1();
+                     if(consensus == colorPar[i].consensusConditionList[j])
+                     {
+                         return colorPar[i].color;
+@@ -191,8 +191,8 @@ int ColorParameters::getResidueColorNum(
+ {
+     int i, j;
+     QChar colorParRes;
+-    char showRes = res.toAscii();
+-    char showCon = consensus.toAscii();
++    char showRes = res.toLatin1();
++    char showCon = consensus.toLatin1();
+     
+     for(i = 0; i < colorPar.size(); i++)
+     {
+@@ -208,7 +208,7 @@ int ColorParameters::getResidueColorNum(
+                 
+                 for(j = 0; j < colorPar[i].consensusConditionList.size(); j++)
+                 {
+-                    char temp = colorPar[i].consensusConditionList[j].toAscii();
++                    char temp = colorPar[i].consensusConditionList[j].toLatin1();
+                     if(consensus == colorPar[i].consensusConditionList[j])
+                     {
+                         return getIndexOfColor(colorPar[i].color);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/clustalx.git