[mingw-qt: 16/65] update to 4.5.3
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:28:06 UTC 2012
commit 06e470e28ca19d9fdcf6926527c479f57337ebb4
Author: sailer <sailer at fedoraproject.org>
Date: Sun Nov 1 22:50:22 2009 +0000
update to 4.5.3
.cvsignore | 1 +
mingw32-qt.spec | 7 ++-
qt-win-configure.patch | 113 +++++++++++++++++++++++++++++-------------------
qt-win-configure.sh | 2 +-
sources | 2 +-
5 files changed, 77 insertions(+), 48 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 82260fe..36587db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
qt-win-opensource-src-4.5.1.zip
qt-win-opensource-src-4.5.2.zip
+qt-win-opensource-src-4.5.3.zip
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index c8c45d6..7fef83c 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -17,8 +17,8 @@
%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.2
-Release: 2%{?dist}
+Version: 4.5.3
+Release: 1%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -242,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-1
+- update to 4.5.3
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index e468e6c..36e8e96 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-diff -urN qt-win-opensource-src-4.5.2.orig/configure.cache qt-win-opensource-src-4.5.2/configure.cache
---- qt-win-opensource-src-4.5.2.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/configure.cache 2009-06-26 17:14:45.000000000 +0200
+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
@@ -0,0 +1,30 @@
+-platform
+fedora-win32-cross
@@ -32,11 +32,27 @@ diff -urN qt-win-opensource-src-4.5.2.orig/configure.cache qt-win-opensource-src
+-no-sse2
+-release
+-shared
-diff -urN qt-win-opensource-src-4.5.2.orig/configure.output qt-win-opensource-src-4.5.2/configure.output
---- qt-win-opensource-src-4.5.2.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/configure.output 2009-06-26 17:14:45.000000000 +0200
-@@ -0,0 +1,125 @@
-+Which edition of Qt do you want to use ?
+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 ?
+Type 'c' if you want to use the Commercial Edition.
+Type 'o' if you want to use the Open Source Edition.
+
@@ -58,12 +74,19 @@ diff -urN qt-win-opensource-src-4.5.2.orig/configure.output qt-win-opensource-sr
+ LIB=
+ Unset
+ PATH=
-+ C:\windows\system32
-+ C:\windows
++ c:\windows
++ c:\windows\system
++ s:\
++ s:\test
++ f:\
++ s:\xilinx\bin\nt
++ s:\modelsim\win32
++ 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 H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.23
++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.33
+
-+ or H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.2L
++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3L
+
+Configuration:
+ dist-config
@@ -145,8 +168,8 @@ diff -urN qt-win-opensource-src-4.5.2.orig/configure.output qt-win-opensource-sr
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2
-+Build is done in............H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2
++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
+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
@@ -161,19 +184,21 @@ diff -urN qt-win-opensource-src-4.5.2.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.
+
-diff -urN qt-win-opensource-src-4.5.2.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.2/include/Qt/qconfig.h
---- qt-win-opensource-src-4.5.2.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/include/Qt/qconfig.h 2009-06-26 17:14:45.000000000 +0200
++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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.2.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.2/include/QtCore/qconfig.h
---- qt-win-opensource-src-4.5.2.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/include/QtCore/qconfig.h 2009-06-26 17:14:45.000000000 +0200
+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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.2/mkspecs/default/qmake.conf
---- qt-win-opensource-src-4.5.2.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/mkspecs/default/qmake.conf 2009-06-26 17:14:45.000000000 +0200
+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
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -287,10 +312,10 @@ diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qmake.conf qt-win-ope
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.2/mkspecs/fedora-win32-cross
-diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.2/mkspecs/default/qplatformdefs.h
---- qt-win-opensource-src-4.5.2.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/mkspecs/default/qplatformdefs.h 2009-06-26 17:14:41.000000000 +0200
++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
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -452,24 +477,24 @@ diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qplatformdefs.h qt-wi
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.2/mkspecs/qconfig.pri
---- qt-win-opensource-src-4.5.2.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/mkspecs/qconfig.pri 2009-06-26 17:14:45.000000000 +0200
+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
+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
+#versioning
-+QT_VERSION = 4.5.2
++QT_VERSION = 4.5.3
+QT_MAJOR_VERSION = 4
+QT_MINOR_VERSION = 5
-+QT_PATCH_VERSION = 2
++QT_PATCH_VERSION = 3
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-diff -urN qt-win-opensource-src-4.5.2.orig/.qmake.cache qt-win-opensource-src-4.5.2/.qmake.cache
---- qt-win-opensource-src-4.5.2.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/.qmake.cache 2009-06-26 17:14:45.000000000 +0200
+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
@@ -480,10 +505,10 @@ diff -urN qt-win-opensource-src-4.5.2.orig/.qmake.cache qt-win-opensource-src-4.
+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 = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2\mkspecs\fedora-win32-cross
++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 = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2
-+QT_SOURCE_TREE = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2
++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
@@ -491,9 +516,9 @@ diff -urN qt-win-opensource-src-4.5.2.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.2.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.cpp
---- qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.cpp 2009-06-26 17:14:45.000000000 +0200
+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 @@
+/* Licensed */
+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
@@ -522,9 +547,9 @@ diff -urN qt-win-opensource-src-4.5.2.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.2.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.h
---- qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.h 2009-06-26 17:14:45.000000000 +0200
+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 @@
+/* Everything */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index bc22f1a..ae7d66c 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.5.2
+version=4.5.3
platform=fedora-win32-cross
set -e
diff --git a/sources b/sources
index ac9a1d8..05a8c49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05d3d3448218acc72bd7a5bbfae9312a qt-win-opensource-src-4.5.2.zip
+81ca235e0da2728f948ca36236f9ee45 qt-win-opensource-src-4.5.3.zip
More information about the scm-commits
mailing list