Attachment 845916 Details for Bug 1048677 – Patch for F20/rawhide

[patch] Patch for F20/rawhide

0001-Fix-various-build-issues.patch (text/plain), 2.83 KB, created by Yaakov Selkowitz on 2014-01-06 05:44:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-01-06 05:44:57 UTC

Size: 2.83 KB

patch

obsolete

>From 0d1b3fff7f97cfdae31b30d280a77f45dbee38ff Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Sun, 5 Jan 2014 23:43:55 -0600
>Subject: [PATCH] Fix various build issues
>
>- Fix qmake to use .dll.a extension for implibs (avoids renaming hacks in
>  all mingw-qt5-* packages)
>- Force usage of system zlib in Qt5Bootstrap
>- Install shared libQt5BootstrapDBus for qdbuscpp2xml and qdbusxml2cpp
>- Fix QMAKE_LIBS_NETWORK for static linkage
>- Remove BR: mingw-libtiff (TIFF loader moved to mingw-qt5-qtimageformats)
>---
> qt5-qmake-implib-dll-a.patch           | 20 ++++++++++++++++++++
> qt5-use-system-zlib-in-host-libs.patch | 11 +++++++++++
> 2 files changed, 31 insertions(+)
> create mode 100644 qt5-qmake-implib-dll-a.patch
> create mode 100644 qt5-use-system-zlib-in-host-libs.patch
>
>diff --git a/qt5-qmake-implib-dll-a.patch b/qt5-qmake-implib-dll-a.patch
>new file mode 100644
>index 0000000..23b6d70
>--- /dev/null
>+++ b/qt5-qmake-implib-dll-a.patch
>@@ -0,0 +1,20 @@
>+--- a/qmake/generators/win32/mingw_make.cpp	2013-08-25 13:04:06.000000000 -0500
>++++ b/qmake/generators/win32/mingw_make.cpp	2014-01-02 01:24:31.640046700 -0600
>+@@ -71,7 +71,7 @@ QString MingwMakefileGenerator::escapeDe
>+ 
>+ QString MingwMakefileGenerator::getLibTarget()
>+ {
>+-    return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".a");
>++    return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".dll.a");
>+ }
>+ 
>+ bool MingwMakefileGenerator::findLibraries()
>+@@ -274,7 +274,7 @@ void MingwMakefileGenerator::init()
>+         if(!project->first("DESTDIR").isEmpty())
>+             destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false);
>+         project->values("MINGW_IMPORT_LIB").prepend(destDir + "lib" + project->first("TARGET")
>+-                                                         + project->first("TARGET_VERSION_EXT") + ".a");
>++                                                         + project->first("TARGET_VERSION_EXT") + ".dll.a");
>+ 	project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB"));
>+     }
>+ 
>diff --git a/qt5-use-system-zlib-in-host-libs.patch b/qt5-use-system-zlib-in-host-libs.patch
>new file mode 100644
>index 0000000..eccd9e4
>--- /dev/null
>+++ b/qt5-use-system-zlib-in-host-libs.patch
>@@ -0,0 +1,11 @@
>+--- a/src/tools/bootstrap/bootstrap.pro	2014-01-01 13:22:42.367935800 -0600
>++++ b/src/tools/bootstrap/bootstrap.pro	2014-01-02 23:38:20.707687700 -0600
>+@@ -148,7 +148,7 @@ macx {
>+ 
>+ *-g++*: QMAKE_CXXFLAGS += -ffunction-sections
>+ 
>+-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
>++if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
>+ else:include(../../3rdparty/zlib_dependency.pri)
>+ 
>+ win32:LIBS += -luser32 -lole32 -ladvapi32
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1048677: 845916 | 845933