[mingw-qwt: 10/21] make it build with Qt 4.6.0
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 17:13:15 UTC 2012
commit 1c59b6113f6f83db8d4aa06b8e48d15edbc4b657
Author: sailer <sailer at fedoraproject.org>
Date: Wed Dec 2 01:22:39 2009 +0000
make it build with Qt 4.6.0
.cvsignore | 1 +
mingw32-qwt.spec | 12 +++-
qwt-path.patch | 8 +-
qwt-qhash.patch | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 188 insertions(+), 7 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index ab1af84..d057df7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
qwt-5.1.1.tar.bz2
+qwt-5.2.0.tar.bz2
diff --git a/mingw32-qwt.spec b/mingw32-qwt.spec
index 2f41d1b..833a8d8 100644
--- a/mingw32-qwt.spec
+++ b/mingw32-qwt.spec
@@ -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
diff --git a/qwt-path.patch b/qwt-path.patch
index fe222b7..f8d2e04 100644
--- a/qwt-path.patch
+++ b/qwt-path.patch
@@ -14,15 +14,15 @@ diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
--- 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
diff --git a/qwt-qhash.patch b/qwt-qhash.patch
new file mode 100644
index 0000000..a70fefb
--- /dev/null
+++ b/qwt-qhash.patch
@@ -0,0 +1,172 @@
+--- 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
diff --git a/sources b/sources
index 5a3d59a..88209d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-218cef1a39ebda6cfa440a0727464275 qwt-5.1.1.tar.bz2
+c60b4cfac271a41524402b3ae5197890 qwt-5.2.0.tar.bz2
More information about the scm-commits
mailing list