[mingw-qwt] update to 6.0.1

Tue Dec 4 10:10:39 UTC 2012

commit 1c827bfbee64b102a7ac63b078955df0ce32dbb1
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Dec 4 11:10:24 2012 +0100

    update to 6.0.1

 .gitignore      |    1 +
 mingw-qwt.spec  |  107 +++++++++++++++++++++-------------
 qwt-path.patch  |   45 --------------
 qwt-qhash.patch |  172 -------------------------------------------------------
 qwt-w64.patch   |   11 ++++
 sources         |    1 +
 6 files changed, 78 insertions(+), 259 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f4af095..b3990c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ qwt-5.1.1.tar.bz2
 qwt-5.2.0.tar.bz2
 qwt-5.2.1.tar.bz2
 /qwt-5.2.2.tar.bz2
+/qwt-6.0.1.tar.bz2
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index 2354135..94bcf9e 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -1,16 +1,16 @@
 %?mingw_package_header
 
 %global name1 qwt
-%global name2 %{name1}5
 
 Name:           mingw-%{name1}
 Summary:        MinGW Windows Qwt library
-Version:        5.2.2
+Version:        6.0.1
 Release:        1%{?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-w64.patch
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw32-qt
@@ -36,86 +36,109 @@ Summary:        MinGW Windows Qwt library
 %description -n mingw64-%{name1}
 MinGW Windows Qwt library.
 
-
-%{?mingw_debug_package}
-
+%?mingw_debug_package
 
 %prep
 %setup -qcn %{name1}-%{version}
 pushd %{name1}-%{version}
-#disable Designer
-sed -i "s\CONFIG *+= *QwtDesigner\#CONFIG += QwtDesigner\1" qwtconfig.pri
-#disable Examples
-sed -i "s\CONFIG *+= *QwtExamples\#CONFIG += QwtExamples\1" qwtconfig.pri
-#enable debug and release
-sed -i "s\ *CONFIG *+= *release\#CONFIG += release\1" qwtconfig.pri
-sed -i "s\ *#CONFIG *+= *debug_and_release\CONFIG += debug_and_release\1" qwtconfig.pri
+%patch0 -p0
 popd
 mv %{name1}-%{version} win32
 cp -r win32 win64
+%if 0%{?mingw_build_win32} == 1
 pushd win32
-sed -i "s\ *INSTALLBASE *=.*\INSTALLBASE = $RPM_BUILD_ROOT%{mingw32_prefix}\1" qwtconfig.pri
+perl -i -pe 's,QWT_CONFIG\s*\+=\s*QwtDesigner,\#QWT_CONFIG     += QwtDesigner,' qwtconfig.pri
+perl -i -pe 's,QWT_INSTALL_PREFIX\s*=.*$,QWT_INSTALL_PREFIX    = %mingw32_prefix,' qwtconfig.pri
 popd
+%endif
+%if 0%{?mingw_build_win64} == 1
 pushd win64
-sed -i "s\ *INSTALLBASE *=.*\INSTALLBASE = $RPM_BUILD_ROOT%{mingw64_prefix}\1" qwtconfig.pri
+perl -i -pe 's,QWT_CONFIG\s*\+=\s*QwtDesigner,\#QWT_CONFIG     += QwtDesigner,' qwtconfig.pri
+perl -i -pe 's,QWT_INSTALL_PREFIX\s*=.*$,QWT_INSTALL_PREFIX    = %mingw64_prefix,' qwtconfig.pri
 popd
+%endif
 
 %build
+%if 0%{?mingw_build_win32} == 1
 pushd win32
 %mingw32_qmake_qt4
-make release debug %{?_smp_mflags}
+make textengines/Makefile
+pushd textengines
+make mathml/Makefile
+popd
+perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
+perl -i -pe 's,qwtd4,qwtd,' textengines/mathml/Makefile.Debug
+make %{?_smp_mflags}
 popd
+%endif
+%if 0%{?mingw_build_win64} == 1
 pushd win64
 %mingw64_qmake_qt4
-make release debug %{?_smp_mflags}
+make textengines/Makefile
+pushd textengines
+make mathml/Makefile
 popd
+perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
+perl -i -pe 's,qwtd4,qwtd,' textengines/mathml/Makefile.Debug
+make %{?_smp_mflags}
+popd
+%endif
 
 %install
+%if 0%{?mingw_build_win32} == 1
 pushd win32
-make install
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
 popd
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/features
+mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
+mv $RPM_BUILD_ROOT%{mingw32_includedir}/*.h $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+%endif
+%if 0%{?mingw_build_win64} == 1
 pushd win64
-make install
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
 popd
-#remove unneeded stuff
-rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
 rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc
-%{__install} -d $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
-%{__install} -d $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
-%{__mv} $RPM_BUILD_ROOT%{mingw32_includedir}/*.h $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}
-%{__mv} $RPM_BUILD_ROOT%{mingw64_includedir}/*.h $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
-%{__install} -d $RPM_BUILD_ROOT%{mingw32_bindir}
-%{__install} -d $RPM_BUILD_ROOT%{mingw64_bindir}
-%{__mv} $RPM_BUILD_ROOT%{mingw32_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
-%{__mv} $RPM_BUILD_ROOT%{mingw64_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{mingw64_bindir}/
-%{__cp} win32/lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
-%{__cp} win64/lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw64_bindir}/
-%{__cp} win32/lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw32_libdir}/
-%{__cp} win64/lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw64_libdir}/
+rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/features
+mkdir -p $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
+mv $RPM_BUILD_ROOT%{mingw64_includedir}/*.h $RPM_BUILD_ROOT%{mingw64_includedir}/%{name1}
+mkdir -p $RPM_BUILD_ROOT%{mingw64_bindir}
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
+%endif
 
 %files -n mingw32-%{name1}
 %doc win32/CHANGES
 %doc win32/COPYING
 %doc win32/README
-%{mingw32_bindir}/%{name2}.dll
-%{mingw32_bindir}/%{name1}d5.dll
+%{mingw32_bindir}/%{name1}.dll
+%{mingw32_bindir}/%{name1}d.dll
+%{mingw32_bindir}/%{name1}mathml.dll
+%{mingw32_bindir}/%{name1}mathmld.dll
 %{mingw32_includedir}/%{name1}
-%{mingw32_libdir}/lib%{name2}.a
-%{mingw32_libdir}/lib%{name1}d5.a
+%{mingw32_libdir}/lib%{name1}.a
+%{mingw32_libdir}/lib%{name1}d.a
+%{mingw32_libdir}/lib%{name1}mathml.a
+%{mingw32_libdir}/lib%{name1}mathmld.a
 
 %files -n mingw64-%{name1}
 %doc win64/CHANGES
 %doc win64/COPYING
 %doc win64/README
-%{mingw64_bindir}/%{name2}.dll
-%{mingw64_bindir}/%{name1}d5.dll
+%{mingw64_bindir}/%{name1}.dll
+%{mingw64_bindir}/%{name1}d.dll
+%{mingw64_bindir}/%{name1}mathml.dll
+%{mingw64_bindir}/%{name1}mathmld.dll
 %{mingw64_includedir}/%{name1}
-%{mingw64_libdir}/lib%{name2}.a
-%{mingw64_libdir}/lib%{name1}d5.a
+%{mingw64_libdir}/lib%{name1}.a
+%{mingw64_libdir}/lib%{name1}d.a
+%{mingw64_libdir}/lib%{name1}mathml.a
+%{mingw64_libdir}/lib%{name1}mathmld.a
 
 %changelog
-* Tue Aug 21 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.2-1
-- update to 5.2.2
+* Tue Dec  4 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.0.1-1
+- update to 6.0.1
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/qwt-w64.patch b/qwt-w64.patch
new file mode 100644
index 0000000..294748a
--- /dev/null
+++ b/qwt-w64.patch
@@ -0,0 +1,11 @@
+--- textengines/mathml/qwt_mml_document.cpp.w64	2012-12-04 10:44:04.347374726 +0100
++++ textengines/mathml/qwt_mml_document.cpp	2012-12-04 10:44:13.659512921 +0100
+@@ -3622,7 +3622,7 @@
+ 
+     return QString( "%1 %2 mr=%3 pr=%4 dr=%5 ro=(%7, %8) str=%9" )
+            .arg( spec->type_str )
+-           .arg( ( unsigned long )this, 0, 16 )
++           .arg( ( unsigned long long )this, 0, 16 )
+            .arg( rectToStr( myRect() ) )
+            .arg( rectToStr( parentRect() ) )
+            .arg( rectToStr( deviceRect() ) )
diff --git a/sources b/sources
index ee8e891..965a5e9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 70d77e4008a6cc86763737f0f24726ca  qwt-5.2.2.tar.bz2
+ace68558eab873e2da7e641179c4ef0c  qwt-6.0.1.tar.bz2
