Added compiling patches

Signed-off-by: effeffe <filippo.falezza@outlook.it>

5 files changed, 94 insertions, 4 deletions

diff --git a/ColorMapEditor.patch b/ColorMapEditor.patch
new file mode 100644
index 000000000000..79bd89fe7b57
--- /dev/null
+++ b/ColorMapEditor.patch
@@ -0,0 +1,20 @@
+--- qtiplot-0.9.8.9/qtiplot/src/lib/src/ColorMapEditor.cpp	2019-12-30 11:52:31.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/src/lib/src/ColorMapEditor.cpp	2011-07-02 09:23:52.000000000 +0200
+@@ -158,7 +158,7 @@
+ 	#ifdef Q_CC_MSVC
+ 		it->setFlags(it->flags() & (~Qt::ItemIsEditable));
+ 	#else
+-		it->setFlags(!Qt::ItemIsEditable);
++		it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ 	#endif
+ 		it->setBackground(QBrush(c));
+ 		it->setForeground(QBrush(c));
+@@ -249,7 +249,7 @@
+ #ifdef Q_CC_MSVC
+ 	it->setFlags(it->flags() & (~Qt::ItemIsEditable));
+ #else
+-	it->setFlags(!Qt::ItemIsEditable);
++	it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ #endif
+ 	it->setBackground(QBrush(c));
+ 	it->setForeground(QBrush(c));
diff --git a/ConfigDialog.patch b/ConfigDialog.patch
new file mode 100644
index 000000000000..689164f0649d
--- /dev/null
+++ b/ConfigDialog.patch
@@ -0,0 +1,11 @@
+--- qtiplot-0.9.8.9/qtiplot/src/core/ConfigDialog.cpp	2011-10-25 11:50:22.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/core/ConfigDialog.cpp	2019-12-30 11:46:22.850030277 +0100
+@@ -1390,7 +1390,7 @@
+ 	colorsList->setRowCount(colors);
+ 	for (int i = 0; i < colors; i++){
+ 		QTableWidgetItem *it = new QTableWidgetItem();
+-		it->setFlags(!Qt::ItemIsEditable);
++		it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ 		it->setBackground(QBrush(colList[i]));
+ 		colorsList->setItem(i, 0, it);
+ 
diff --git a/FitDialog.patch b/FitDialog.patch
new file mode 100644
index 000000000000..e993ea128842
--- /dev/null
+++ b/FitDialog.patch
@@ -0,0 +1,29 @@
+--- qtiplot-0.9.8.9/qtiplot/src/analysis/dialogs/FitDialog.cpp	2011-10-17 12:38:07.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/analysis/dialogs/FitDialog.cpp	2019-12-30 11:28:36.836496584 +0100
+@@ -1022,7 +1022,7 @@
+ #ifdef Q_CC_MSVC
+         it->setFlags(it->flags() & (~Qt::ItemIsEditable));
+ #else
+-        it->setFlags(!Qt::ItemIsEditable);
++        it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ #endif
+         it->setBackground(QBrush(Qt::lightGray));
+         it->setForeground(Qt::black);
+@@ -1049,7 +1049,7 @@
+         boxParams->setCellWidget(i, 2, sb);
+ 
+         it = new QTableWidgetItem();
+-		it->setFlags(!Qt::ItemIsEditable);
++		it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ 		it->setText("--");
+ 		boxParams->setItem(i, 5, it);
+ 	}
+@@ -1064,7 +1064,7 @@
+ #ifdef Q_CC_MSVC
+             it->setFlags(it->flags() & (~Qt::ItemIsEditable));
+ #else
+-            it->setFlags(!Qt::ItemIsEditable);
++            it->setFlags(Qt::ItemFlags(Qt::NoItemFlags));
+ #endif
+             it->setBackground(QBrush(Qt::lightGray));
+             boxParams->setItem(i, 4, it);
diff --git a/LayerDialog.patch b/LayerDialog.patch
new file mode 100644
index 000000000000..1f8eb6d90662
--- /dev/null
+++ b/LayerDialog.patch
@@ -0,0 +1,19 @@
+--- qtiplot-0.9.8.9/qtiplot/src/plot2D/dialogs/LayerDialog.cpp	2019-12-30 12:28:22.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/src/plot2D/dialogs/LayerDialog.cpp	2019-12-30 12:27:56.000000000 +0100
+@@ -69,14 +69,14 @@
+ 	QGridLayout *gl2 = new QGridLayout(gb2);
+ 	gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
+ 
+-	alignHorBox = new QComboBox( false );
++	alignHorBox = new QComboBox();
+ 	alignHorBox->insertItem( tr( "Center" ) );
+ 	alignHorBox->insertItem( tr( "Left" ) );
+ 	alignHorBox->insertItem( tr( "Right" ) );
+ 	gl2->addWidget(alignHorBox, 0, 1);
+ 
+ 	gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
+-	alignVertBox = new QComboBox( false );
++	alignVertBox = new QComboBox();
+ 	alignVertBox->insertItem( tr( "Center" ) );
+ 	alignVertBox->insertItem( tr( "Top" ) );
+ 	alignVertBox->insertItem( tr( "Bottom" ) );
diff --git a/PKGBUILD b/PKGBUILD
index 0c2ada0d1dde..f6581e8504e6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,6 +33,10 @@ source=("http://downloads.sourceforge.net/project/qtiplot.berlios/qtiplot-${pkgv
 "build.conf"
 "pyqt4.patch"
 "gsl2.patch"
+"ColorMapEditor.patch"
+"ConfigDialog.patch"
+"FitDialog.patch"
+"LayerDialog.patch"
 )
 
 noextract=("opj.tar.bz2"
@@ -53,9 +57,12 @@ sha256sums=('a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0'
             'dc3bbb78602fa4aafb59c7b33080ac7fe160d2b88c0e296f2b99b1a738d2e972'
             'def2ac188d45611e3f3822014edcf5103969f6e10a89e7f14f298dae35b57913'
             '42239a26459d5892fe59bcdc3057d9a946e5f416b4e791f7ce130a0aa7d139ce'
-            '1f1938cb40b51b4ef4b5266941a8a679c1bb49ada5090105665949ef8f5ca3a3')
-
-
+            '1f1938cb40b51b4ef4b5266941a8a679c1bb49ada5090105665949ef8f5ca3a3'
+			'd52482c530a9e61e5580141d3708e829140c78f7839f8d8cfcf2e63e581c1804'
+			'e5476599521289928e50462f6c9080185581f0c15b2dc274c96ca2c1fd8fa72a'
+			'da119d0d4abdf8954f7fc52efc9fc738897e4bdcc9b767444e549fb00a62578a'
+			'2427a152acdbe312211b7d57e73d47e9cd7f698440952784de6db4c0429cea22')
+			
 prepare() {
 cd "$srcdir"
 
@@ -71,6 +78,10 @@ patch -p0 < qtiplot-0.9.8.9-dialog.patch
 patch -p0 < qtiplot.patch
 patch -p0 < pyqt4.patch
 patch -p0 < gsl2.patch
+patch -p0 < FitDialog.patch
+patch -p0 < ConfigDialog.patch
+patch -p0 < ColorMapEditor.patch
+patch -p0 < LayerDialog.patch
 cp build.conf qtiplot-${pkgver}/
 
 }
@@ -85,7 +96,7 @@ build() {
 	sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' qtiplot/src/core/ApplicationWindow.cpp
 	sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' qtiplot/src/core/ApplicationWindow.cpp
 
-	qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++ QMAKE_CXXFLAGS+="-std=c++11"
+	qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++ QMAKE_CXXFLAGS+="-std=c++11" CONFIG+="liborigin python"
 	make QTDIR=/usr/ QMAKESPEC=linux-g++
 
 }