[mingw-qt] Dropped upstreamed pkgconfig patches

Erik van Pienbroek epienbro at fedoraproject.org
Wed Mar 28 23:18:59 UTC 2012


commit 2a94ea45eea2b9d2e1fb09700f5b662f65e6d1b9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Mar 29 01:18:53 2012 +0200

    Dropped upstreamed pkgconfig patches

 ...et-pkgconfig-dir-in-qmake-generated-Windo.patch |   31 ------------
 ...cements-when-installing-.pc-files-for-win.patch |   49 --------------------
 ...placements-when-installing-.pc-files-for-.patch |   32 -------------
 ...dd-TARGET_VERSION_EXT-to-pkgConfiglibName.patch |   27 -----------
 mingw-qt.spec                                      |   11 +----
 5 files changed, 1 insertions(+), 149 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index e8451d8..3826a8f 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -58,12 +58,6 @@ Patch21:        qt-4.8.0-build-qtuitools-dynamically.patch
 # Javascript-JIT fails to link on mingw x86_64
 Patch22:        qt-fix-javascript-jit-on-mingw-x86_64.patch
 
-# Automatically generate pkg-config files
-Patch23:        0001-Create-target-pkgconfig-dir-in-qmake-generated-Windo.patch
-Patch24:        0002-Allow-replacements-when-installing-.pc-files-for-win.patch
-Patch25:        0003-Activate-replacements-when-installing-.pc-files-for-.patch
-Patch26:        0004-Add-TARGET_VERSION_EXT-to-pkgConfiglibName.patch
-
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -193,10 +187,6 @@ Static version of the mingw64-qt library.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
@@ -1038,6 +1028,7 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
 - Update to 4.8.1
 - Removed a patch which fixed a compile failure in kdelibs as
   upstream has resolved the issue properly in commit 71e88dd
+- Dropped upstreamed pkgconfig patches
 
 * Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-8
 - Added win64 support


More information about the scm-commits mailing list