[mingw-qt: 19/65] initial update to 4.6.0beta1
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:28:21 UTC 2012
commit ece825f9e75378299f9abe7e1e0cf003709f02e0
Author: sailer <sailer at fedoraproject.org>
Date: Mon Nov 16 17:06:56 2009 +0000
initial update to 4.6.0beta1
.cvsignore | 1 +
...atch => mingw32-qt-4.6.0-no-fpu-functions.patch | 72 +++++-----
mingw32-qt.spec | 19 ++--
qt-win-configure.patch | 145 +++++++++++---------
qt-win-configure.sh | 8 +-
sources | 2 +-
6 files changed, 135 insertions(+), 112 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 36587db..c6c223f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
qt-win-opensource-src-4.5.1.zip
qt-win-opensource-src-4.5.2.zip
qt-win-opensource-src-4.5.3.zip
+qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
diff --git a/mingw32-qt-4.4.3-no-fpu-functions.patch b/mingw32-qt-4.6.0-no-fpu-functions.patch
similarity index 53%
rename from mingw32-qt-4.4.3-no-fpu-functions.patch
rename to mingw32-qt-4.6.0-no-fpu-functions.patch
index 368f6e7..6087bde 100644
--- a/mingw32-qt-4.4.3-no-fpu-functions.patch
+++ b/mingw32-qt-4.6.0-no-fpu-functions.patch
@@ -1,34 +1,38 @@
-diff -ur qt-win-opensource-src-4.4.3.orig/src/corelib/tools/qlocale.cpp qt-win-opensource-src-4.4.3/src/corelib/tools/qlocale.cpp
---- qt-win-opensource-src-4.4.3.orig/src/corelib/tools/qlocale.cpp 2008-09-27 10:00:55.000000000 +0100
-+++ qt-win-opensource-src-4.4.3/src/corelib/tools/qlocale.cpp 2009-02-02 11:39:40.000000000 +0000
-@@ -6238,6 +6238,10 @@
-
- Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
- {
-+ // RWMJ: The 8087-twiddling functions just don't seem to exist
-+ // in MinGW cross-compiler, so comment out that code and hope for
-+ // the best ...
-+#if 0
- // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
- // We set a safe value here.
- #ifdef Q_OS_WIN
-@@ -6257,9 +6261,11 @@
- fenv_t envp;
- feholdexcept(&envp);
- #endif
-+#endif
-
- char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
-
-+#if 0 // RWMJ - see above.
- #ifdef Q_OS_WIN
- _clear87();
- #ifndef _M_X64
-@@ -6272,6 +6278,7 @@
- #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
- fesetenv(&envp);
- #endif
-+#endif
-
- return s;
- }
+diff -ur qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.6.0/src/corelib/tools/qlocale.cpp
+--- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp 2008-09-27 10:00:55.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/src/corelib/tools/qlocale.cpp 2009-02-02 11:39:40.000000000 +0000
+@@ -6522,6 +6522,10 @@
+
+ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
+ {
++ // RWMJ: The 8087-twiddling functions just don't seem to exist
++ // in MinGW cross-compiler, so comment out that code and hope for
++ // the best ...
++#if 0
+ // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
+ // We set a safe value here.
+ #ifdef Q_OS_WIN
+@@ -6536,6 +6540,7 @@
+ #endif
+ _control87(MCW_EM, MCW_EM);
+ #endif
++#endif
+
+ #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+ fenv_t envp;
+@@ -6544,6 +6549,7 @@
+
+ char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
+
++#if 0 // RWMJ - see above.
+ #ifdef Q_OS_WIN
+ _clear87();
+ #ifndef _M_X64
+@@ -6552,6 +6558,7 @@
+ _control87(oldbits, _MCW_EM|_MCW_DN|_MCW_RC);
+ #endif //_M_X64
+ #endif //Q_OS_WIN
++#endif
+
+ #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+ fesetenv(&envp);
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 89c7fca..b6df9a0 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -5,6 +5,8 @@
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
+%global pre beta1
+
# NOTES, please read these carefully first:
#
# . We only build a few libraries at the moment, those listed in
@@ -17,15 +19,15 @@
%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
Name: mingw32-qt
-Version: 4.5.3
-Release: 3%{?dist}
+Version: 4.6.0
+Release: 0.1.%{pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
Group: Development/Libraries
URL: http://www.qtsoftware.com/
-Source0: ftp://ftp.trolltech.no/qt/source/qt-win-opensource-src-%{version}.zip
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
# To make the configure patch - see below.
Source1: qt-win-configure.sh
@@ -45,7 +47,7 @@ Source4: qplatformdefs.h
# Generate this patch using "qt-win-configure.sh".
Patch0: qt-win-configure.patch
-Patch11: mingw32-qt-4.4.3-no-fpu-functions.patch
+Patch11: mingw32-qt-4.6.0-no-fpu-functions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,16 +87,12 @@ Fedora Windows cross-compiler.
%prep
-%setup -q -n qt-win-opensource-src-%{version}
+%setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
%patch0 -p1
%patch11 -p1
-for f in LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README; do
- dos2unix --keepdate $f
-done
-
# Override the .qmake.cache file.
rm .qmake.cache
sed -e s, at builddir@,$(pwd),g < %{SOURCE2} > .qmake.cache
@@ -251,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Nov 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.beta1
+- update to 4.6.0-beta1
+
* Tue Nov 3 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-3
- add links with version suffix for libqtmain{,d}.a
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index 36e8e96..19c4734 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-diff -urN qt-win-opensource-src-4.5.3.orig/configure.cache qt-win-opensource-src-4.5.3/configure.cache
---- qt-win-opensource-src-4.5.3.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/configure.cache 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache qt-everywhere-opensource-src-4.6.0-beta1/configure.cache
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/configure.cache 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1,30 @@
+-platform
+fedora-win32-cross
@@ -32,10 +32,10 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.cache qt-win-opensource-src
+-no-sse2
+-release
+-shared
-diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-src-4.5.3/configure.output
---- qt-win-opensource-src-4.5.3.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/configure.output 2009-11-01 23:03:12.000000000 +0100
-@@ -0,0 +1,149 @@
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-everywhere-opensource-src-4.6.0-beta1/configure.output
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/configure.output 2009-11-16 17:02:27.000000000 +0100
+@@ -0,0 +1,155 @@
+err:wineboot:ProcessRunKeys Error running cmd L"C:\\WINDOWS\\SYSTEM\\mstask.exe" (2)
+err:wineboot:ProcessRunKeys Error running cmd L"ati2evxx.exe" (2)
+err:service:load_reg_dword Error 1804 while reading value L"Type"
@@ -51,8 +51,8 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+err:service:load_reg_dword Error 1804 while reading value L"Type"
+err:service:scmdatabase_load_services Error 1804 reading registry key for service L"WDMFS" - skipping
+err:winedevice:ServiceMain driver L"VIAPFD" failed to load
-+Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyerr:menubuilder:init_xdg error looking up the desktop directory
-+Invalid MIT-MAGIC-COOKIE-1 keyWhich edition of Qt do you want to use ?
++err:menubuilder:init_xdg error looking up the desktop directory
++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.
+
@@ -60,14 +60,15 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+
+You have already accepted the terms of the license.
+
-+Setting Direct3D to NO, since the proper Direct3D SDK was not detected.
-+Make sure you have the Direct3D SDK installed, and that you have run
-+the <path to SDK>\Utilities\Bin\dx_setenv.cmd script.
-+The D3D SDK library path *needs* to appear before the Platform SDK library
-+path in your LIB environment variable.
+All the required DirectShow/Direct3D files couldn't be found.
-+Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed.
-+If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\SetEnv.Cmd script.
++Make sure you have either the platform SDK AND the DirectShow SDK or the Windows SDK installed.
++If you have the DirectShow SDK installed, please make sure that you have run the <path to SDK>\SetEnv.Cmd script.
++vmr9.h not found
++dshow.h not found
++strmiids.lib not found
++dmoguids.lib not found
++msdmo.lib not found
++d3d9.h not found
+Environment:
+ INCLUDE=
+ Unset
@@ -84,16 +85,15 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+ s:\fujitsu16\bin
+ s:\fujitsu16\flash510
+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 J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.33
++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-beta13
+
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3L
++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-beta1L
+
+Configuration:
-+ dist-config
-+ large-config
-+ medium-config
+ minimal-config
+ small-config
++ medium-config
++ large-config
+ full-config
+ release
+Qt Configuration:
@@ -103,9 +103,12 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+ accessibility
+ qt3support
+ opengl
++ s60
+ ipv6
++ script
+ scripttools
+ xmlpatterns
++ multimedia
+ svg
+ minimal-config
+ small-config
@@ -128,12 +131,14 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+SSE2 support................no
+IWMMXT support..............no
+OpenGL support..............yes
-+Direct3D support............no
++OpenVG support..............no
+OpenSSL support.............no
+QtDBus support..............no
+QtXmlPatterns support.......yes
+Phonon support..............no
++QtMultimedia support........yes
+WebKit support..............no
++QtScript support............yes
+QtScriptTools support.......yes
+Graphics System.............raster
+Qt3 compatibility...........yes
@@ -145,6 +150,7 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+ JPEG support............plugin
+ PNG support.............qt
+ MNG support.............plugin
++ FreeType support........no
+
+Styles:
+ Windows.................yes
@@ -156,6 +162,7 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+ CDE.....................yes
+ Windows CE..............no
+ Windows Mobile..........no
++ S60.....................no
+
+Sql Drivers:
+ ODBC....................no
@@ -168,8 +175,8 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3
-+Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3
++Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
++Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
+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
@@ -184,21 +191,19 @@ diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-sr
+Processing of project files have been disabled.
+Only use this option if you really know what you're doing.
+
-+Invalid MIT-MAGIC-COOKIE-1 key
-\ No newline at end of file
-diff -urN qt-win-opensource-src-4.5.3.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.3/include/Qt/qconfig.h
---- qt-win-opensource-src-4.5.3.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/include/Qt/qconfig.h 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/include/Qt/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/include/Qt/qconfig.h 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.3.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.3/include/QtCore/qconfig.h
---- qt-win-opensource-src-4.5.3.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/include/QtCore/qconfig.h 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/include/QtCore/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/include/QtCore/qconfig.h 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.3/mkspecs/default/qmake.conf
---- qt-win-opensource-src-4.5.3.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/mkspecs/default/qmake.conf 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qmake.conf
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qmake.conf 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -312,10 +317,10 @@ diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qmake.conf qt-win-ope
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3/mkspecs/fedora-win32-cross
-diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.3/mkspecs/default/qplatformdefs.h
---- qt-win-opensource-src-4.5.3.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/mkspecs/default/qplatformdefs.h 2009-11-01 23:03:02.000000000 +0100
++QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/fedora-win32-cross
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qplatformdefs.h
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qplatformdefs.h 2009-11-16 17:02:21.000000000 +0100
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -477,24 +482,24 @@ diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qplatformdefs.h qt-wi
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.3/mkspecs/qconfig.pri
---- qt-win-opensource-src-4.5.3.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/mkspecs/qconfig.pri 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/qconfig.pri
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/qconfig.pri 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1,11 @@
+CONFIG+= release shared stl exceptions rtti
+QT_ARCH = windows
+QT_EDITION = OpenSource
-+QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config
++QT_CONFIG += release zlib png accessibility qt3support opengl s60 ipv6 script scripttools xmlpatterns multimedia svg minimal-config small-config medium-config large-config full-config
+#versioning
-+QT_VERSION = 4.5.3
++QT_VERSION = 4.6.0
+QT_MAJOR_VERSION = 4
-+QT_MINOR_VERSION = 5
-+QT_PATCH_VERSION = 3
++QT_MINOR_VERSION = 6
++QT_PATCH_VERSION = 0
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-diff -urN qt-win-opensource-src-4.5.3.orig/.qmake.cache qt-win-opensource-src-4.5.3/.qmake.cache
---- qt-win-opensource-src-4.5.3.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/.qmake.cache 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0-beta1/.qmake.cache
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/.qmake.cache 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
+OBJECTS_DIR = tmp\obj\release_shared
@@ -503,12 +508,12 @@ diff -urN qt-win-opensource-src-4.5.3.orig/.qmake.cache qt-win-opensource-src-4.
+sql-plugins += sqlite
+styles += windows plastique cleanlooks motif cde
+imageformat-plugins += gif tiff jpeg
-+CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
++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 = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3\mkspecs\fedora-win32-cross
++QMAKESPEC = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1\mkspecs\fedora-win32-cross
+ARCH = windows
-+QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3
-+QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3
++QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
++QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
@@ -516,9 +521,9 @@ diff -urN qt-win-opensource-src-4.5.3.orig/.qmake.cache qt-win-opensource-src-4.
+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-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.cpp
---- qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.cpp 2009-11-01 23:03:12.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.cpp
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.cpp 2009-11-16 17:02:27.000000000 +0100
@@ -0,0 +1,27 @@
+/* Licensed */
+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
@@ -547,10 +552,10 @@ diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.cpp qt-win
+#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-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.h
---- qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.h 2009-11-01 23:03:12.000000000 +0100
-@@ -0,0 +1,102 @@
+diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.h 2009-11-16 17:02:27.000000000 +0100
+@@ -0,0 +1,114 @@
+/* Everything */
+
+#ifndef QT_DLL
@@ -599,10 +604,10 @@ diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h qt-win-o
+# define QT_NO_DBUS
+#endif
+
-+#if defined(QT_NO_DIRECT3D) && defined(QT_DIRECT3D)
-+# undef QT_NO_DIRECT3D
-+#elif !defined(QT_NO_DIRECT3D)
-+# define QT_NO_DIRECT3D
++#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)
@@ -611,6 +616,12 @@ diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h qt-win-o
+# define QT_NO_OPENSSL
+#endif
+
++#if defined(QT_NO_OPENVG) && defined(QT_OPENVG)
++# undef QT_NO_OPENVG
++#elif !defined(QT_NO_OPENVG)
++# define QT_NO_OPENVG
++#endif
++
+#if defined(QT_NO_PHONON) && defined(QT_PHONON)
+# undef QT_NO_PHONON
+#elif !defined(QT_NO_PHONON)
@@ -623,6 +634,12 @@ diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h qt-win-o
+# define QT_NO_STYLE_GTK
+#endif
+
++#if defined(QT_NO_STYLE_S60) && defined(QT_STYLE_S60)
++# undef QT_NO_STYLE_S60
++#elif !defined(QT_NO_STYLE_S60)
++# define QT_NO_STYLE_S60
++#endif
++
+#if defined(QT_NO_STYLE_WINDOWSCE) && defined(QT_STYLE_WINDOWSCE)
+# undef QT_NO_STYLE_WINDOWSCE
+#elif !defined(QT_NO_STYLE_WINDOWSCE)
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index ae7d66c..d9bbbc6 100755
--- a/qt-win-configure.sh
+++ b/qt-win-configure.sh
@@ -15,12 +15,12 @@
# error: #error "MMX instruction set not enabled"
# . Same as above for -no-sse and -no-sse2
-version=4.5.3
+version=4.6.0-beta1
platform=fedora-win32-cross
set -e
-if [ ! -f qt-win-opensource-src-$version.zip -o \
+if [ ! -f qt-everywhere-opensource-src-$version.tar.gz -o \
! -f qmake.conf -o \
! -f qplatformdefs.h ]; then
echo "You're trying to run this from the wrong directory."
@@ -30,11 +30,11 @@ fi
echo "Unpacking source file ... (this can take a minute or two)"
-srcdir=qt-win-opensource-src-$version
+srcdir=qt-everywhere-opensource-src-$version
rm -rf $srcdir.orig $srcdir
-unzip -qq qt-win-opensource-src-$version.zip
+tar xzf qt-everywhere-opensource-src-$version.tar.gz
cp -a $srcdir $srcdir.orig
mkdir $srcdir/mkspecs/fedora-win32-cross
cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross
diff --git a/sources b/sources
index 05a8c49..5739bd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81ca235e0da2728f948ca36236f9ee45 qt-win-opensource-src-4.5.3.zip
+60d136f17491ce0e56bb317ea7300aef qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
More information about the scm-commits
mailing list