[mingw-qt: 43/65] Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:30:22 UTC 2012
commit 4a919007e7bfb9f435584903ee4f48a7e4fabd58
Author: Kalev Lember <kalev at smartlink.ee>
Date: Fri Jun 3 23:58:59 2011 +0300
Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
mingw32-qt.spec | 10 ++++------
qt-libjpeg-7-compatibility.patch | 20 --------------------
2 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index b0be466..dc57f59 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -11,7 +11,7 @@
Name: mingw32-qt
Version: 4.7.1
-Release: 5%{?pre}%{?dist}
+Release: 6%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -29,10 +29,6 @@ Patch11: mingw32-qt-4.6.0-no-fpu-functions.patch
# Qt tries to link against libpng using '-lpng'. This doesn't work for libpng 1.4
Patch12: qt-libpng14-compatibility.patch
-# Fedora's libjpeg uses the datatype 'jpeg_boolean' instead of 'boolean'
-# to avoid a conflict with the rpcndr.h header
-Patch13: qt-libjpeg-7-compatibility.patch
-
# One of the examples tries to link with 'Ws2_32'. As Linux is case sensitive this won't work
# http://bugreports.qt.nokia.com/browse/QTBUG-14484
Patch14: qt-fix-ws2_32-link.patch
@@ -80,7 +76,6 @@ Fedora Windows cross-compiler.
%patch11 -p1
%patch12 -p0
-%patch13 -p0
%patch14 -p0
%patch15 -p0
@@ -293,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 03 2011 Kalev Lember <kalev at smartlink.ee> - 4.7.1-6
+- Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
+
* Fri Apr 22 2011 Kalev Lember <kalev at smartlink.ee> - 4.7.1-5
- Rebuilt for pseudo-reloc version mismatch (#698827)
More information about the scm-commits
mailing list