[mingw-qt: 26/65] update to 4.6.0 final
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:28:56 UTC 2012
commit fd3631c18ded5ed476fab9d8b37f7dd29cefcd1b
Author: sailer <sailer at fedoraproject.org>
Date: Tue Dec 1 21:03:55 2009 +0000
update to 4.6.0 final
.cvsignore | 1 +
mingw32-qt.spec | 7 +++-
qt-win-configure.patch | 88 ++++++++++++++++++++++++-----------------------
qt-win-configure.sh | 2 +-
sources | 2 +-
5 files changed, 53 insertions(+), 47 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 63b2b74..7c7a296 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ 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
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 2b15544..3b99beb 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -5,7 +5,7 @@
%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
-%global pre rc1
+#global pre rc1
%global platform win32-fedora-cross
@@ -26,7 +26,7 @@
Name: mingw32-qt
Version: 4.6.0
-Release: 0.1.%{pre}%{?dist}
+Release: 1%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -288,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-1
+- update to 4.6.0
+
* Sun Nov 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.rc1
- update to 4.6.0-rc1
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index a46cb82..3ba1bb7 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.cache qt-everywhere-opensource-src-4.6.0-rc1/configure.cache
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/configure.cache 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.cache qt-everywhere-opensource-src-4.6.0/configure.cache
+--- qt-everywhere-opensource-src-4.6.0.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/configure.cache 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1,30 @@
+-platform
+win32-fedora-cross
@@ -32,10 +32,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.cache qt-everywh
+-no-sse2
+-release
+-shared
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everywhere-opensource-src-4.6.0-rc1/configure.output
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/configure.output 2009-11-21 22:43:33.000000000 +0100
-@@ -0,0 +1,161 @@
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere-opensource-src-4.6.0/configure.output
+--- qt-everywhere-opensource-src-4.6.0.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/configure.output 2009-12-01 20:55:14.000000000 +0100
+@@ -0,0 +1,163 @@
+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,7 +51,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+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 keyWhich edition of Qt do you want to use ?
++Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid 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.
+
@@ -68,6 +68,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+dmoguids.lib not found
+msdmo.lib not found
+d3d9.h not found
++err:menubuilder:init_xdg error looking up the desktop directory
+Environment:
+ INCLUDE=
+ Unset
@@ -84,9 +85,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+ 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-everywhere-opensource-src-4.6.0-rc13
++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.03
+
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc1L
++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0L
+
+Configuration:
+ minimal-config
@@ -108,6 +109,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+ scripttools
+ xmlpatterns
+ multimedia
++ native-gestures
+ svg
+ minimal-config
+ small-config
@@ -175,8 +177,8 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
-+Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
++Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
++Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.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
@@ -186,7 +188,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+Data installed to.........../usr/i686-pc-mingw32/sys-root/mingw/share
+Translations installed to.../usr/i686-pc-mingw32/sys-root/mingw/share/qt4/translations
+Examples installed to......./usr/i686-pc-mingw32/sys-root/mingw/share/qt4/examples
-+err:menubuilder:init_xdg error looking up the desktop directory
++Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
+
+Processing of project files have been disabled.
+Only use this option if you really know what you're doing.
@@ -197,19 +199,19 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/configure.output qt-everyw
+Application tried to create a window, but no driver could be loaded.
+Make sure that your X server is running and that $DISPLAY is set correctly.
+err:rundll32:WinMain Unable to find the entry point L"LoadCurrentPwrScheme" in L"powrprof.dll"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/include/Qt/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/include/Qt/qconfig.h 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0/include/Qt/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/include/Qt/qconfig.h 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/include/QtCore/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/include/QtCore/qconfig.h 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0/include/QtCore/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/include/QtCore/qconfig.h 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qmake.conf
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qmake.conf 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0/mkspecs/default/qmake.conf
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/default/qmake.conf 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -323,10 +325,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qmake.conf
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/win32-fedora-cross
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qplatformdefs.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/default/qplatformdefs.h 2009-11-21 22:43:20.000000000 +0100
++QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0/mkspecs/win32-fedora-cross
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0/mkspecs/default/qplatformdefs.h
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/default/qplatformdefs.h 2009-12-01 20:54:50.000000000 +0100
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -488,14 +490,14 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/default/qplatformd
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/qconfig.pri
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/mkspecs/qconfig.pri 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0/mkspecs/qconfig.pri
+--- qt-everywhere-opensource-src-4.6.0.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/qconfig.pri 2009-12-01 20:55:13.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 s60 ipv6 script scripttools xmlpatterns multimedia 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 native-gestures svg minimal-config small-config medium-config large-config full-config
+#versioning
+QT_VERSION = 4.6.0
+QT_MAJOR_VERSION = 4
@@ -503,9 +505,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/mkspecs/qconfig.pri qt-eve
+QT_PATCH_VERSION = 0
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0-rc1/.qmake.cache
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/.qmake.cache 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0/.qmake.cache
+--- qt-everywhere-opensource-src-4.6.0.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/.qmake.cache 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
+OBJECTS_DIR = tmp\obj\release_shared
@@ -516,10 +518,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache qt-everywhere
+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 = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1\mkspecs\win32-fedora-cross
++QMAKESPEC = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0\mkspecs\win32-fedora-cross
+ARCH = windows
-+QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
-+QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1
++QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0
++QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.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
@@ -527,16 +529,16 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/.qmake.cache qt-everywhere
+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.0-rc1.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.cpp
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.cpp 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.cpp
+--- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.cpp 2009-12-01 20:55:13.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=2009-11-21";
++static const char qt_configure_installation [11 + 12] = "qt_instdate=2009-12-01";
+
+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";
@@ -562,9 +564,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig
+#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.0-rc1.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-rc1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-rc1/src/corelib/global/qconfig.h 2009-11-21 22:43:33.000000000 +0100
+diff -urN qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.h
+--- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/src/corelib/global/qconfig.h 2009-12-01 20:55:13.000000000 +0100
@@ -0,0 +1,120 @@
+/* Everything */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index a0ab02d..5e9b8ea 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.0-rc1
+version=4.6.0
platform=win32-fedora-cross
set -e
diff --git a/sources b/sources
index b41afa0..0b0b4d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56772a3f9128f00504d2b21dbe4186b3 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+2a7b5126f2450d8525af355fc4c12ad6 qt-everywhere-opensource-src-4.6.0.tar.gz
More information about the scm-commits
mailing list