add patch for newest libs

3 files changed, 54 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed42bc5b9585..8d45b67d751d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Jan 11 19:06:25 UTC 2016
+# Tue May 31 15:02:25 UTC 2016
 pkgbase = scidavis
 	pkgdesc = Application for Scientific Data Analysis and Visualization, fork of QtiPlot
 	pkgver = 1.D9
@@ -21,10 +21,12 @@ pkgbase = scidavis
 	depends = qwt5
 	depends = qwtplot3d
 	source = http://prdownloads.sourceforge.net/sourceforge/scidavis/scidavis.1.D9.tar.gz
+	source = scidavis-tableitem.patch
 	source = scidavis-python.patch
 	source = scidavis-qtassistant.patch
 	source = scidavis-qwt5.patch
 	md5sums = fccb771fea021a61055d554db6230b51
+	md5sums = 5948728d8281089cc32e168c5b83d339
 	md5sums = bf3725530f5d66c7234232ba5500b308
 	md5sums = 14199d381631fa2db8450a66ea5ca1cc
 	md5sums = f9b3979ee4e255b0dc2d26f1b5ff82c2
diff --git a/PKGBUILD b/PKGBUILD
index 7695af686186..759eb0990d3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,32 +15,35 @@ makedepends=('boost' 'cmake')
 depends=('gsl' 'glu' 'mesa' 'muparser' 'python2-pyqt4' 'shared-mime-info'
          'qt-assistant-compat' 'qwt5' 'qwtplot3d')
 source=(http://prdownloads.sourceforge.net/sourceforge/scidavis/${pkgname}.${pkgver}.tar.gz
+        scidavis-tableitem.patch
         scidavis-python.patch
         scidavis-qtassistant.patch
         scidavis-qwt5.patch)
 install=${pkgname}.install
 md5sums=('fccb771fea021a61055d554db6230b51'
+         '5948728d8281089cc32e168c5b83d339'
          'bf3725530f5d66c7234232ba5500b308'
          '14199d381631fa2db8450a66ea5ca1cc'
          'f9b3979ee4e255b0dc2d26f1b5ff82c2')
 prepare() {
-  cd "${srcdir}"
   # python patch
-  patch -p0 -i "${srcdir}/scidavis-python.patch"
+  patch -p0 -i "scidavis-python.patch"
   # fix qtassistant
-  patch -p0 -i "${srcdir}/scidavis-qtassistant.patch"
+  patch -p0 -i "scidavis-qtassistant.patch"
   # fix qwt
-  patch -p0 -i "${srcdir}/scidavis-qwt5.patch"
+  patch -p0 -i "scidavis-qwt5.patch"
+  # fix table item attributes
+  patch -p0 -i "scidavis-tableitem.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
+  cd "${pkgname}.${pkgver}"
   qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
+  cd "${pkgname}.${pkgver}"
   make INSTALL_ROOT="${pkgdir}" DESTDIR="${pkgdir}" install
 
   # remove liborigin files since it uses static library
diff --git a/scidavis-tableitem.patch b/scidavis-tableitem.patch
new file mode 100644
index 000000000000..770394744d01
--- /dev/null
+++ b/scidavis-tableitem.patch
@@ -0,0 +1,42 @@
+diff -ruN scidavis.1.D9.orig/libscidavis/src/ColorMapEditor.cpp scidavis.1.D9/libscidavis/src/ColorMapEditor.cpp
+--- scidavis.1.D9.orig/libscidavis/src/ColorMapEditor.cpp	2016-05-31 17:42:49.661018699 +0300
++++ scidavis.1.D9/libscidavis/src/ColorMapEditor.cpp	2016-05-31 17:44:58.232963857 +0300
+@@ -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(it->flags()&~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(it->flags()&~Qt::ItemIsEditable);
+ it->setBackground(QBrush(c));
+ it->setForeground(QBrush(c));
+ table->setItem(row, 1, it);
+diff -ruN scidavis.1.D9.orig/libscidavis/src/FitDialog.cpp scidavis.1.D9/libscidavis/src/FitDialog.cpp
+--- scidavis.1.D9.orig/libscidavis/src/FitDialog.cpp	2016-05-31 17:42:49.664351910 +0300
++++ scidavis.1.D9/libscidavis/src/FitDialog.cpp	2016-05-31 17:44:51.333217278 +0300
+@@ -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(it->flags()&~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(it->flags()&~Qt::ItemIsEditable);
+             it->setBackground(QBrush(Qt::lightGray));
+             boxParams->setItem(i, 2, it);
+