[mingw-qt: 27/65] update to 4.6.1
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:29:01 UTC 2012
commit d950902ea48fb9f4c9ac27506fa7b09f96b24313
Author: sailer <sailer at fedoraproject.org>
Date: Sun Jan 31 17:27:30 2010 +0000
update to 4.6.1
.cvsignore | 1 +
mingw32-qt.spec | 5 +-
qt-win-configure.patch | 160 +++++++++++++++++++++---------------------------
qt-win-configure.sh | 2 +-
sources | 2 +-
5 files changed, 76 insertions(+), 94 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 7c7a296..edf5cda 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ 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
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 3b99beb..1cc73d6 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -25,7 +25,7 @@
#global dbgsubdirs
Name: mingw32-qt
-Version: 4.6.0
+Version: 4.6.1
Release: 1%{?pre}%{?dist}
Summary: Qt for Windows
@@ -288,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 31 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.1-1
+- update to 4.6.1
+
* Tue Dec 1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-1
- update to 4.6.0
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index 3ba1bb7..cc0aa3d 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,30 @@
-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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/.qmake.cache qt-everywhere-opensource-src-4.6.1/.qmake.cache
+--- qt-everywhere-opensource-src-4.6.1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/.qmake.cache 2010-01-31 18:13:35.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.1\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.1
++QT_SOURCE_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.1
++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.1.orig/configure.cache qt-everywhere-opensource-src-4.6.1/configure.cache
+--- qt-everywhere-opensource-src-4.6.1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/configure.cache 2010-01-31 18:13:35.000000000 +0100
@@ -0,0 +1,30 @@
+-platform
+win32-fedora-cross
@@ -32,26 +56,11 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.cache qt-everywhere-
+-no-sse2
+-release
+-shared
-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"
-+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 keyInvalid MIT-MAGIC-COOKIE-1 keyWhich edition of Qt do you want to use ?
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.output qt-everywhere-opensource-src-4.6.1/configure.output
+--- qt-everywhere-opensource-src-4.6.1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/configure.output 2010-01-31 18:13:35.000000000 +0100
+@@ -0,0 +1,141 @@
++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.
+
@@ -68,26 +77,23 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere
+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
+ 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
+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.03
++See Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.13
+
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0L
++ or Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.1L
+
+Configuration:
+ minimal-config
@@ -109,6 +115,8 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere
+ scripttools
+ xmlpatterns
+ multimedia
++ multimedia
++ audio-backend
+ native-gestures
+ svg
+ minimal-config
@@ -177,8 +185,8 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere
+ SQLite2.................no
+ InterBase...............no
+
-+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
++Sources are in..............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.1
++Build is done in............Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.1
+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
@@ -193,25 +201,19 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/configure.output qt-everywhere
+Processing of project files have been disabled.
+Only use this option if you really know what you're doing.
+
-+Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyApplication 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:systray:initialize_systray Could not create tray window
-+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.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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.1/include/Qt/qconfig.h
+--- qt-everywhere-opensource-src-4.6.1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/include/Qt/qconfig.h 2010-01-31 18:13:35.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.1/include/QtCore/qconfig.h
+--- qt-everywhere-opensource-src-4.6.1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/include/QtCore/qconfig.h 2010-01-31 18:13:35.000000000 +0100
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.1/mkspecs/default/qmake.conf
+--- qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/mkspecs/default/qmake.conf 2010-01-31 18:13:35.000000000 +0100
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -325,10 +327,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qmake.conf qt-
+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/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
++QMAKESPEC_ORIGINAL=Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.1/mkspecs/win32-fedora-cross
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.1/mkspecs/default/qplatformdefs.h
+--- qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/mkspecs/default/qplatformdefs.h 2010-01-31 18:13:32.000000000 +0100
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -490,55 +492,31 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/mkspecs/default/qplatformdefs.
+
+
+#endif // QPLATFORMDEFS_H
-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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.1/mkspecs/qconfig.pri
+--- qt-everywhere-opensource-src-4.6.1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/mkspecs/qconfig.pri 2010-01-31 18:13:35.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 native-gestures 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 multimedia audio-backend native-gestures svg minimal-config small-config medium-config large-config full-config
+#versioning
-+QT_VERSION = 4.6.0
++QT_VERSION = 4.6.1
+QT_MAJOR_VERSION = 4
+QT_MINOR_VERSION = 6
-+QT_PATCH_VERSION = 0
++QT_PATCH_VERSION = 1
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-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
-+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 = 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
-+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
-+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.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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.1/src/corelib/global/qconfig.cpp
+--- qt-everywhere-opensource-src-4.6.1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/src/corelib/global/qconfig.cpp 2010-01-31 18:13:35.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-12-01";
++static const char qt_configure_installation [11 + 12] = "qt_instdate=2010-01-31";
+
+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";
@@ -564,9 +542,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0.orig/src/corelib/global/qconfig.cpp
+#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.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
+diff -urN qt-everywhere-opensource-src-4.6.1.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.1/src/corelib/global/qconfig.h
+--- qt-everywhere-opensource-src-4.6.1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.1/src/corelib/global/qconfig.h 2010-01-31 18:13:35.000000000 +0100
@@ -0,0 +1,120 @@
+/* Everything */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index 5e9b8ea..426f8bb 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
+version=4.6.1
platform=win32-fedora-cross
set -e
diff --git a/sources b/sources
index 0b0b4d5..edebcf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a7b5126f2450d8525af355fc4c12ad6 qt-everywhere-opensource-src-4.6.0.tar.gz
+0542a4be6425451ab5f668c6899cac36 qt-everywhere-opensource-src-4.6.1.tar.gz
More information about the scm-commits
mailing list