[HippoDraw] * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.21.1-12 - Fix build against g
Orcan Ogetbil
oget at fedoraproject.org
Sun Aug 1 18:45:13 UTC 2010
commit 4a2bde557361b32b97f374a67e62824b1c8639ee
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Sun Aug 1 14:45:09 2010 -0400
* Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.21.1-12
- Fix build against gcc-4.5
HippoDraw-gcc45.patch | 234 +++++++++++++++++++++++++++++++++++++++++++++++++
HippoDraw.spec | 7 ++-
2 files changed, 240 insertions(+), 1 deletions(-)
---
diff --git a/HippoDraw-gcc45.patch b/HippoDraw-gcc45.patch
new file mode 100644
index 0000000..d00fac8
--- /dev/null
+++ b/HippoDraw-gcc45.patch
@@ -0,0 +1,234 @@
+diff -rupN HippoDraw-1.21.1.old/qt/CanvasView.cxx HippoDraw-1.21.1/qt/CanvasView.cxx
+--- HippoDraw-1.21.1.old/qt/CanvasView.cxx 2007-07-02 12:17:16.000000000 -0600
++++ HippoDraw-1.21.1/qt/CanvasView.cxx 2010-08-01 12:34:06.000000000 -0600
+@@ -1672,12 +1672,12 @@ void CanvasView::contentsMouseMoveEvent
+
+ if ( cut_low < plotter_low )
+ {
+- Range currentRange = Range::Range ( plotter_low, cut_high );
++ Range currentRange = typename Range::Range ( plotter_low, cut_high );
+ cut1d -> setCutRangeAt ( currentRange , 0 );
+ }
+ if ( cut_high > plotter_high )
+ {
+- Range currentRange = Range::Range ( cut_low , plotter_high );
++ Range currentRange = typename Range::Range ( cut_low , plotter_high );
+ cut1d -> setCutRangeAt ( currentRange , 0 );
+ }
+ }
+@@ -1699,23 +1699,23 @@ void CanvasView::contentsMouseMoveEvent
+
+ if ( cut_low_x < plotter_low_x )
+ {
+- Range currentRange = Range::Range ( plotter_low_x, cut_high_x );
++ Range currentRange = typename Range::Range ( plotter_low_x, cut_high_x );
+ cut2d -> setCutRangeAt ( currentRange , 0 );
+ }
+ if ( cut_high_x > plotter_high_x )
+ {
+- Range currentRange = Range::Range ( cut_low_x , plotter_high_x );
++ Range currentRange = typename Range::Range ( cut_low_x , plotter_high_x );
+ cut2d -> setCutRangeAt ( currentRange , 0 );
+ }
+
+ if ( cut_low_y < plotter_low_y )
+ {
+- Range currentRange = Range::Range ( plotter_low_y, cut_high_y );
++ Range currentRange = typename Range::Range ( plotter_low_y, cut_high_y );
+ cut2d -> setCutRangeAt ( currentRange , 1 );
+ }
+ if ( cut_high_y > plotter_high_y )
+ {
+- Range currentRange = Range::Range ( cut_low_y , plotter_high_y );
++ Range currentRange = typename Range::Range ( cut_low_y , plotter_high_y );
+ cut2d -> setCutRangeAt ( currentRange , 1 );
+ }
+ }
+@@ -1732,13 +1732,13 @@ void CanvasView::contentsMouseMoveEvent
+ double old_high = oldRange.high();
+
+ if ( datax < ( old_low + old_high ) / 2 ) {
+- Range currentRange = Range::Range ( datax , old_high );
++ Range currentRange = typename Range::Range ( datax , old_high );
+ cut1d -> setCutRangeAt ( currentRange , 0 );
+ }
+
+ else
+ {
+- Range currentRange = Range::Range ( old_low , datax );
++ Range currentRange = typename Range::Range ( old_low , datax );
+ cut1d -> setCutRangeAt ( currentRange , 0 );
+ }
+ notifyObservers();
+@@ -1763,7 +1763,7 @@ void CanvasView::contentsMouseMoveEvent
+ if ( ( dis_low_x <= 0.1 * (old_high_x - old_low_x)) &&
+ ( dis_low_y <= 0.1 * (old_high_y - old_low_y)) &&
+ ( m_edge == 0 ) || ( m_edge == 1 ) ) {
+- Range currentRange = Range::Range ( datax, old_high_x );
++ Range currentRange = typename Range::Range ( datax, old_high_x );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+
+ // Handle shift drag.
+@@ -1777,10 +1777,10 @@ void CanvasView::contentsMouseMoveEvent
+ // is protected.
+ vector <double> adjusted;
+ qtview->fillPickedPoint(view_left, view_bottom, adjusted);
+- currentRange = Range::Range ( adjusted[2], old_high_y );
++ currentRange = typename Range::Range ( adjusted[2], old_high_y );
+ }
+ else
+- currentRange = Range::Range ( datay, old_high_y );
++ currentRange = typename Range::Range ( datay, old_high_y );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 1;
+ }
+@@ -1789,7 +1789,7 @@ void CanvasView::contentsMouseMoveEvent
+ else if ( ( dis_low_x <= 0.1 * (old_high_x - old_low_x)) &&
+ ( dis_high_y <= 0.1 * (old_high_y - old_low_y)) &&
+ ( m_edge == 0 ) || ( m_edge == 2 ) ) {
+- Range currentRange = Range::Range ( datax, old_high_x );
++ Range currentRange = typename Range::Range ( datax, old_high_x );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+
+ // Handle shift drag
+@@ -1803,10 +1803,10 @@ void CanvasView::contentsMouseMoveEvent
+ // is protected.
+ vector <double> adjusted;
+ qtview->fillPickedPoint(view_left, view_top, adjusted);
+- currentRange = Range::Range ( old_low_y, adjusted[2]);
++ currentRange = typename Range::Range ( old_low_y, adjusted[2]);
+ }
+ else
+- currentRange = Range::Range ( old_low_y, datay );
++ currentRange = typename Range::Range ( old_low_y, datay );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 2;
+ }
+@@ -1815,7 +1815,7 @@ void CanvasView::contentsMouseMoveEvent
+ else if ( ( dis_high_x <= 0.1 * (old_high_x - old_low_x)) &&
+ ( dis_low_y <= 0.1 * (old_high_y - old_low_y)) &&
+ ( m_edge == 0 ) || ( m_edge == 3 ) ) {
+- Range currentRange = Range::Range ( old_low_x, datax );
++ Range currentRange = typename Range::Range ( old_low_x, datax );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+
+ // Handle shift drag.
+@@ -1829,10 +1829,10 @@ void CanvasView::contentsMouseMoveEvent
+ // is protected.
+ vector <double> adjusted;
+ qtview->fillPickedPoint(view_right, view_bottom, adjusted);
+- currentRange = Range::Range ( adjusted[2], old_high_y );
++ currentRange = typename Range::Range ( adjusted[2], old_high_y );
+ }
+ else
+- currentRange = Range::Range ( datay, old_high_y );
++ currentRange = typename Range::Range ( datay, old_high_y );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 3;
+ }
+@@ -1841,7 +1841,7 @@ void CanvasView::contentsMouseMoveEvent
+ else if ( ( dis_high_x <= 0.1 * (old_high_x - old_low_x)) &&
+ ( dis_high_y <= 0.1 * (old_high_y - old_low_y)) &&
+ ( m_edge == 0) || ( m_edge == 4 ) ) {
+- Range currentRange = Range::Range ( old_low_x, datax );
++ Range currentRange = typename Range::Range ( old_low_x, datax );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+
+ // Handle shift drag.
+@@ -1855,10 +1855,10 @@ void CanvasView::contentsMouseMoveEvent
+ // is protected.
+ vector <double> adjusted;
+ qtview->fillPickedPoint(view_right, view_top, adjusted);
+- currentRange = Range::Range ( old_low_y, adjusted[2] );
++ currentRange = typename Range::Range ( old_low_y, adjusted[2] );
+ }
+ else
+- currentRange = Range::Range ( old_low_y, datay );
++ currentRange = typename Range::Range ( old_low_y, datay );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 4;
+ }
+@@ -1868,7 +1868,7 @@ void CanvasView::contentsMouseMoveEvent
+ ( dis_low_x <= dis_low_y ) &&
+ ( dis_low_x <= dis_high_y ) &&
+ ( m_edge == 0 ) || ( m_edge == 5 ) ) {
+- Range currentRange = Range::Range ( datax, old_high_x );
++ Range currentRange = typename Range::Range ( datax, old_high_x );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+ m_edge = 5;
+ }
+@@ -1878,7 +1878,7 @@ void CanvasView::contentsMouseMoveEvent
+ ( dis_high_x <= dis_low_y ) &&
+ ( dis_high_x <= dis_high_y ) &&
+ ( m_edge == 0 ) || ( m_edge == 6 ) ) {
+- Range currentRange = Range::Range ( old_low_x, datax );
++ Range currentRange = typename Range::Range ( old_low_x, datax );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+ m_edge = 6;
+ }
+@@ -1888,7 +1888,7 @@ void CanvasView::contentsMouseMoveEvent
+ ( dis_low_y <= dis_low_x ) &&
+ ( dis_low_y <= dis_high_y ) &&
+ ( m_edge == 0 ) || ( m_edge == 7 ) ) {
+- Range currentRange = Range::Range ( datay, old_high_y );
++ Range currentRange = typename Range::Range ( datay, old_high_y );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 7;
+ }
+@@ -1896,7 +1896,7 @@ void CanvasView::contentsMouseMoveEvent
+ // Top
+ else
+ {
+- Range currentRange = Range::Range ( old_low_y, datay );
++ Range currentRange = typename Range::Range ( old_low_y, datay );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ m_edge = 8;
+ }
+@@ -1926,7 +1926,7 @@ void CanvasView::contentsMouseMoveEvent
+ high= old_pos;
+ }
+
+- Range currentRange = Range::Range ( low, high );
++ Range currentRange = typename Range::Range ( low, high );
+ cut1d -> setCutRangeAt ( currentRange , 0 );
+ }
+ notifyObservers();
+@@ -1949,7 +1949,7 @@ void CanvasView::contentsMouseMoveEvent
+ low = datax;
+ high = old_pos_x;
+ }
+- Range currentRange = Range::Range ( low, high );
++ Range currentRange = typename Range::Range ( low, high );
+ cut2d -> setCutRangeAt ( currentRange, 0 );
+
+ if ( datay > old_pos_y ) {
+@@ -1960,7 +1960,7 @@ void CanvasView::contentsMouseMoveEvent
+ low = datay;
+ high = old_pos_y;
+ }
+- currentRange = Range::Range ( low, high );
++ currentRange = typename Range::Range ( low, high );
+ cut2d -> setCutRangeAt ( currentRange, 1 );
+ }
+ notifyObservers();
+@@ -1991,7 +1991,7 @@ void CanvasView::contentsMouseMoveEvent
+ low = datax - width/2;
+ high = datax + width/2;
+ }
+- Range currentRange = Range::Range ( low, high );
++ Range currentRange = typename Range::Range ( low, high );
+ cut1d -> setCutRangeAt (currentRange, 0 );
+ notifyObservers();
+ }
+@@ -2035,9 +2035,9 @@ void CanvasView::contentsMouseMoveEvent
+ high_y = datay + width_y/2;
+ }
+
+- Range currentRange = Range::Range ( low_x, high_x );
++ Range currentRange = typename Range::Range ( low_x, high_x );
+ cut2d -> setCutRangeAt (currentRange, 0 );
+- currentRange = Range::Range ( low_y, high_y );
++ currentRange = typename Range::Range ( low_y, high_y );
+ cut2d -> setCutRangeAt (currentRange, 1 );
+ notifyObservers();
+ }
diff --git a/HippoDraw.spec b/HippoDraw.spec
index 14f2636..cb1f83b 100644
--- a/HippoDraw.spec
+++ b/HippoDraw.spec
@@ -1,6 +1,6 @@
Name: HippoDraw
Version: 1.21.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Interactive and Python scriptable data analysis application
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
@@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: HippoDraw-1.21.1-gcc43.patch
Patch2: HippoDraw-1.21.1-includes.patch
+Patch3: HippoDraw-gcc45.patch
BuildRequires: cfitsio-devel qt3-devel desktop-file-utils doxygen graphviz
@@ -65,6 +66,7 @@ class library. User documentation is part of the main package.
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .includes
+%patch3 -p1 -b .gcc45
%build
# Exclude or avoid packages that might be installed in /usr/local
@@ -144,6 +146,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_datadir}/%{name}/examples
%changelog
+* Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.21.1-12
+- Fix build against gcc-4.5
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.21.1-11
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list