[mingw-qt] When qmake .pro files contain 'TEMPLATE=lib' then the 'CONFIG+=shared' flag should be set automatica
Erik van Pienbroek
epienbro at fedoraproject.org
Wed May 22 20:22:15 UTC 2013
commit 4c13c650af33e8e51314d1dc3fb60a732c2afba8
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed May 22 22:21:44 2013 +0200
When qmake .pro files contain 'TEMPLATE=lib' then the 'CONFIG+=shared' flag should be set automatically
mingw-qt.spec | 11 ++++++++++-
...-set-shared-config-flag-for-lib-templates.patch | 8 ++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 7a2d597..44997b5 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -14,7 +14,7 @@
Name: mingw-qt
Version: 4.8.4
-Release: 3%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -76,6 +76,10 @@ Patch25: qt-4.8.4-fix-sse-suppport-build-regression.patch
# https://codereview.qt-project.org/#change,42461
Patch26: 0054-Fix-binary-incompatibility-between-openssl-versions.patch
+# When qmake .pro files contain 'TEMPLATE=lib' then the 'CONFIG+=shared'
+# flag should be set automatically
+Patch27: qt-automatically-set-shared-config-flag-for-lib-templates.patch
+
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@@ -216,6 +220,7 @@ Static version of the mingw64-qt library.
%patch24 -p1 -b .linguist_qtmake-qt4
%patch25 -p0 -b .ssse3
%patch26 -p1 -b .cert_verify
+%patch27 -p0 -b .lib_template
# Patch 19 (openssl) needs an additional change
# qt loads openssl libraries (ssleay32, libeay32) at runtime, but they are called libssl-OPENSSL_SONAME
@@ -1080,6 +1085,10 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
%changelog
+* Wed May 22 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.4-4
+- When qmake .pro files contain 'TEMPLATE=lib' then the 'CONFIG+=shared'
+ flag should be set automatically
+
* Sun Apr 14 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.4-3
- QSslSocket may report incorrect errors when certificate verification fails
diff --git a/qt-automatically-set-shared-config-flag-for-lib-templates.patch b/qt-automatically-set-shared-config-flag-for-lib-templates.patch
new file mode 100644
index 0000000..3039f96
--- /dev/null
+++ b/qt-automatically-set-shared-config-flag-for-lib-templates.patch
@@ -0,0 +1,8 @@
+--- mkspecs/features/default_post.prf.orig 2013-05-22 20:59:29.382858499 +0200
++++ mkspecs/features/default_post.prf 2013-05-22 21:01:17.064741692 +0200
+@@ -120,3 +120,5 @@
+ equals($$list($$last(TEMPLATE)), app): SOURCES += $$[QT_INSTALL_DATA]/mkspecs/common/symbian/appCaptionForTranslation.cpp
+ SOURCES += $$[QT_INSTALL_DATA]/mkspecs/common/symbian/packageNameForTranslation.cpp
+ }
++
++contains(TEMPLATE, "lib"):CONFIG += shared
More information about the scm-commits
mailing list