diff -Nru scidavis-1.D9/debian/changelog scidavis-1.D9/debian/changelog --- scidavis-1.D9/debian/changelog 2015-12-12 17:26:12.000000000 +0000 +++ scidavis-1.D9/debian/changelog 2016-06-30 14:07:10.000000000 +0000 @@ -1,3 +1,13 @@ +scidavis (1.D9-2) unstable; urgency=medium + + * changes for gcc6: patched libscidavis/src/FitDialog.cpp and + libscidavis/src/ColorMapEditor.cpp + Closes: #811873 + * invoked qmake with -qt=qt4 in debian/rules + * upgraded Standards-Version + + -- Georges Khaznadar Thu, 30 Jun 2016 15:00:52 +0200 + scidavis (1.D9-1) unstable; urgency=medium * upgraded to the newest upstream source. As the file scidavis.sip diff -Nru scidavis-1.D9/debian/control scidavis-1.D9/debian/control --- scidavis-1.D9/debian/control 2015-12-12 16:50:03.000000000 +0000 +++ scidavis-1.D9/debian/control 2016-06-30 14:07:15.000000000 +0000 @@ -7,7 +7,7 @@ libqwtplot3d-qt4-dev, libmuparser-dev, libgsl-dev, zlib1g-dev, libglu1-mesa-dev, python-dev, python-qt4-dev, python-sip-dev, dh-python, libqtassistantclient-dev, liborigin2-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Homepage: http://scidavis.sourceforge.net/ Package: scidavis diff -Nru scidavis-1.D9/debian/patches/gcc6.patch scidavis-1.D9/debian/patches/gcc6.patch --- scidavis-1.D9/debian/patches/gcc6.patch 1970-01-01 00:00:00.000000000 +0000 +++ scidavis-1.D9/debian/patches/gcc6.patch 2016-06-30 14:09:10.000000000 +0000 @@ -0,0 +1,46 @@ +fixed a logical error in flags manipulation. g++-6 detected the use of boolean operator +instead of bitwise operator. +Index: scidavis-1.D9/libscidavis/src/FitDialog.cpp +=================================================================== +--- scidavis-1.D9.orig/libscidavis/src/FitDialog.cpp ++++ scidavis-1.D9/libscidavis/src/FitDialog.cpp +@@ -655,7 +655,7 @@ void FitDialog::showFitPage() + for (int i = param_table_rows; isetFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & ~(Qt::ItemIsEditable)); + it->setBackground(QBrush(Qt::lightGray)); + it->setForeground(QBrush(Qt::darkRed)); + QFont font = it->font(); +@@ -679,7 +679,7 @@ void FitDialog::showFitPage() + for (int i = 0; irowCount(); i++ ) + { + QTableWidgetItem *it = new QTableWidgetItem(); +- it->setFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & ~(Qt::ItemIsEditable)); + it->setBackground(QBrush(Qt::lightGray)); + boxParams->setItem(i, 2, it); + +Index: scidavis-1.D9/libscidavis/src/ColorMapEditor.cpp +=================================================================== +--- scidavis-1.D9.orig/libscidavis/src/ColorMapEditor.cpp ++++ scidavis-1.D9/libscidavis/src/ColorMapEditor.cpp +@@ -124,7 +124,7 @@ for (int i = 0; i < rows; i++) + + QColor c = QColor(map.rgb(QwtDoubleInterval(0, 1), colors[i])); + it = new QTableWidgetItem(c.name()); +- it->setFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & ~(Qt::ItemIsEditable)); + it->setBackground(QBrush(c)); + it->setForeground(QBrush(c)); + table->setItem(i, 1, it); +@@ -156,7 +156,7 @@ QTableWidgetItem *it = new QTableWidgetI + table->setItem(row, 0, it); + + it = new QTableWidgetItem(c.name()); +-it->setFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & ~(Qt::ItemIsEditable)); + it->setBackground(QBrush(c)); + it->setForeground(QBrush(c)); + table->setItem(row, 1, it); diff -Nru scidavis-1.D9/debian/patches/series scidavis-1.D9/debian/patches/series --- scidavis-1.D9/debian/patches/series 2015-12-12 17:06:01.000000000 +0000 +++ scidavis-1.D9/debian/patches/series 2016-06-30 13:02:17.000000000 +0000 @@ -1,3 +1,4 @@ standard-library-path.diff without-3rdparty-liborigin.patch qwtplot3d-headers.patch +gcc6.patch diff -Nru scidavis-1.D9/debian/patches/standard-library-path.diff scidavis-1.D9/debian/patches/standard-library-path.diff --- scidavis-1.D9/debian/patches/standard-library-path.diff 2015-12-10 17:06:06.000000000 +0000 +++ scidavis-1.D9/debian/patches/standard-library-path.diff 2016-06-30 13:16:17.000000000 +0000 @@ -2,13 +2,15 @@ =================================================================== --- scidavis-1.D9.orig/fitPlugins/exp_saturation/exp_saturation.pro +++ scidavis-1.D9/fitPlugins/exp_saturation/exp_saturation.pro -@@ -1,5 +1,5 @@ +@@ -1,7 +1,6 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 +libsuff=/x86_64-linux-gnu - include(../../config.pri) +-include(../../config.pri) TARGET = exp_saturation + TEMPLATE = lib + CONFIG += dll Index: scidavis-1.D9/fitPlugins/exp_saturation/exp_saturation.pro.in =================================================================== --- /dev/null @@ -39,13 +41,15 @@ =================================================================== --- scidavis-1.D9.orig/fitPlugins/explin/explin.pro +++ scidavis-1.D9/fitPlugins/explin/explin.pro -@@ -1,5 +1,5 @@ +@@ -1,7 +1,6 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 +libsuff=/x86_64-linux-gnu - include(../../config.pri) +-include(../../config.pri) TARGET = explin + TEMPLATE = lib + CONFIG += dll Index: scidavis-1.D9/fitPlugins/explin/explin.pro.in =================================================================== --- /dev/null @@ -157,13 +161,15 @@ =================================================================== --- scidavis-1.D9.orig/fitPlugins/planck_wavelength/planck_wavelength.pro +++ scidavis-1.D9/fitPlugins/planck_wavelength/planck_wavelength.pro -@@ -1,5 +1,5 @@ +@@ -1,7 +1,6 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 +libsuff=/x86_64-linux-gnu - include(../../config.pri) +-include(../../config.pri) TARGET = planck_wavelength + TEMPLATE = lib + CONFIG += dll Index: scidavis-1.D9/fitPlugins/planck_wavelength/planck_wavelength.pro.in =================================================================== --- /dev/null @@ -196,12 +202,12 @@ =================================================================== --- scidavis-1.D9.orig/fitPlugins/fitRational0/fitRational0.pro +++ scidavis-1.D9/fitPlugins/fitRational0/fitRational0.pro -@@ -1,17 +1,17 @@ +@@ -1,19 +1,27 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 +libsuff=/x86_64-linux-gnu - include(../../config.pri) +-include(../../config.pri) TARGET = fitRational0 TEMPLATE = lib @@ -217,17 +223,28 @@ + INSTALLS += target ++# Statically link against GSL in 3rdparty. ++# This is used as default on Windows. ++# To use this on Linux or Mac OS X, remove ++# the "win32" and prepend '#' to the "LIBS" ++# line in the dynamic linking section. ++win32:INCLUDEPATH += ../../3rdparty/gsl-1.8/include ++win32:LIBS += ../../3rdparty/gsl-1.8/lib/libgsl.a ++win32:LIBS += ../../3rdparty/gsl-1.8/lib/libgslcblas.a ++ # Dynamically link against GSL installed system-wide. + # This is used as default on unix systems such as + # Linux, Mac OS X and *BSD. Index: scidavis-1.D9/fitPlugins/fitRational1/fitRational1.pro =================================================================== --- scidavis-1.D9.orig/fitPlugins/fitRational1/fitRational1.pro +++ scidavis-1.D9/fitPlugins/fitRational1/fitRational1.pro -@@ -1,17 +1,17 @@ +@@ -1,19 +1,27 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 +libsuff=/x86_64-linux-gnu - include(../../config.pri) +-include(../../config.pri) TARGET = fitRational1 TEMPLATE = lib @@ -243,4 +260,15 @@ + INSTALLS += target ++# Statically link against GSL in 3rdparty. ++# This is used as default on Windows. ++# To use this on Linux or Mac OS X, remove ++# the "win32" and prepend '#' to the "LIBS" ++# line in the dynamic linking section. ++win32:INCLUDEPATH += ../../3rdparty/gsl-1.8/include ++win32:LIBS += ../../3rdparty/gsl-1.8/lib/libgsl.a ++win32:LIBS += ../../3rdparty/gsl-1.8/lib/libgslcblas.a ++ # Dynamically link against GSL installed system-wide. + # This is used as default on unix systems such as + # Linux, Mac OS X and *BSD. diff -Nru scidavis-1.D9/debian/rules scidavis-1.D9/debian/rules --- scidavis-1.D9/debian/rules 2014-09-18 15:34:51.000000000 +0000 +++ scidavis-1.D9/debian/rules 2016-06-30 13:21:29.000000000 +0000 @@ -15,7 +15,7 @@ sed 's%.*libsuff=64.*%libsuff=/$(DEB_HOST_MULTIARCH)%' $$f > $$g; \ done #dh_auto_configure - qmake PRESET=linux_package + qmake -qt=qt4 PRESET=linux_package override_dh_auto_build: docbook-to-man man/manpage.sgml > debian/scidavis.1