[mingw-qt5-qtdeclarative] Make sure the QmlDevTools library is built as shared library
Erik van Pienbroek
epienbro at fedoraproject.org
Fri Aug 2 00:17:45 UTC 2013
commit b19321130e8450486a3c2635810c301019eebe49
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Aug 2 02:17:34 2013 +0200
Make sure the QmlDevTools library is built as shared library
mingw-qt5-qtdeclarative.spec | 36 ++++++++++++++++++++++---
qt5-build-qmldevtools-as-shared-library.patch | 11 +++++++
2 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/mingw-qt5-qtdeclarative.spec b/mingw-qt5-qtdeclarative.spec
index e6bb7ef..f361cca 100644
--- a/mingw-qt5-qtdeclarative.spec
+++ b/mingw-qt5-qtdeclarative.spec
@@ -36,6 +36,10 @@ Source0: qt5-%{qt_module}-%{snapshot_rev}.tar.gz
Source0: http://download.qt-project.org/official_releases/qt/%{release_version}/%{version}/submodules/%{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}.tar.xz
%endif
+# Make sure the QmlDevTools library is built as
+# a shared library instead of a static library
+Patch0: qt5-build-qmldevtools-as-shared-library.patch
+
BuildRequires: mingw32-filesystem >= 96
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-qt5-qtbase
@@ -77,6 +81,14 @@ Requires: mingw32-qt5-%{qt_module} = %{version}-%{release}
Contains the files required to get various Qt tools built
which are part of the mingw-qt5-qttools package
+%package -n mingw32-qt5-qmldevtools-devel
+Summary: Qt5 for Windows build environment
+Requires: mingw32-qt5-qmldevtools = %{version}-%{release}
+
+%description -n mingw32-qt5-qmldevtools-devel
+Contains the files required to get various Qt tools built
+which are part of the mingw-qt5-qttools package
+
# Win64
%package -n mingw64-qt5-%{qt_module}
@@ -98,12 +110,21 @@ Requires: mingw64-qt5-%{qt_module} = %{version}-%{release}
Contains the files required to get various Qt tools built
which are part of the mingw-qt5-qttools package
+%package -n mingw64-qt5-qmldevtools-devel
+Summary: Qt5 for Windows build environment
+Requires: mingw64-qt5-qmldevtools = %{version}-%{release}
+
+%description -n mingw64-qt5-qmldevtools-devel
+Contains the files required to get various Qt tools built
+which are part of the mingw-qt5-qttools package
+
%?mingw_debug_package
%prep
%setup -q -n %{source_folder}
+%patch0 -p1
%build
@@ -187,7 +208,10 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
%files -n mingw32-qt5-qmldevtools
%{_prefix}/%{mingw32_target}/bin/qmlmin
-%{_prefix}/%{mingw32_target}/lib/libQt5QmlDevTools.a
+%{_prefix}/%{mingw32_target}/lib/libQt5QmlDevTools.so
+
+%files -n mingw32-qt5-qmldevtools-devel
+%{_prefix}/%{mingw32_target}/lib/libQt5QmlDevTools.so.5*
# Win64
@@ -238,12 +262,16 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/pkgconfig/Qt5QmlDevTools.p
%files -n mingw64-qt5-qmldevtools
%{_prefix}/%{mingw64_target}/bin/qmlmin
-%{_prefix}/%{mingw64_target}/lib/libQt5QmlDevTools.a
+%{_prefix}/%{mingw64_target}/lib/libQt5QmlDevTools.so
+
+%files -n mingw64-qt5-qmldevtools-devel
+%{_prefix}/%{mingw64_target}/lib/libQt5QmlDevTools.so.5*
%changelog
-* Tue Jul 30 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.0-2
-- Rebuild due to the introduction of arm as primary architecture
+* Fri Aug 2 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.0-2
+- Make sure the QmlDevTools library is built as a shared library
+- Added mingw{32,64}-qt5-qmldevtools-devel subpackages
* Thu Jul 11 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.0-1
- Update to 5.1.0
diff --git a/qt5-build-qmldevtools-as-shared-library.patch b/qt5-build-qmldevtools-as-shared-library.patch
new file mode 100644
index 0000000..2cb6fde
--- /dev/null
+++ b/qt5-build-qmldevtools-as-shared-library.patch
@@ -0,0 +1,11 @@
+--- qtdeclarative-opensource-src-5.1.0/src/qmldevtools/qmldevtools.pro.orig 2013-08-02 01:25:48.928675488 +0200
++++ qtdeclarative-opensource-src-5.1.0/src/qmldevtools/qmldevtools.pro 2013-08-02 01:25:58.679832023 +0200
+@@ -1,7 +1,7 @@
+ option(host_build)
+ TARGET = QtQmlDevTools
+ QT = core
+-CONFIG += static no_module_headers internal_module
++CONFIG += no_module_headers internal_module
+
+ MODULE_INCLUDES = \
+ \$\$QT_MODULE_INCLUDE_BASE \
More information about the scm-commits
mailing list