rpms/LabPlot/devel LabPlot-1.5.1.6-liborigin.patch, NONE, 1.1 LabPlot.spec, 1.9, 1.10

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25186/devel

Modified Files:
	LabPlot.spec 
Added Files:
	LabPlot-1.5.1.6-liborigin.patch 
Log Message:
* Tue Jun 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1.6-7
- fix build against latest liborigin on F10 (backported from 1.6.0)

LabPlot-1.5.1.6-liborigin.patch:

--- NEW FILE LabPlot-1.5.1.6-liborigin.patch ---
diff -ur LabPlot-1.5.1.6/src/ImportOPJ.cc LabPlot-1.5.1.6-liborigin/src/ImportOPJ.cc
--- LabPlot-1.5.1.6/src/ImportOPJ.cc	2005-11-16 21:08:13.000000000 +0100
+++ LabPlot-1.5.1.6-liborigin/src/ImportOPJ.cc	2008-06-10 17:05:28.000000000 +0200
@@ -37,16 +37,16 @@
 			spread->setColumnType(j,opj.colType(s,j));
 			
 			for (int i=0;i<opj.numRows(s,j);i++) {
-				double v = opj.Data(s,j)[i];
+				double *v = (double *) opj.oData(s,j,i,true);
 
 				LTableItem *item;
 				if(strcmp(opj.colType(s,j),"LABEL")) {	// number
-					if(fabs(v)<2.0e-300)	// empty entry
+					if(fabs(*v)>0 && fabs(*v)<2.0e-300)	// empty entry
 						continue;
-					item = new LTableItem( table, QTableItem::OnTyping,QString::number(v));
+					item = new LTableItem( table, QTableItem::OnTyping,QString::number(*v));
 				}
 				else					// label
-					item = new LTableItem( table,QTableItem::OnTyping,QString(opj.SData(s,j,i)));
+					item = new LTableItem( table,QTableItem::OnTyping,QString((char *) opj.oData(s,j,i)));
 				table->setItem(i, j, item);
 			}
 		}


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LabPlot.spec	4 Jun 2008 12:07:44 -0000	1.9
+++ LabPlot.spec	10 Jun 2008 15:08:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.5.1.6
-Release:           6%{?dist}
+Release:           7%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -10,7 +10,8 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
 
-Patch0: LabPlot-gcc43.patch
+Patch0:            LabPlot-gcc43.patch
+Patch1:            LabPlot-1.5.1.6-liborigin.patch
 
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
 BuildRequires:     gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
@@ -113,6 +114,10 @@
 %setup -q
 
 %patch0 -p1 -b .orig
+%if 0%{?fedora} > 9
+%patch1 -p1 -b .liborigin
+%endif
+
 
 %{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
 %{__sed} -i -e '/^libLabPlot_la_LDFLAGS/s|^\(.*\) \\$|\1 -lorigin \\|' src/Makefile.in
@@ -342,6 +347,9 @@
 
 
 %Changelog
+* Tue Jun 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1.6-7
+- fix build against latest liborigin on F10 (backported from 1.6.0)
+
 * Sun Apr 12 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 1.5.1.6-6
 - Fixes for GCC 4.3
 - Updated dependencies