[mingw-qt5-qtbase] Remove obsolete patches/sources
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Jan 5 13:00:37 UTC 2014
commit 4756ddcc9202fe82ccbba7ad4190255cc3ad754d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Jan 5 13:57:50 2014 +0100
Remove obsolete patches/sources
mingw-qt5-qtbase.spec | 1 -
qmake.conf.win32 | 120 -----------------------------
qmake.conf.win64 | 120 -----------------------------
qt5-cmake-use-correct-tool-names.patch | 52 -------------
qt5-dont-build-debug-qtmain-library.patch | 11 ---
qt5-use-win32-g++-mkspecs-profile.patch | 12 ++-
6 files changed, 9 insertions(+), 307 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 6812b63..cb087f4 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -151,7 +151,6 @@ BuildRequires: mingw64-angleproject
BuildRequires: mingw64-pcre
BuildRequires: mingw64-postgresql
-BuildRequires: pkgconfig
BuildRequires: zip
BuildRequires: dos2unix
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
index 954c3bb..8743e34 100644
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ b/qt5-use-win32-g++-mkspecs-profile.patch
@@ -1,5 +1,5 @@
---- mkspecs/win32-g++/qmake.conf.orig 2014-01-02 13:50:16.123910873 +0100
-+++ mkspecs/win32-g++/qmake.conf 2014-01-02 13:58:21.294935571 +0100
+--- mkspecs/win32-g++/qmake.conf.orig 2014-01-05 13:46:16.181559218 +0100
++++ mkspecs/win32-g++/qmake.conf 2014-01-05 13:52:31.176768097 +0100
@@ -25,7 +25,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@@ -42,7 +42,7 @@
!isEmpty(QMAKE_SH) {
MINGW_IN_SHELL = 1
-@@ -102,9 +102,10 @@
+@@ -102,12 +102,16 @@
include(../common/shell-win32.conf)
}
@@ -54,3 +54,9 @@
QMAKE_STRIP = $${CROSS_COMPILE}strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
+ QMAKE_NM = $${CROSS_COMPILE}nm -P
++
++PKG_CONFIG = $${CROSS_COMPILE}pkg-config
++
+ load(qt_config)
More information about the scm-commits
mailing list