rpms/mingw32-qwt/devel qwt-qhash.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-qwt.spec, 1.7, 1.8 qwt-path.patch, 1.1, 1.2 sources, 1.2, 1.3

Wed Dec 2 01:22:40 UTC 2009

Author: sailer

Update of /cvs/extras/rpms/mingw32-qwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4336

Modified Files:
	.cvsignore mingw32-qwt.spec qwt-path.patch sources 
Added Files:
	qwt-qhash.patch 
Log Message:
make it build with Qt 4.6.0


qwt-qhash.patch:
 qwt_compass.cpp        |    2 +-
 qwt_dial.cpp           |    2 +-
 qwt_knob.cpp           |    2 +-
 qwt_plot.cpp           |    2 +-
 qwt_plot_magnifier.cpp |    2 +-
 qwt_plot_rescaler.cpp  |    2 +-
 qwt_scale_widget.cpp   |    2 +-
 qwt_slider.cpp         |    2 +-
 qwt_thermo.cpp         |    2 +-
 qwt_valuelist.h        |    4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE qwt-qhash.patch ---
--- src/qwt_compass.cpp.qhash	2009-12-02 01:07:27.000000000 +0100
+++ src/qwt_compass.cpp	2009-12-02 01:07:41.000000000 +0100
@@ -12,7 +12,6 @@
 #include <math.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <qevent.h>
 #include "qwt_math.h"
 #include "qwt_scale_draw.h"
 #include "qwt_paint_buffer.h"
@@ -20,6 +19,7 @@
 #include "qwt_dial_needle.h"
 #include "qwt_compass_rose.h"
 #include "qwt_compass.h"
+#include <qevent.h>
 
 class QwtCompass::PrivateData
 {
--- src/qwt_dial.cpp.qhash	2009-12-02 01:08:08.000000000 +0100
+++ src/qwt_dial.cpp	2009-12-02 01:08:26.000000000 +0100
@@ -14,7 +14,6 @@
 #include <qpalette.h>
 #endif
 #include <qpixmap.h>
-#include <qevent.h>
 #include "qwt_math.h"
 #include "qwt_scale_engine.h"
 #include "qwt_scale_map.h"
@@ -22,6 +21,7 @@
 #include "qwt_painter.h"
 #include "qwt_dial_needle.h"
 #include "qwt_dial.h"
+#include <qevent.h>
 
 class QwtDial::PrivateData
 {
--- src/qwt_knob.cpp.qhash	2009-12-02 01:30:27.000000000 +0100
+++ src/qwt_knob.cpp	2009-12-02 01:30:39.000000000 +0100
@@ -10,12 +10,12 @@
 #include <qpainter.h>
 #include <qpalette.h>
 #include <qstyle.h>
-#include <qevent.h>
 #include "qwt_round_scale_draw.h"
 #include "qwt_knob.h"
 #include "qwt_math.h"
 #include "qwt_painter.h"
 #include "qwt_paint_buffer.h"
+#include <qevent.h>
 
 class QwtKnob::PrivateData
 {
--- src/qwt_plot.cpp.qhash	2009-12-02 00:30:13.000000000 +0100
+++ src/qwt_plot.cpp	2009-12-02 00:43:08.000000000 +0100
@@ -16,7 +16,6 @@
 #include <qpaintengine.h>
 #endif
 #include <qapplication.h>
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_dict.h"
 #include "qwt_plot_layout.h"
@@ -27,6 +26,7 @@
 #include "qwt_dyngrid_layout.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_paint_buffer.h"
+#include <qevent.h>
 
 class QwtPlot::PrivateData
 {
--- src/qwt_plot_magnifier.cpp.qhash	2009-12-02 01:06:08.000000000 +0100
+++ src/qwt_plot_magnifier.cpp	2009-12-02 01:06:20.000000000 +0100
@@ -10,11 +10,11 @@
 // vim: expandtab
 
 #include <math.h>
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_scale_div.h"
 #include "qwt_plot_magnifier.h"
+#include <qevent.h>
 
 class QwtPlotMagnifier::PrivateData
 {
--- src/qwt_plot_rescaler.cpp.qhash	2009-12-02 00:44:10.000000000 +0100
+++ src/qwt_plot_rescaler.cpp	2009-12-02 00:44:27.000000000 +0100
@@ -9,12 +9,12 @@
 
 // vim: expandtab
 
-#include <qevent.h>
 #include "qwt_plot.h"
 #include "qwt_plot_canvas.h"
 #include "qwt_scale_div.h"
 #include "qwt_double_interval.h"
 #include "qwt_plot_rescaler.h"
+#include <qevent.h>
 
 class QwtPlotRescaler::AxisData
 {
--- src/qwt_scale_widget.cpp.qhash	2009-12-02 01:06:40.000000000 +0100
+++ src/qwt_scale_widget.cpp	2009-12-02 01:06:53.000000000 +0100
@@ -10,7 +10,6 @@
 // vim: expandtab
 
 #include <qpainter.h>
-#include <qevent.h>
 #include "qwt_painter.h"
 #include "qwt_color_map.h"
 #include "qwt_scale_widget.h"
@@ -19,6 +18,7 @@
 #include "qwt_paint_buffer.h"
 #include "qwt_scale_div.h"
 #include "qwt_text.h"
+#include <qevent.h>
 
 class QwtScaleWidget::PrivateData
 {
--- src/qwt_slider.cpp.qhash	2009-12-02 01:57:26.000000000 +0100
+++ src/qwt_slider.cpp	2009-12-02 01:57:40.000000000 +0100
@@ -10,7 +10,6 @@
 // vim: expandtab
 
 #include <math.h>
-#include <qevent.h>
 #include <qdrawutil.h>
 #include <qpainter.h>
 #include "qwt_painter.h"
@@ -18,6 +17,7 @@
 #include "qwt_scale_draw.h"
 #include "qwt_scale_map.h"
 #include "qwt_slider.h"
+#include <qevent.h>
 
 class QwtSlider::PrivateData
 {
--- src/qwt_thermo.cpp.qhash	2009-12-02 01:58:00.000000000 +0100
+++ src/qwt_thermo.cpp	2009-12-02 01:58:16.000000000 +0100
@@ -8,7 +8,6 @@
  *****************************************************************************/
 
 #include <qpainter.h>
-#include <qevent.h>
 #include <qstyle.h>
 #include <qpixmap.h>
 #include <qdrawutil.h>
@@ -18,6 +17,7 @@
 #include "qwt_scale_map.h"
 #include "qwt_paint_buffer.h"
 #include "qwt_thermo.h"
+#include <qevent.h>
 
 class QwtThermo::PrivateData
 {
--- src/qwt_valuelist.h.qhash	2009-12-02 00:40:56.000000000 +0100
+++ src/qwt_valuelist.h	2009-12-02 00:41:35.000000000 +0100
@@ -36,12 +36,12 @@
 
 #if defined(QWT_TEMPLATEDLL)
 
-#if QT_VERSION < 0x040300
+#if QT_VERSION < 0x040601
 // Some compilers have problems, 
 // without a qHash(double) implementation
+inline uint qHash(double key) { return uint(key); }
 #include <qset.h>
 #include <qvector.h>
-inline uint qHash(double key) { return uint(key); }
 #endif
 
 // MOC_SKIP_BEGIN


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 02:22:02 -0000	1.2
+++ .cvsignore	2 Dec 2009 01:22:39 -0000	1.3
@@ -1 +1,2 @@
 qwt-5.1.1.tar.bz2
+qwt-5.2.0.tar.bz2


Index: mingw32-qwt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/mingw32-qwt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-qwt.spec	25 Jul 2009 14:30:51 -0000	1.7
+++ mingw32-qwt.spec	2 Dec 2009 01:22:39 -0000	1.8
@@ -3,13 +3,14 @@
 
 Name:           mingw32-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        5.1.1
-Release:        9%{?dist}
+Version:        5.2.0
+Release:        2%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
 Source:         http://downloads.sourceforge.net/%{name1}/%{name1}-%{version}.tar.bz2
 Patch0:         qwt-path.patch
+Patch1:         qwt-qhash.patch
 BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-qt
 BuildRequires:  mingw32-gcc-c++
@@ -34,6 +35,7 @@ MinGW Windows Qwt library.
 %prep
 %setup -qn %{name1}-%{version}
 %patch0 -p1
+%patch1 -p0 -b .qhash
 sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_mingw32_libdir}\1" qwtconfig.pri
 sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_mingw32_includedir}/%{name1}\1" qwtconfig.pri
 sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}\1" qwtconfig.pri
@@ -84,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-2
+- qt 4.6.0 compile workarounds
+
+* Tue Nov 24 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-1
+- update to 5.2.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

qwt-path.patch:
 designer/designer.pro |    2 +-
 qwtconfig.pri         |   16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

Index: qwt-path.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qwt-path.patch	16 Mar 2009 02:22:03 -0000	1.1
+++ qwt-path.patch	2 Dec 2009 01:22:39 -0000	1.2
@@ -14,15 +14,15 @@ diff -Nur qwt-5.1.1.org/qwtconfig.pri qw
 --- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
 +++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
 @@ -7,17 +7,9 @@
- VER_PAT      = 1
- VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
+ VER_PAT      = 0
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.1.1
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.1.1
+-    INSTALLBASE    = C:/Qwt-5.2.0
 -}
 -
 -target.path    = $$INSTALLBASE/lib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qwt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 02:22:03 -0000	1.2
+++ sources	2 Dec 2009 01:22:39 -0000	1.3
@@ -1 +1 @@
-218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+c60b4cfac271a41524402b3ae5197890  qwt-5.2.0.tar.bz2


