[mingw-qt: 33/65] Update to 4.7.0
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:29:31 UTC 2012
commit f6a70317637be8ab978748f6b386a62d85847498
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Sep 26 20:49:37 2010 +0200
Update to 4.7.0
- Update to 4.7.0
- Fixed a small rpmlint warning
- Added QtWebKit support
- Added SSL support
.gitignore | 1 +
mingw32-qt.spec | 44 ++++++--
qt-dont-use-ml64-to-compile-webkit.patch | 43 +++++++
qt-win-configure.patch | 186 ++++++++++++++++--------------
qt-win-configure.sh | 10 ++-
sources | 2 +-
6 files changed, 187 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f15ff8..91014ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
qt-everywhere-opensource-src-4.6.0.tar.gz
qt-everywhere-opensource-src-4.6.1.tar.gz
qt-everywhere-opensource-src-4.6.2.tar.gz
+/qt-everywhere-opensource-src-4.7.0.tar.gz
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 2b39817..d084be3 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -18,15 +18,15 @@
# from the native Fedora package. The reason is so that we can
# set the default include and library paths correctly.
-%global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools src/testlib src/multimedia
+%global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools src/testlib src/multimedia src/3rdparty/webkit/JavaScriptCore src/3rdparty/webkit/WebCore
# does not compile:
# src/plugins
%global relsubdirs src/activeqt
#global dbgsubdirs
Name: mingw32-qt
-Version: 4.6.2
-Release: 2%{?pre}%{?dist}
+Version: 4.7.0
+Release: 1%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -55,6 +55,10 @@ Patch0: qt-win-configure.patch
Patch11: mingw32-qt-4.6.0-no-fpu-functions.patch
+# The QtWebKit build refers to a MSVC specific tool called ml64 which we don't
+# have on Linux so strip out this reference
+Patch12: qt-dont-use-ml64-to-compile-webkit.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -63,6 +67,7 @@ BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
+BuildRequires: mingw32-openssl
# This is required because we want qmake
# temporarily disabled
@@ -89,7 +94,7 @@ This is the Windows version of Qt, for use in conjunction with the
Fedora Windows cross-compiler.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
@@ -98,6 +103,7 @@ Fedora Windows cross-compiler.
%patch0 -p1
%patch11 -p1
+%patch12 -p0
# Override the .qmake.cache file.
rm .qmake.cache
@@ -125,10 +131,6 @@ for d in %{?subdirs} %{?relsubdirs} %{?dbgsubdirs}; do
# so there's no point in building now
# make %{?_smp_mflags}
-# Qt 4.7.0.beta1 contains a bug where invalid slashes are used in a Makefile
-# when the .pro files contains 'TEMPLATE = subdirs'. Work around this
- sed -i s/"\\\\usr\\\\bin\\\\qmake-qt4"/"\/usr\/bin\/qmake-qt4"/ Makefile
-
popd
# As above ...
@@ -159,6 +161,13 @@ for d in %{?subdirs} %{?relsubdirs}; do
x=`(cd ../../tmp/moc/release_shared; echo $PWD)`
make -f Makefile.Release $x/mocinclude.tmp || true
fi
+
+ # When using 'make install' for the JavaScriptCore, nothing gets built as the JavaScriptCore
+ # is only a static library used internally by the build system, so perform the build manually
+ if test "$d" = "src/3rdparty/webkit/JavaScriptCore" ; then
+ make %{?_smp_mflags}
+ fi
+
make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT install
popd
done
@@ -175,6 +184,13 @@ for d in %{?subdirs} %{?dbgsubdirs}; do
x=`(cd ../../tmp/moc/debug_shared; echo $PWD)`
make -f Makefile.Debug $x/mocinclude.tmp || true
fi
+
+ # When using 'make install' for the JavaScriptCore, nothing gets built as the JavaScriptCore
+ # is only a static library used internally by the build system, so perform the build manually
+ if test "$d" = "src/3rdparty/webkit/JavaScriptCore" ; then
+ make %{?_smp_mflags} debug
+ fi
+
make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT debug-install
popd
done
@@ -206,7 +222,6 @@ ln -s libqtmain.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain4.a
ln -s libqtmaind.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind4.a
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -241,6 +256,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_bindir}/QtMultimediad4.dll
%{_mingw32_bindir}/QtTest4.dll
%{_mingw32_bindir}/QtTestd4.dll
+%{_mingw32_bindir}/QtWebKit4.dll
+%{_mingw32_bindir}/QtWebKitd4.dll
%{_mingw32_libdir}/libQt3Support4.a
%{_mingw32_libdir}/libQt3Supportd4.a
%{_mingw32_libdir}/libQtCore4.a
@@ -275,6 +292,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libQtMultimediad4.a
%{_mingw32_libdir}/libQtTest4.a
%{_mingw32_libdir}/libQtTestd4.a
+%{_mingw32_libdir}/libQtWebKit4.a
+%{_mingw32_libdir}/libQtWebKitd4.a
%{_mingw32_includedir}/Qt/
%{_mingw32_includedir}/Qt3Support/
%{_mingw32_includedir}/QtCore/
@@ -285,6 +304,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_includedir}/QtScriptTools/
%{_mingw32_includedir}/QtSql/
%{_mingw32_includedir}/QtSvg/
+%{_mingw32_includedir}/QtWebKit/
%{_mingw32_includedir}/QtXml/
%{_mingw32_includedir}/QtXmlPatterns/
%{_mingw32_includedir}/ActiveQt/
@@ -293,6 +313,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 25 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-1
+- Update to 4.7.0
+- Fixed a small rpmlint warning
+- Added QtWebKit support
+- Added SSL support
+
* Sun Jun 27 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.6.2-2
- Enable the 'windowsxp' and 'windowsvista' styles
- Fixed the %%defattr
diff --git a/qt-dont-use-ml64-to-compile-webkit.patch b/qt-dont-use-ml64-to-compile-webkit.patch
new file mode 100644
index 0000000..3879e63
--- /dev/null
+++ b/qt-dont-use-ml64-to-compile-webkit.patch
@@ -0,0 +1,43 @@
+--- src/3rdparty/webkit/WebCore/WebCore.pro.orig 2010-09-26 02:30:24.082091220 +0200
++++ src/3rdparty/webkit/WebCore/WebCore.pro 2010-09-26 02:30:47.571820871 +0200
+@@ -2947,23 +2947,23 @@
+ CONFIG += no_debug_info
+ }
+
+-win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
+- asm_compiler.commands = ml64 /c
+- asm_compiler.commands += /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+- asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+- asm_compiler.input = ASM_SOURCES
+- asm_compiler.variable_out = OBJECTS
+- asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN}
+- silent:asm_compiler.commands = @echo compiling[asm] ${QMAKE_FILE_IN} && $$asm_compiler.commands
+- QMAKE_EXTRA_COMPILERS += asm_compiler
+-
+- ASM_SOURCES += \
+- plugins/win/PaintHooks.asm
+- if(win32-msvc2005|win32-msvc2008):equals(TEMPLATE_PREFIX, "vc") {
+- SOURCES += \
+- plugins/win/PaintHooks.asm
+- }
+-}
++#win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
++# asm_compiler.commands = ml64 /c
++# asm_compiler.commands += /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
++# asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++# asm_compiler.input = ASM_SOURCES
++# asm_compiler.variable_out = OBJECTS
++# asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN}
++# silent:asm_compiler.commands = @echo compiling[asm] ${QMAKE_FILE_IN} && $$asm_compiler.commands
++# QMAKE_EXTRA_COMPILERS += asm_compiler
++#
++# ASM_SOURCES += \
++# plugins/win/PaintHooks.asm
++# if(win32-msvc2005|win32-msvc2008):equals(TEMPLATE_PREFIX, "vc") {
++# SOURCES += \
++# plugins/win/PaintHooks.asm
++# }
++#}
+ contains(DEFINES, WTF_USE_ACCELERATED_COMPOSITING) {
+ HEADERS += \
+ rendering/RenderLayerBacking.h \
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index e1142ea..ec85168 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,7 +1,7 @@
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.cache qt-everywhere-opensource-src-4.6.2/configure.cache
---- qt-everywhere-opensource-src-4.6.2.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/configure.cache 2010-06-27 14:37:50.868293498 +0200
-@@ -0,0 +1,32 @@
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/configure.cache qt-everywhere-opensource-src-4.7.0/configure.cache
+--- qt-everywhere-opensource-src-4.7.0.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/configure.cache 2010-09-26 15:49:34.368844873 +0200
+@@ -0,0 +1,33 @@
+-platform
+win32-fedora-cross
+-confirm-license
@@ -27,6 +27,7 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.cache qt-everywhere-
+/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
+-translationdir
+/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
++-openssl
+-no-mmx
+-no-sse
+-no-sse2
@@ -34,18 +35,24 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.cache qt-everywhere-
+-qt-style-windowsxp
+-qt-style-windowsvista
+-shared
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere-opensource-src-4.6.2/configure.output
---- qt-everywhere-opensource-src-4.6.2.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/configure.output 2010-06-27 14:37:51.019303842 +0200
-@@ -0,0 +1,146 @@
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/configure.output qt-everywhere-opensource-src-4.7.0/configure.output
+--- qt-everywhere-opensource-src-4.7.0.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/configure.output 2010-09-26 15:49:34.398840972 +0200
+@@ -0,0 +1,153 @@
++fixme:advapi:RegisterEventSourceA ((null),"amBX Service"): stub
++fixme:advapi:RegisterEventSourceW (L"",L"amBX Service"): stub
++fixme:advapi:ReportEventA (0xcafe4242,0x0004,0x0000,0x40020021,(nil),0x0002,0x00000000,0x72e574,(nil)): stub
++fixme:advapi:ReportEventW (0xcafe4242,0x0004,0x0000,0x40020021,(nil),0x0002,0x00000000,0x125860,(nil)): stub
++fixme:advapi:DeregisterEventSource (0xcafe4242) stub
+wine: cannot find L"C:\\windows\\system32\\bcc32.exe"
-+wine: cannot find L"C:\\windows\\system32\\mingw32-gcc.exe"
++wine: cannot find L"C:\\windows\\system32\\g++.exe"
+wine: cannot find L"C:\\windows\\system32\\icl.exe"
+wine: cannot find L"C:\\windows\\system32\\cl.exe"
+wine: cannot find L"C:\\windows\\system32\\cl.exe"
+wine: cannot find L"C:\\windows\\system32\\cl.exe"
+wine: cannot find L"C:\\windows\\system32\\cl.exe"
+wine: cannot find L"C:\\windows\\system32\\cl.exe"
++wine: cannot find L"C:\\windows\\system32\\cl.exe"
+Which edition of Qt do you want to use ?
+Type 'c' if you want to use the Commercial Edition.
+Type 'o' if you want to use the Open Source Edition.
@@ -69,14 +76,13 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+ LIB=
+ Unset
+ PATH=
-+ C:\Program Files\PC Connectivity Solution\
+ C:\windows\system32
+ C:\windows
+ C:\windows\system32\wbem
+You are licensed to use this software under the terms of the GNU GPL version 3.You are licensed to use this software under the terms of the Lesser GNU LGPL version 2.1.
-+See Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.23
++See Z:/home/erik/fedora/mingw32-qt/qt-everywhere-opensource-src-4.7.03
+
-+ or Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2L
++ or Z:/home/erik/fedora/mingw32-qt/qt-everywhere-opensource-src-4.7.0L
+
+Configuration:
+ minimal-config
@@ -93,12 +99,14 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+ qt3support
+ opengl
+ s60
++ openssl
+ ipv6
+ script
+ scripttools
+ xmlpatterns
+ multimedia
+ audio-backend
++ declarative
+ native-gestures
+ svg
+ minimal-config
@@ -123,13 +131,13 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+IWMMXT support..............no
+OpenGL support..............yes
+OpenVG support..............no
-+OpenSSL support.............no
++OpenSSL support.............yes
+QtDBus support..............no
+QtXmlPatterns support.......yes
+Phonon support..............no
+QtMultimedia support........yes
+WebKit support..............no
-+Declarative support.........no
++Declarative support.........yes
+QtScript support............yes
+QtScriptTools support.......yes
+Graphics System.............raster
@@ -140,7 +148,7 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+ GIF support.............plugin
+ TIFF support............plugin
+ JPEG support............plugin
-+ PNG support.............qt
++ PNG support.............yes
+ MNG support.............plugin
+ FreeType support........no
+
@@ -167,12 +175,13 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+Build is done in............Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++Sources are in..............Z:\home\erik\fedora\mingw32-qt\qt-everywhere-opensource-src-4.7.0
++Build is done in............Z:\home\erik\fedora\mingw32-qt\qt-everywhere-opensource-src-4.7.0
+Install prefix............../usr/i686-pc-mingw32/sys-root/mingw
+Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include
+Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib
+Plugins installed to......../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins
++Imports installed to........\usr\i686-pc-mingw32\sys-root\mingw\imports
+Binaries installed to......./usr/i686-pc-mingw32/sys-root/mingw/bin
+Docs installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share/doc
+Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
@@ -180,23 +189,12 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/configure.output qt-everywhere
+Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
+Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
+
-+Symbian DEF files enabled...yes
+Processing of project files have been disabled.
+Only use this option if you really know what you're doing.
+
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.2/include/Qt/qconfig.h
---- qt-everywhere-opensource-src-4.6.2.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/include/Qt/qconfig.h 2010-06-27 14:37:51.001294881 +0200
-@@ -0,0 +1 @@
-+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.2/include/QtCore/qconfig.h
---- qt-everywhere-opensource-src-4.6.2.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/include/QtCore/qconfig.h 2010-06-27 14:37:50.998068342 +0200
-@@ -0,0 +1 @@
-+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.2/mkspecs/default/qmake.conf
---- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qmake.conf 2010-06-27 14:37:51.011294838 +0200
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.7.0/mkspecs/default/qmake.conf
+--- qt-everywhere-opensource-src-4.7.0.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/mkspecs/default/qmake.conf 2010-09-26 15:49:34.378843572 +0200
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -310,10 +308,10 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qmake.conf qt-
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=Z:/home/erik/mingw/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2/mkspecs/win32-fedora-cross
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.2/mkspecs/default/qplatformdefs.h
---- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/default/qplatformdefs.h 2010-06-27 14:37:37.864050000 +0200
++QMAKESPEC_ORIGINAL=Z:/home/erik/fedora/mingw32-qt/qt-everywhere-opensource-src-4.7.0/mkspecs/win32-fedora-cross
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.7.0/mkspecs/default/qplatformdefs.h
+--- qt-everywhere-opensource-src-4.7.0.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/mkspecs/default/qplatformdefs.h 2010-09-26 15:49:33.001022000 +0200
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -475,56 +473,56 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/default/qplatformdefs.
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.2/mkspecs/qconfig.pri
---- qt-everywhere-opensource-src-4.6.2.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/mkspecs/qconfig.pri 2010-06-27 14:37:50.872293775 +0200
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.7.0/mkspecs/qconfig.pri
+--- qt-everywhere-opensource-src-4.7.0.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/mkspecs/qconfig.pri 2010-09-26 15:49:34.372844353 +0200
@@ -0,0 +1,12 @@
-+CONFIG+= release shared stl exceptions rtti def_files
++CONFIG+= release shared stl exceptions rtti
+QT_ARCH = windows
+QT_EDITION = OpenSource
-+QT_CONFIG += release zlib png accessibility qt3support opengl s60 ipv6 script scripttools xmlpatterns multimedia audio-backend native-gestures svg minimal-config small-config medium-config large-config full-config
++QT_CONFIG += release zlib png accessibility qt3support opengl s60 openssl ipv6 script scripttools xmlpatterns multimedia audio-backend declarative native-gestures svg minimal-config small-config medium-config large-config full-config
+#versioning
-+QT_VERSION = 4.6.2
++QT_VERSION = 4.7.0
+QT_MAJOR_VERSION = 4
-+QT_MINOR_VERSION = 6
-+QT_PATCH_VERSION = 2
++QT_MINOR_VERSION = 7
++QT_PATCH_VERSION = 0
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
+#Qt for Symbian FPU settings
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache qt-everywhere-opensource-src-4.6.2/.qmake.cache
---- qt-everywhere-opensource-src-4.6.2.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/.qmake.cache 2010-06-27 14:37:50.871309192 +0200
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/.qmake.cache qt-everywhere-opensource-src-4.7.0/.qmake.cache
+--- qt-everywhere-opensource-src-4.7.0.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/.qmake.cache 2010-09-26 15:49:34.372844353 +0200
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
-+OBJECTS_DIR = tmp\obj\release_shared
-+MOC_DIR = tmp\moc\release_shared
-+RCC_DIR = tmp\rcc\release_shared
++OBJECTS_DIR = tmp\\obj\\release_shared
++MOC_DIR = tmp\\moc\\release_shared
++RCC_DIR = tmp\\rcc\\release_shared
+sql-plugins += sqlite
+styles += windows plastique cleanlooks windowsxp windowsvista motif cde
+imageformat-plugins += gif tiff jpeg
+CONFIG += minimal-config small-config medium-config large-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
+QT_BUILD_PARTS = libs tools examples demos docs translations
-+QMAKESPEC = Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2\mkspecs\win32-fedora-cross
++QMAKESPEC = Z:\\home\\erik\\fedora\\mingw32-qt\\qt-everywhere-opensource-src-4.7.0\\mkspecs\\win32-fedora-cross
+ARCH = windows
-+QT_BUILD_TREE = Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+QT_SOURCE_TREE = Z:\home\erik\mingw\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
-+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
-+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
-+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
-+QMAKE_RCC = $$QT_BUILD_TREE\bin\rcc.exe
-+QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe
-+QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include
-+QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.cpp
---- qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.cpp 2010-06-27 14:37:51.014303000 +0200
-@@ -0,0 +1,31 @@
++QT_BUILD_TREE = Z:\\home\\erik\\fedora\\mingw32-qt\\qt-everywhere-opensource-src-4.7.0
++QT_SOURCE_TREE = Z:\\home\\erik\\fedora\\mingw32-qt\\qt-everywhere-opensource-src-4.7.0
++QMAKE_MOC = $$QT_BUILD_TREE\\bin\\moc.exe
++QMAKE_UIC = $$QT_BUILD_TREE\\bin\\uic.exe
++QMAKE_UIC3 = $$QT_BUILD_TREE\\bin\\uic3.exe
++QMAKE_RCC = $$QT_BUILD_TREE\\bin\\rcc.exe
++QMAKE_DUMPCPP = $$QT_BUILD_TREE\\bin\\dumpcpp.exe
++QMAKE_INCDIR_QT = $$QT_BUILD_TREE\\include
++QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\\lib
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.7.0/src/corelib/global/qconfig.cpp
+--- qt-everywhere-opensource-src-4.7.0.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/src/corelib/global/qconfig.cpp 2010-09-26 15:49:34.393841000 +0200
+@@ -0,0 +1,33 @@
+/* Licensed */
+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
+static const char qt_configure_licensed_products_str [512 + 12] = "qt_lcnsprod=OpenSource";
+
+/* Build date */
-+static const char qt_configure_installation [11 + 12] = "qt_instdate=2010-06-27";
++static const char qt_configure_installation [11 + 12] = "qt_instdate=2010-09-26";
+
+static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=/usr/i686-pc-mingw32/sys-root/mingw";
+static const char qt_configure_documentation_path_str[512 + 12] = "qt_docspath=/usr/i686-pc-mingw32/sys-root/mingw/share/doc";
@@ -532,11 +530,12 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp
+static const char qt_configure_libraries_path_str [512 + 12] = "qt_libspath=/usr/i686-pc-mingw32/sys-root/mingw/lib";
+static const char qt_configure_binaries_path_str [512 + 12] = "qt_binspath=/usr/i686-pc-mingw32/sys-root/mingw/bin";
+static const char qt_configure_plugins_path_str [512 + 12] = "qt_plugpath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins";
++static const char qt_configure_imports_path_str [512 + 12] = "qt_impspath=\\usr\\i686-pc-mingw32\\sys-root\\mingw\\imports";
+static const char qt_configure_data_path_str [512 + 12] = "qt_datapath=/usr/i686-pc-mingw32/sys-root/mingw/share";
+static const char qt_configure_translations_path_str [512 + 12] = "qt_trnspath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations";
+static const char qt_configure_examples_path_str [512 + 12] = "qt_xmplpath=/usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples";
+static const char qt_configure_demos_path_str [512 + 12] = "qt_demopath=/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos";
-+/* strlen( "qt_lcnsxxxx" ) == 12 */
++/* strlen( "qt_lcnsxxxx") == 12 */
+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12;
+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12;
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12;
@@ -545,15 +544,16 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.cpp
+#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
+#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
+#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
++#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
+#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;
+#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
+#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
+#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
+
-diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.h
---- qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/src/corelib/global/qconfig.h 2010-06-27 14:37:50.990297000 +0200
-@@ -0,0 +1,108 @@
+diff -urN qt-everywhere-opensource-src-4.7.0.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.7.0/src/corelib/global/qconfig.h
+--- qt-everywhere-opensource-src-4.7.0.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.7.0/src/corelib/global/qconfig.h 2010-09-26 15:49:34.373844000 +0200
+@@ -0,0 +1,118 @@
+/* Everything */
+
+#ifndef QT_DLL
@@ -569,17 +569,21 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h q
+# define QT_EDITION QT_EDITION_OPENSOURCE
+#endif
+
-+#if (defined(_DEBUG) || defined(DEBUG))
-+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+# define QT_BUILD_KEY "Windows x64 msvc debug full-config"
-+# else
-+# define QT_BUILD_KEY "Windows msvc debug full-config"
-+# endif
++#if defined(__SYMBIAN32__)
++# define QT_BUILD_KEY "Symbian full-config"
+#else
-+# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
-+# define QT_BUILD_KEY "Windows x64 msvc release full-config"
++# if (!QT_NO_DEBUG)
++# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
++# define QT_BUILD_KEY "Windows x64 msvc debug full-config"
++# else
++# define QT_BUILD_KEY "Windows msvc debug full-config"
++# endif
+# else
-+# define QT_BUILD_KEY "Windows msvc release full-config"
++# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))
++# define QT_BUILD_KEY "Windows x64 msvc release full-config"
++# else
++# define QT_BUILD_KEY "Windows msvc release full-config"
++# endif
+# endif
+#endif
+
@@ -602,22 +606,28 @@ diff -urN qt-everywhere-opensource-src-4.6.2.orig/src/corelib/global/qconfig.h q
+# define QT_NO_DBUS
+#endif
+
-+#if defined(QT_NO_DECLARATIVE) && defined(QT_DECLARATIVE)
-+# undef QT_NO_DECLARATIVE
-+#elif !defined(QT_NO_DECLARATIVE)
-+# define QT_NO_DECLARATIVE
-+#endif
-+
+#if defined(QT_NO_FREETYPE) && defined(QT_FREETYPE)
+# undef QT_NO_FREETYPE
+#elif !defined(QT_NO_FREETYPE)
+# define QT_NO_FREETYPE
+#endif
+
-+#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL)
-+# undef QT_NO_OPENSSL
-+#elif !defined(QT_NO_OPENSSL)
-+# define QT_NO_OPENSSL
++#if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
++# undef QT_NO_IMAGEFORMAT_JPEG
++#elif !defined(QT_NO_IMAGEFORMAT_JPEG)
++# define QT_NO_IMAGEFORMAT_JPEG
++#endif
++
++#if defined(QT_NO_IMAGEFORMAT_MNG) && defined(QT_IMAGEFORMAT_MNG)
++# undef QT_NO_IMAGEFORMAT_MNG
++#elif !defined(QT_NO_IMAGEFORMAT_MNG)
++# define QT_NO_IMAGEFORMAT_MNG
++#endif
++
++#if defined(QT_NO_IMAGEFORMAT_TIFF) && defined(QT_IMAGEFORMAT_TIFF)
++# undef QT_NO_IMAGEFORMAT_TIFF
++#elif !defined(QT_NO_IMAGEFORMAT_TIFF)
++# define QT_NO_IMAGEFORMAT_TIFF
+#endif
+
+#if defined(QT_NO_OPENVG) && defined(QT_OPENVG)
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index 7c0f9ce..b11554f 100755
--- a/qt-win-configure.sh
+++ b/qt-win-configure.sh
@@ -15,7 +15,7 @@
# error: #error "MMX instruction set not enabled"
# . Same as above for -no-sse and -no-sse2
-version=4.6.2
+version=4.7.0
platform=win32-fedora-cross
set -e
@@ -41,6 +41,7 @@ cp qmake.conf qplatformdefs.h ${srcdir}/mkspecs/${platform}
cd ${srcdir}
+echo "Running configure.exe..."
echo "o" | wine configure.exe \
-platform $platform \
-confirm-license \
@@ -56,15 +57,22 @@ echo "o" | wine configure.exe \
-libdir $(rpm --eval %{_mingw32_libdir}) \
-plugindir $(rpm --eval %{_mingw32_libdir})/qt4/plugins \
-translationdir $(rpm --eval %{_mingw32_datadir})/qt4/translations \
+ -openssl \
-no-mmx -no-sse -no-sse2 \
-release \
-qt-style-windowsxp -qt-style-windowsvista \
-shared > configure.output 2>&1
+echo "Configure command completed with this output:"
+echo
+cat configure.output
+
cd ..
rm -r ${srcdir}/mkspecs/${platform}
+echo
+echo "Now generating diff..."
diff -urN ${srcdir}.orig ${srcdir} > qt-win-configure.patch ||:
rm -r ${srcdir}.orig ${srcdir}
diff --git a/sources b/sources
index 5e18bc9..e1e0f8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb651ee4b157c01696aa56777fc6e0e5 qt-everywhere-opensource-src-4.6.2.tar.gz
+3a2f25b9b115037277f4fb759194a7a5 qt-everywhere-opensource-src-4.7.0.tar.gz
More information about the scm-commits
mailing list