[150709] trunk/dports/science/scidavis

[nicos at macports.org]

Revision: 150709
          https://trac.macports.org/changeset/150709
Author:   nicos at macports.org
Date:     2016-07-27 04:33:30 -0700 (Wed, 27 Jul 2016)
Log Message:
-----------
scidavis: update to version 1.D13

Modified Paths:
--------------
    trunk/dports/science/scidavis/Portfile

Added Paths:
-----------
    trunk/dports/science/scidavis/files/patch-ColorMapEditor.diff
    trunk/dports/science/scidavis/files/patch-FitDialog.diff
    trunk/dports/science/scidavis/files/patch-config.diff

Modified: trunk/dports/science/scidavis/Portfile
===================================================================
--- trunk/dports/science/scidavis/Portfile	2016-07-27 09:24:51 UTC (rev 150708)
+++ trunk/dports/science/scidavis/Portfile	2016-07-27 11:33:30 UTC (rev 150709)
@@ -5,7 +5,7 @@
 PortGroup           qmake 1.0
 
 name                scidavis
-version             1.D9
+version             1.D13
 categories          science
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -30,13 +30,16 @@
                     port:zlib \
                     port:libGLU
 
-checksums           rmd160  ecd99befd493e54e3bd599f174f291ddb2c92d2b \
-                    sha256  484089713cec7824f9557ac345ec2693f24e074999d6d1d7d00c10b1e2f37eb8
+checksums           rmd160  a32db9b828b60d9c5a7bfef76935795ebc7e8f68 \
+                    sha256  0f0df69aad279f1e45f5714f7b70a228b18461c2aa2f9903345224125b69cbfb
 
 universal_variant   no
 
 patchfiles          patch-OriginObj.diff \
-                    patch-liborigin.diff
+                    patch-liborigin.diff \
+                    patch-config.diff \
+                    patch-ColorMapEditor.diff \
+                    patch-FitDialog.diff
 
 configure.pre_args-append   "'CONFIG+=osx_dist noassistant'"
 

Added: trunk/dports/science/scidavis/files/patch-ColorMapEditor.diff
===================================================================
--- trunk/dports/science/scidavis/files/patch-ColorMapEditor.diff	                        (rev 0)
+++ trunk/dports/science/scidavis/files/patch-ColorMapEditor.diff	2016-07-27 11:33:30 UTC (rev 150709)
@@ -0,0 +1,20 @@
+--- libscidavis/src/ColorMapEditor.cpp.orig	2016-06-28 21:54:40.000000000 +0900
++++ libscidavis/src/ColorMapEditor.cpp	2016-06-28 21:55:06.000000000 +0900
+@@ -124,7 +124,7 @@
+ 		
+ 	QColor c = QColor(map.rgb(QwtDoubleInterval(0, 1), colors[i]));
+ 	it = new QTableWidgetItem(c.name());
+-	it->setFlags(!Qt::ItemIsEditable);
++//	it->setFlags(!Qt::ItemIsEditable);
+ 	it->setBackground(QBrush(c));
+ 	it->setForeground(QBrush(c));
+     table->setItem(i, 1, it);
+@@ -156,7 +156,7 @@
+ table->setItem(row, 0, it);
+ 		
+ it = new QTableWidgetItem(c.name());
+-it->setFlags(!Qt::ItemIsEditable);
++//it->setFlags(!Qt::ItemIsEditable);
+ it->setBackground(QBrush(c));
+ it->setForeground(QBrush(c));
+ table->setItem(row, 1, it);

Added: trunk/dports/science/scidavis/files/patch-FitDialog.diff
===================================================================
--- trunk/dports/science/scidavis/files/patch-FitDialog.diff	                        (rev 0)
+++ trunk/dports/science/scidavis/files/patch-FitDialog.diff	2016-07-27 11:33:30 UTC (rev 150709)
@@ -0,0 +1,20 @@
+--- libscidavis/src/FitDialog.cpp.orig	2016-06-28 22:00:40.000000000 +0900
++++ libscidavis/src/FitDialog.cpp	2016-06-28 22:01:18.000000000 +0900
+@@ -655,7 +655,7 @@
+     for (int i = param_table_rows; i<paramList.count(); i++)
+ 	{
+         QTableWidgetItem *it = new QTableWidgetItem(paramList[i]);
+-        it->setFlags(!Qt::ItemIsEditable);
++//        it->setFlags(!Qt::ItemIsEditable);
+         it->setBackground(QBrush(Qt::lightGray));
+         it->setForeground(QBrush(Qt::darkRed));
+         QFont font = it->font();
+@@ -679,7 +679,7 @@
+ 		for (int i = 0; i<boxParams->rowCount(); i++ )
+ 		{
+             QTableWidgetItem *it = new QTableWidgetItem();
+-            it->setFlags(!Qt::ItemIsEditable);
++//            it->setFlags(!Qt::ItemIsEditable);
+             it->setBackground(QBrush(Qt::lightGray));
+             boxParams->setItem(i, 2, it);
+ 

Added: trunk/dports/science/scidavis/files/patch-config.diff
===================================================================
--- trunk/dports/science/scidavis/files/patch-config.diff	                        (rev 0)
+++ trunk/dports/science/scidavis/files/patch-config.diff	2016-07-27 11:33:30 UTC (rev 150709)
@@ -0,0 +1,12 @@
+--- config.pri.orig	2016-06-23 22:02:04.000000000 +0900
++++ config.pri	2016-06-28 22:14:28.000000000 +0900
+@@ -245,8 +245,7 @@
+ osx_dist {
+ 	# Uses MacPorts supplied versions of the dependencies
+ 
+-        QMAKE_CXX = g++-mp-4.8
+-        QMAKE_LINK = g++-mp-4.8
++	QMAKE_CXXFLAGS += -Wno-c++11-narrowing -Wno-reserved-user-defined-literal
+ 
+ 	INCLUDEPATH  += /opt/local/include
+ 	INCLUDEPATH  += /opt/local/include/qwt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160727/2a46d626/attachment-0001.html>