[mingw-qwt] update to 6.1.2
sailer
sailer at fedoraproject.org
Fri Jan 2 06:44:32 UTC 2015
commit 9b55d53838b223a82671fee433bcb8ad7a672540
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Fri Jan 2 07:44:31 2015 +0100
update to 6.1.2
.gitignore | 1 +
mingw-qwt.spec | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
qwt-qt5.patch | 28 +++++++++++++
sources | 2 +-
4 files changed, 151 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac1ca07..c51871a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ qwt-5.2.1.tar.bz2
/qwt-6.0.1.tar.bz2
/qwt-6.1.0.tar.bz2
/qwt-6.1.1.tar.bz2
+/qwt-6.1.2.tar.bz2
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index e5f33e6..14c23ed 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -2,9 +2,12 @@
%global name1 qwt
+# build qt5 support (or not)
+%global qt5 0
+
Name: mingw-%{name1}
Summary: MinGW Windows Qwt library
-Version: 6.1.1
+Version: 6.1.2
Release: 1%{?dist}
URL: http://qwt.sourceforge.net
License: LGPLv2 with exceptions
@@ -20,6 +23,16 @@ BuildRequires: mingw32-qt
BuildRequires: mingw64-qt
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw64-gcc-c++
+%if 0%{?qt5}
+BuildRequires: mingw32-qt5-qmake
+BuildRequires: mingw64-qt5-qmake
+BuildRequires: mingw32-qt5-qtbase
+BuildRequires: mingw64-qt5-qtbase
+BuildRequires: mingw32-qt5-qtbase-devel
+BuildRequires: mingw64-qt5-qtbase-devel
+BuildRequires: mingw32-qt5-qtsvg
+BuildRequires: mingw64-qt5-qtsvg
+%endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -39,6 +52,21 @@ Summary: MinGW Windows Qwt library
%description -n mingw64-%{name1}
MinGW Windows Qwt library.
+%if 0%{?qt5}
+%package -n mingw32-%{name1}-qt5
+Summary: MinGW Windows Qwt library
+
+%description -n mingw32-%{name1}-qt5
+MinGW Windows Qwt library.
+
+%package -n mingw64-%{name1}-qt5
+Summary: MinGW Windows Qwt library
+
+%description -n mingw64-%{name1}-qt5
+MinGW Windows Qwt library.
+%endif
+
+
%?mingw_debug_package
%prep
@@ -46,11 +74,43 @@ MinGW Windows Qwt library.
pushd %{name1}-%{version}
%patch50 -p1 -b .pkgconfig
%patch51 -p1 -b .qt_install_paths
+%patch52 -p1 -b .qt5
popd
mv %{name1}-%{version} win32
cp -r win32 win64
+%if 0%{?qt5}
+cp -r win32 win32qt5
+cp -r win64 win64qt5
+%endif
%build
+%if 0%{?qt5}
+%if 0%{?mingw_build_win32} == 1
+pushd win32qt5
+%mingw32_qmake_qt4 QWT_CONFIG+=QwtPkgConfig
+make qmake
+pushd textengines
+make qmake
+popd
+perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
+perl -i -pe 's,qwt4d,qwtd,' textengines/mathml/Makefile.Debug
+make %{?_smp_mflags}
+popd
+%endif
+%if 0%{?mingw_build_win64} == 1
+pushd win64qt5
+%mingw64_qmake_qt4 QWT_CONFIG+=QwtPkgConfig
+make qmake
+pushd textengines
+make qmake
+popd
+perl -i -pe 's,qwt4,qwt,' textengines/mathml/Makefile.Release
+perl -i -pe 's,qwt4d,qwtd,' textengines/mathml/Makefile.Debug
+make %{?_smp_mflags}
+popd
+%endif
+%endif
+
%if 0%{?mingw_build_win32} == 1
pushd win32
%mingw32_qmake_qt4 QWT_CONFIG+=QwtPkgConfig
@@ -77,6 +137,27 @@ popd
%endif
%install
+%if 0%{?qt5}
+%if 0%{?mingw_build_win32} == 1
+pushd win32qt5
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+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}
+%endif
+%if 0%{?mingw_build_win64} == 1
+pushd win64qt5
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+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}
+%endif
+%endif
+
%if 0%{?mingw_build_win32} == 1
pushd win32
make INSTALL_ROOT=$RPM_BUILD_ROOT install
@@ -128,7 +209,46 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/qt4/plugins/designer/%{name1}_designer_plugi
%{mingw64_datadir}/qt4/mkspecs/features/qwt*
%{mingw64_libdir}/pkgconfig/*.pc
+%if 0%{?qt5}
+%files -n mingw32-%{name1}-qt5
+%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_datadir}/qt5/mkspecs/features/qwt*
+%{mingw32_libdir}/pkgconfig/Qt5Qwt6.pc
+%{mingw32_libdir}/pkgconfig/qwtmathml-qt5.pc
+
+%files -n mingw64-%{name1}-qt5
+%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_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-1
+- update to 6.1.2
+
* Wed Nov 05 2014 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.1.1-1
- update to 6.1.1
diff --git a/qwt-qt5.patch b/qwt-qt5.patch
new file mode 100644
index 0000000..ae02483
--- /dev/null
+++ b/qwt-qt5.patch
@@ -0,0 +1,28 @@
+diff -up qwt-6.1.2/qwtfunctions.pri.qt5 qwt-6.1.2/qwtfunctions.pri
+--- qwt-6.1.2/qwtfunctions.pri.qt5 2014-12-11 08:13:13.511186492 -0600
++++ qwt-6.1.2/qwtfunctions.pri 2014-12-12 20:45:24.556261966 -0600
+@@ -12,7 +12,12 @@
+ defineReplace(qwtLibraryTarget) {
+
+ unset(LIBRARY_NAME)
++
++ greaterThan(QT_MAJOR_VERSION, 4) {
++ LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION}
++ } else {
+ LIBRARY_NAME = $$1
++ }
+
+ mac:contains(QWT_CONFIG, QwtFramework) {
+
+@@ -36,7 +41,11 @@ defineReplace(qwtLibraryTarget) {
+ defineTest(qwtAddLibrary) {
+
+ LIB_PATH = $$1
++ greaterThan(QT_MAJOR_VERSION, 4) {
++ LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION}
++ } else {
+ LIB_NAME = $$2
++ }
+
+ mac:contains(QWT_CONFIG, QwtFramework) {
+
diff --git a/sources b/sources
index 2f7cdea..6ea5c74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe4bdd561ef5584924e72e15bcf46b9e qwt-6.1.1.tar.bz2
+9c88db1774fa7e3045af063bbde44d7d qwt-6.1.2.tar.bz2
More information about the scm-commits
mailing list