[mingw-qt: 53/65] Update to 4.8.0 rc1

[epienbro]

commit d87a7b86e8d07e7cd1923124656ab99045445343
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Sep 4 15:29:13 2011 +0300

    Update to 4.8.0 rc1
    
    The MinGW cross compiled package has to be roughly in sync with the
    native version so that the version of moc and Qt headers match. The
    native Fedora Qt package is already at 4.8 and its moc generates code
    that is incompatible with mingw32-qt 4.7 headers.
    
    moc_finddialog.cpp:14:2: error: #error "This file was generated using the moc from 4.8.0. It"
    moc_finddialog.cpp:15:2: error: #error "cannot be used with the include files from this version of Qt."
    moc_finddialog.cpp:16:2: error: #error "(The moc has changed too much.)"

 .gitignore                             |    1 +
 mingw32-qt-4.8.0-no-webkit-tests.patch |   13 +++++++++++++
 mingw32-qt.spec                        |   26 +++++++++++++++-----------
 sources                                |    2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8db73e..f3b0cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /qt-everywhere-opensource-src-4.7.1.tar.gz
 /qt-everywhere-opensource-src-4.7.3.tar.gz
 /qt-everywhere-opensource-src-4.7.4.tar.gz
+/qt-everywhere-opensource-src-4.8.0-rc1.tar.gz
diff --git a/mingw32-qt-4.8.0-no-webkit-tests.patch b/mingw32-qt-4.8.0-no-webkit-tests.patch
new file mode 100644
index 0000000..3913cdc
--- /dev/null
+++ b/mingw32-qt-4.8.0-no-webkit-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/webkit/Source/WebKit.pro b/src/3rdparty/webkit/Source/WebKit.pro
+index 9be0f4a..6744f58 100644
+--- a/src/3rdparty/webkit/Source/WebKit.pro
++++ b/src/3rdparty/webkit/Source/WebKit.pro
+@@ -22,7 +22,7 @@ contains(QT_CONFIG, declarative) {
+     exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+ }
+
+-exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
++#exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+
+ build-qtscript {
+     SUBDIRS += \
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 8717585..95c7694 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -2,13 +2,13 @@
 %global __objdump %{_mingw32_objdump}
 %define __debug_install_post %{_mingw32_debug_install_post}
 
-#global pre rc1
+%global pre rc1
 
 %global platform win32-g++-cross
 
 Name:           mingw32-qt
-Version:        4.7.4
-Release:        1%{?pre}%{?dist}
+Version:        4.8.0
+Release:        0.1.%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -21,6 +21,9 @@ Source0:        http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%
 Source1:        qmake.conf
 Source2:        qplatformdefs.h
 
+# Disable WebKit tests that are failing (as of Qt 4.8.0 rc1) with
+# out of source builds.
+Patch10:        mingw32-qt-4.8.0-no-webkit-tests.patch
 # The debug build tries to link against libdbus-1d which doesn't exist
 Patch15:        qt-dbus-dont-link-to-dbus-1d.patch
 
@@ -58,8 +61,9 @@ Fedora Windows cross-compiler.
 
 
 %prep
-%setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
+%setup -q -n qt-everywhere-opensource-src-%{version}
 
+%patch10 -p1 -b .no_webkit_tests
 %patch15 -p0
 
 # Cross-compilation qmake target.
@@ -122,7 +126,7 @@ qt_configure_args="\
 rm -rf ../build_debug
 mkdir ../build_debug
 pushd ../build_debug
-../qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}/configure \
+../qt-everywhere-opensource-src-%{version}/configure \
     -debug \
     $qt_configure_args
 make %{?_smp_mflags}
@@ -131,7 +135,7 @@ popd
 rm -rf ../build_release
 mkdir ../build_release
 pushd ../build_release
-../qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}/configure \
+../qt-everywhere-opensource-src-%{version}/configure \
     -release \
     $qt_configure_args    
 make %{?_smp_mflags}
@@ -231,10 +235,6 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 %{_mingw32_libdir}/libQtXmld4.a
 %{_mingw32_libdir}/libQtXmlPatterns4.a
 %{_mingw32_libdir}/libQtXmlPatternsd4.a
-%{_mingw32_libdir}/libQAxContainer.a
-%{_mingw32_libdir}/libQAxContainerd.a
-%{_mingw32_libdir}/libQAxServer.a
-%{_mingw32_libdir}/libQAxServerd.a
 %{_mingw32_libdir}/libQtMultimedia4.a
 %{_mingw32_libdir}/libQtMultimediad4.a
 %{_mingw32_libdir}/libQtTest4.a
@@ -284,6 +284,8 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 %{_mingw32_libdir}/qt4/plugins/imageformats/qtiff4.dll
 %{_mingw32_libdir}/qt4/plugins/imageformats/qtiffd4.dll
 %dir %{_mingw32_libdir}/qt4/plugins/qmltooling
+%{_mingw32_libdir}/qt4/plugins/qmltooling/qmldbg_inspector4.dll
+%{_mingw32_libdir}/qt4/plugins/qmltooling/qmldbg_inspectord4.dll
 %{_mingw32_libdir}/qt4/plugins/qmltooling/qmldbg_tcp4.dll
 %{_mingw32_libdir}/qt4/plugins/qmltooling/qmldbg_tcpd4.dll
 %dir %{_mingw32_libdir}/qt4/plugins/script
@@ -309,13 +311,15 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 %{_mingw32_includedir}/QtWebKit/
 %{_mingw32_includedir}/QtXml/
 %{_mingw32_includedir}/QtXmlPatterns/
-%{_mingw32_includedir}/ActiveQt/
 %{_mingw32_includedir}/QtMultimedia/
 %{_mingw32_includedir}/QtTest/
 %{_mingw32_datadir}/qt4/
 
 
 %changelog
+* Sat Oct 22 2011 Kalev Lember <kalevlember at gmail.com> - 4.8.0-0.1.rc1
+- Update to 4.8.0 rc1
+
 * Sat Sep  3 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.4-1
 - Update to 4.7.4
 
diff --git a/sources b/sources
index 37bbc1f..773f0fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddf7d83f912cf1283aa066368464fa22  qt-everywhere-opensource-src-4.7.4.tar.gz
+3e003b671384df8d1cb77dd6cc804934  qt-everywhere-opensource-src-4.8.0-rc1.tar.gz