rpms/mingw32-qt/F-11 mingw32-qt-4.6.0-no-fpu-functions.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 mingw32-qt.spec, 1.8, 1.9 qmake.cache.in, 1.1, 1.2 qplatformdefs.h, 1.1, 1.2 qt-win-configure.patch, 1.3, 1.4 qt-win-configure.sh, 1.3, 1.4 sources, 1.5, 1.6 mingw32-qt-4.4.3-no-fpu-functions.patch, 1.1, NONE
sailer
sailer at fedoraproject.org
Fri Feb 26 10:10:14 UTC 2010
Author: sailer
Update of /cvs/extras/rpms/mingw32-qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12978
Modified Files:
.cvsignore mingw32-qt.spec qmake.cache.in qplatformdefs.h
qt-win-configure.patch qt-win-configure.sh sources
Added Files:
mingw32-qt-4.6.0-no-fpu-functions.patch
Removed Files:
mingw32-qt-4.4.3-no-fpu-functions.patch
Log Message:
update to 4.6.2
mingw32-qt-4.6.0-no-fpu-functions.patch:
qlocale.cpp | 7 +++++++
1 file changed, 7 insertions(+)
--- NEW FILE mingw32-qt-4.6.0-no-fpu-functions.patch ---
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);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 11 Nov 2009 17:25:46 -0000 1.5
+++ .cvsignore 26 Feb 2010 10:10:13 -0000 1.6
@@ -1,3 +1,8 @@
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
+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
Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/mingw32-qt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-qt.spec 11 Nov 2009 22:02:53 -0000 1.8
+++ mingw32-qt.spec 26 Feb 2010 10:10:13 -0000 1.9
@@ -3,7 +3,11 @@
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
-#define __debug_install_post %{_mingw32_debug_install_post}
+%define __debug_install_post %{_mingw32_debug_install_post}
+
+#global pre rc1
+
+%global platform win32-fedora-cross
# NOTES, please read these carefully first:
#
@@ -14,18 +18,22 @@
# 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
+%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
+# does not compile:
+# src/plugins
+%global relsubdirs src/activeqt
+#global dbgsubdirs
Name: mingw32-qt
-Version: 4.5.3
-Release: 1%{?dist}
+Version: 4.6.2
+Release: 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,19 +53,21 @@ 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)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 50
+BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
# This is required because we want qmake
-BuildRequires: qt-devel = 1:%{version}
+# temporarily disabled
+#BuildRequires: qt-devel = %{version}
+BuildRequires: qt-devel
BuildRequires: zip
BuildRequires: dos2unix
@@ -79,31 +89,27 @@ This is the Windows version of Qt, for u
Fedora Windows cross-compiler.
-#{_mingw32_debug_package}
+%{_mingw32_debug_package}
%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
# Cross-compilation qmake target.
-mkdir mkspecs/fedora-win32-cross
-cp %{SOURCE3} %{SOURCE4} mkspecs/fedora-win32-cross
+mkdir mkspecs/%{platform}
+cp %{SOURCE3} %{SOURCE4} mkspecs/%{platform}
%build
-for d in %{subdirs}; do
+for d in %{?subdirs} %{?relsubdirs} %{?dbgsubdirs}; do
# Precompiled headers from a previous iteration of this loop
# cause the compiler deep confusion, so make sure any are removed
# _and_ the PCH directories are fresh and empty.
@@ -136,7 +142,7 @@ done
%install
rm -rf $RPM_BUILD_ROOT
-for d in %{subdirs}; do
+for d in %{?subdirs} %{?relsubdirs}; do
# As above ... WTF is Qt doing confusing make and make install??
rm -rf tmp/obj/release_shared/qt_pch.h.gch
mkdir -p tmp/obj/release_shared/qt_pch.h.gch
@@ -144,9 +150,15 @@ for d in %{subdirs}; do
mkdir -p tmp/obj/release_shared/qt_gui_pch.h.gch
pushd $d
+ if [ -d ../../tmp/moc/release_shared ]; then
+ x=`(cd ../../tmp/moc/release_shared; echo $PWD)`
+ make -f Makefile.Release $x/mocinclude.tmp || true
+ fi
make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT install
popd
+done
+for d in %{?subdirs} %{?dbgsubdirs}; do
# As above ...
rm -rf tmp/obj/debug_shared/qt_pch.h.gch
mkdir -p tmp/obj/debug_shared/qt_pch.h.gch
@@ -154,10 +166,22 @@ for d in %{subdirs}; do
mkdir -p tmp/obj/debug_shared/qt_gui_pch.h.gch
pushd $d
+ if [ -d ../../tmp/moc/debug_shared ]; then
+ x=`(cd ../../tmp/moc/debug_shared; echo $PWD)`
+ make -f Makefile.Debug $x/mocinclude.tmp || true
+ fi
make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT debug-install
popd
done
+# Special treatment for activeqt debug
+pushd src/activeqt
+make debug
+popd
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
+install lib/libQAxContainerd.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+install lib/libQAxServerd.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+
# Qt ignores our carefully configured directories and just
# puts stuff in default directories. Move them to the proper
# places ...
@@ -208,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_bindir}/QtXmld4.dll
%{_mingw32_bindir}/QtXmlPatterns4.dll
%{_mingw32_bindir}/QtXmlPatternsd4.dll
+%{_mingw32_bindir}/QtMultimedia4.dll
+%{_mingw32_bindir}/QtMultimediad4.dll
+%{_mingw32_bindir}/QtTest4.dll
+%{_mingw32_bindir}/QtTestd4.dll
%{_mingw32_libdir}/libQt3Support4.a
%{_mingw32_libdir}/libQt3Supportd4.a
%{_mingw32_libdir}/libQtCore4.a
@@ -234,6 +262,14 @@ rm -rf $RPM_BUILD_ROOT
%{_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
+%{_mingw32_libdir}/libQtTestd4.a
%{_mingw32_includedir}/Qt/
%{_mingw32_includedir}/Qt3Support/
%{_mingw32_includedir}/QtCore/
@@ -246,9 +282,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_includedir}/QtSvg/
%{_mingw32_includedir}/QtXml/
%{_mingw32_includedir}/QtXmlPatterns/
+%{_mingw32_includedir}/ActiveQt/
+%{_mingw32_includedir}/QtMultimedia/
+%{_mingw32_includedir}/QtTest/
%changelog
+* Fri Feb 26 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.2-1
+- update to 4.6.2
+
* Wed Nov 11 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-1
- update to 4.5.3
Index: qmake.cache.in
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/qmake.cache.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qmake.cache.in 16 Mar 2009 02:25:38 -0000 1.1
+++ qmake.cache.in 26 Feb 2010 10:10:13 -0000 1.2
@@ -7,7 +7,7 @@ styles += windows plastique clea
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
QT_BUILD_PARTS = libs tools examples demos docs translations
-QMAKESPEC = @builddir@/mkspecs/fedora-win32-cross
+QMAKESPEC = @builddir@/mkspecs/win32-fedora-cross
ARCH = windows
QT_BUILD_TREE = @builddir@
QT_SOURCE_TREE = @builddir@
Index: qplatformdefs.h
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/qplatformdefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qplatformdefs.h 16 Mar 2009 02:25:38 -0000 1.1
+++ qplatformdefs.h 26 Feb 2010 10:10:13 -0000 1.2
@@ -56,7 +56,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
-#include <windows.h>
+#include <qt_windows.h>
#include <limits.h>
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
qt-win-configure.patch:
.qmake.cache | 20 +++++
configure.cache | 30 +++++++
configure.output | 145 ++++++++++++++++++++++++++++++++++++
include/Qt/qconfig.h | 1
include/QtCore/qconfig.h | 1
mkspecs/default/qmake.conf | 113 ++++++++++++++++++++++++++++
mkspecs/default/qplatformdefs.h | 160 ++++++++++++++++++++++++++++++++++++++++
mkspecs/qconfig.pri | 12 +++
src/corelib/global/qconfig.cpp | 31 +++++++
src/corelib/global/qconfig.h | 120 ++++++++++++++++++++++++++++++
10 files changed, 633 insertions(+)
Index: qt-win-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/qt-win-configure.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt-win-configure.patch 11 Nov 2009 17:25:46 -0000 1.3
+++ qt-win-configure.patch 26 Feb 2010 10:10:13 -0000 1.4
@@ -1,9 +1,33 @@
-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.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-02-26 03:30:58.000000000 +0100
+@@ -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
++sql-plugins += sqlite
++styles += windows plastique cleanlooks 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:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2\mkspecs\win32-fedora-cross
++ARCH = windows
++QT_BUILD_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++QT_SOURCE_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\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/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-02-26 03:30:58.000000000 +0100
@@ -0,0 +1,30 @@
+-platform
-+fedora-win32-cross
++win32-fedora-cross
+-confirm-license
+-no-qmake
+-dont-process
@@ -32,27 +56,11 @@ diff -urN qt-win-opensource-src-4.5.3.or
+-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 @@
-+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"
-+err:service:scmdatabase_load_services Error 1804 reading registry key for service L"redbook" - skipping
-+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"sbemul" - skipping
-+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"swmidi" - skipping
-+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"UPDATE" - skipping
-+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"wdmaud" - skipping
-+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 ?
+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-02-26 03:30:58.000000000 +0100
+@@ -0,0 +1,145 @@
++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,40 +68,42 @@ diff -urN qt-win-opensource-src-4.5.3.or
+
+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
+ LIB=
+ Unset
+ PATH=
++ c:\windows\system32
+ c:\windows
-+ c:\windows\system
-+ s:\
-+ s:\test
++ e:\
++ e:\test
+ f:\
-+ s:\xilinx\bin\nt
-+ s:\modelsim\win32
-+ s:\fujitsu16\bin
-+ s:\fujitsu16\flash510
++ h:\src\series60\sdk\s60_30\
++ h:\src\series60\sdk\s60_30\epoc32\tools
++ c:\EDA\ePD\2.0\common\win32\bin
++ c:\EDA\ePD\2.0\common\win32\lib
++ c:\EDA\ePD\2.0\wv\2001.2\win32\bin
++ c:\EDA\ePD\2.0\sim\2001.2\fusion\win32\bin
+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 Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.23
+
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3L
++ or Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2L
+
+Configuration:
-+ dist-config
-+ large-config
-+ medium-config
+ minimal-config
+ small-config
++ medium-config
++ large-config
+ full-config
+ release
+Qt Configuration:
@@ -103,9 +113,14 @@ diff -urN qt-win-opensource-src-4.5.3.or
+ accessibility
+ qt3support
+ opengl
++ s60
+ ipv6
++ script
+ scripttools
+ xmlpatterns
++ multimedia
++ audio-backend
++ native-gestures
+ svg
+ minimal-config
+ small-config
@@ -113,7 +128,7 @@ diff -urN qt-win-opensource-src-4.5.3.or
+ large-config
+ full-config
+
-+QMAKESPEC...................fedora-win32-cross (commandline)
++QMAKESPEC...................win32-fedora-cross (commandline)
+Architecture................windows
+Maketool....................make
+Debug symbols...............no
@@ -128,12 +143,15 @@ diff -urN qt-win-opensource-src-4.5.3.or
+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
++Declarative support.........no
++QtScript support............yes
+QtScriptTools support.......yes
+Graphics System.............raster
+Qt3 compatibility...........yes
@@ -145,6 +163,7 @@ diff -urN qt-win-opensource-src-4.5.3.or
+ JPEG support............plugin
+ PNG support.............qt
+ MNG support.............plugin
++ FreeType support........no
+
+Styles:
+ Windows.................yes
@@ -156,6 +175,7 @@ diff -urN qt-win-opensource-src-4.5.3.or
+ CDE.....................yes
+ Windows CE..............no
+ Windows Mobile..........no
++ S60.....................no
+
+Sql Drivers:
+ ODBC....................no
@@ -168,8 +188,8 @@ diff -urN qt-win-opensource-src-4.5.3.or
+ 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..............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
++Build is done in............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.2
+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
@@ -181,24 +201,23 @@ diff -urN qt-win-opensource-src-4.5.3.or
+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.
+
-+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.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-02-26 03:30:58.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.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-02-26 03:30:58.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.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-02-26 03:30:58.000000000 +0100
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -312,10 +331,10 @@ diff -urN qt-win-opensource-src-4.5.3.or
+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=Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/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-02-26 03:30:52.000000000 +0100
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -375,7 +394,7 @@ diff -urN qt-win-opensource-src-4.5.3.or
+#include <errno.h>
+#include <sys/stat.h>
+#include <stdlib.h>
-+#include <windows.h>
++#include <qt_windows.h>
+#include <limits.h>
+
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
@@ -477,52 +496,33 @@ diff -urN qt-win-opensource-src-4.5.3.or
+
+
+#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
-@@ -0,0 +1,11 @@
-+CONFIG+= release shared stl exceptions rtti
+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-02-26 03:30:58.000000000 +0100
+@@ -0,0 +1,12 @@
++CONFIG+= release shared stl exceptions rtti def_files
+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 audio-backend native-gestures svg minimal-config small-config medium-config large-config full-config
+#versioning
-+QT_VERSION = 4.5.3
++QT_VERSION = 4.6.2
+QT_MAJOR_VERSION = 4
-+QT_MINOR_VERSION = 5
-+QT_PATCH_VERSION = 3
++QT_MINOR_VERSION = 6
++QT_PATCH_VERSION = 2
+#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
-@@ -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
-+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
-+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
-+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
-+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-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
-@@ -0,0 +1,27 @@
++#Qt for Symbian FPU settings
+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-02-26 03:30:58.000000000 +0100
+@@ -0,0 +1,31 @@
+/* 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-02-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";
+static const char qt_configure_headers_path_str [512 + 12] = "qt_hdrspath=/usr/i686-pc-mingw32/sys-root/mingw/include";
@@ -547,10 +547,10 @@ diff -urN qt-win-opensource-src-4.5.3.or
+#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.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-02-26 03:30:58.000000000 +0100
+@@ -0,0 +1,120 @@
+/* Everything */
+
+#ifndef QT_DLL
@@ -599,10 +599,16 @@ diff -urN qt-win-opensource-src-4.5.3.or
+# 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_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)
@@ -611,6 +617,12 @@ diff -urN qt-win-opensource-src-4.5.3.or
+# 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 +635,12 @@ diff -urN qt-win-opensource-src-4.5.3.or
+# 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)
Index: qt-win-configure.sh
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/qt-win-configure.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt-win-configure.sh 11 Nov 2009 17:25:46 -0000 1.3
+++ qt-win-configure.sh 26 Feb 2010 10:10:13 -0000 1.4
@@ -15,12 +15,12 @@
# error: #error "MMX instruction set not enabled"
# . Same as above for -no-sse and -no-sse2
-version=4.5.3
-platform=fedora-win32-cross
+version=4.6.2
+platform=win32-fedora-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,16 +30,16 @@ 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
+rm -rf ${srcdir}.orig ${srcdir}
-unzip -qq qt-win-opensource-src-$version.zip
-cp -a $srcdir $srcdir.orig
-mkdir $srcdir/mkspecs/fedora-win32-cross
-cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross
+tar xzf qt-everywhere-opensource-src-${version}.tar.gz
+cp -a ${srcdir} ${srcdir}.orig
+mkdir ${srcdir}/mkspecs/${platform}
+cp qmake.conf qplatformdefs.h ${srcdir}/mkspecs/${platform}
-cd $srcdir
+cd ${srcdir}
echo "o" | wine configure.exe \
-platform $platform \
@@ -62,10 +62,10 @@ echo "o" | wine configure.exe \
cd ..
-rm -r $srcdir/mkspecs/fedora-win32-cross
+rm -r ${srcdir}/mkspecs/${platform}
-diff -urN $srcdir.orig $srcdir > qt-win-configure.patch ||:
+diff -urN ${srcdir}.orig ${srcdir} > qt-win-configure.patch ||:
-rm -r $srcdir.orig $srcdir
+rm -r ${srcdir}.orig ${srcdir}
echo qt-win-configure.patch successfully updated
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 11 Nov 2009 17:25:46 -0000 1.5
+++ sources 26 Feb 2010 10:10:13 -0000 1.6
@@ -1 +1 @@
-81ca235e0da2728f948ca36236f9ee45 qt-win-opensource-src-4.5.3.zip
+eb651ee4b157c01696aa56777fc6e0e5 qt-everywhere-opensource-src-4.6.2.tar.gz
--- mingw32-qt-4.4.3-no-fpu-functions.patch DELETED ---
More information about the scm-commits
mailing list