[mingw-qwt] enable qt5 build

sailer sailer at fedoraproject.org
Fri Jan 2 22:28:58 UTC 2015


commit 493b8af9e3cc130d68d5f85bbb72bd486e49190f
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Fri Jan 2 23:28:24 2015 +0100

    enable qt5 build

 mingw-qwt.spec |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index 9566903..50cf537 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -3,12 +3,12 @@
 %global name1 qwt
 
 # build qt5 support (or not)
-%global qt5 0
+%global qt5 1
 
 Name:           mingw-%{name1}
 Summary:        MinGW Windows Qwt library
 Version:        6.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
@@ -87,6 +87,16 @@ cp -r win32 win32qt5
 cp -r win64 win64qt5
 perl -i -pe 's,debug_and_release,release,' win32qt5/qwtbuild.pri
 perl -i -pe 's,debug_and_release,release,' win64qt5/qwtbuild.pri
+echo "CONFIG -= debug" >> win32qt5/qwtbuild.pri
+echo "CONFIG -= debug" >> win64qt5/qwtbuild.pri
+echo "CONFIG -= debug" >> win32qt5/src/src.pro
+echo "CONFIG -= debug" >> win64qt5/src/src.pro
+echo "CONFIG -= debug_and_release" >> win32qt5/src/src.pro
+echo "CONFIG -= debug_and_release" >> win64qt5/src/src.pro
+echo "CONFIG -= debug" >> win32qt5/textengines/mathml/mathml.pro
+echo "CONFIG -= debug" >> win64qt5/textengines/mathml/mathml.pro
+echo "CONFIG -= debug_and_release" >> win32qt5/textengines/mathml/mathml.pro
+echo "CONFIG -= debug_and_release" >> win64qt5/textengines/mathml/mathml.pro
 %endif
 
 %build
@@ -139,7 +149,7 @@ popd
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc
 mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
 mv $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{mingw32_bindir}
-mv $RPM_BUILD_ROOT%{mingw32_libdir}/qt5/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/qt5/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw32_bindir}/%{name1}_designer_plugin-qt5.dll
 %endif
 %if 0%{?mingw_build_win64} == 1
 pushd win64qt5
@@ -148,7 +158,7 @@ popd
 rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc
 mkdir -p $RPM_BUILD_ROOT%{mingw64_bindir}
 mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
-mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt5/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw64_bindir}
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt5/plugins/designer/%{name1}_designer_plugin.dll $RPM_BUILD_ROOT%{mingw64_bindir}/%{name1}_designer_plugin-qt5.dll
 %endif
 %endif
 
@@ -208,15 +218,11 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt4/plugins/designer/%{name1}_designer_plugi
 %doc win32/COPYING
 %doc win32/README
 %{mingw32_bindir}/%{name1}-qt5.dll
-%{mingw32_bindir}/%{name1}d-qt5.dll
 %{mingw32_bindir}/%{name1}mathml-qt5.dll
-%{mingw32_bindir}/%{name1}mathmld-qt5.dll
-%{mingw32_bindir}/%{name1}_designer_plugin.dll
-%{mingw32_includedir}/%{name1}
-%{mingw32_libdir}/lib%{name1}-qt5.a
-%{mingw32_libdir}/lib%{name1}d-qt5.a
-%{mingw32_libdir}/lib%{name1}mathml-qt5.a
-%{mingw32_libdir}/lib%{name1}mathmld-qt5.a
+%{mingw32_libdir}/lib%{name1}-qt5.dll.a
+%{mingw32_libdir}/lib%{name1}mathml-qt5.dll.a
+%{mingw32_bindir}/%{name1}_designer_plugin-qt5.dll
+%{mingw32_includedir}/qt5/%{name1}
 %{mingw32_datadir}/qt5/mkspecs/features/qwt*
 %{mingw32_libdir}/pkgconfig/Qt5Qwt6.pc
 %{mingw32_libdir}/pkgconfig/qwtmathml-qt5.pc
@@ -225,21 +231,20 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt4/plugins/designer/%{name1}_designer_plugi
 %doc win64/COPYING
 %doc win64/README
 %{mingw64_bindir}/%{name1}-qt5.dll
-%{mingw64_bindir}/%{name1}d-qt5.dll
 %{mingw64_bindir}/%{name1}mathml-qt5.dll
-%{mingw64_bindir}/%{name1}mathmld-qt5.dll
-%{mingw64_bindir}/%{name1}_designer_plugin.dll
-%{mingw64_includedir}/%{name1}
-%{mingw64_libdir}/lib%{name1}-qt5.a
-%{mingw64_libdir}/lib%{name1}d-qt5.a
-%{mingw64_libdir}/lib%{name1}mathml-qt5.a
-%{mingw64_libdir}/lib%{name1}mathmld-qt5.a
+%{mingw64_libdir}/lib%{name1}-qt5.dll.a
+%{mingw64_libdir}/lib%{name1}mathml-qt5.dll.a
+%{mingw64_bindir}/%{name1}_designer_plugin-qt5.dll
+%{mingw64_includedir}/qt5/%{name1}
 %{mingw64_datadir}/qt5/mkspecs/features/qwt*
 %{mingw64_libdir}/pkgconfig/Qt5Qwt6.pc
 %{mingw64_libdir}/pkgconfig/qwtmathml-qt5.pc
 %endif
 
 %changelog
+* Fri Jan 02 2015 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.1.2-2
+- enable qt5 build
+
 * Fri Jan 02 2015 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.1.2-1
 - update to 6.1.2
 


More information about the scm-commits mailing list