[mingw-qt: 28/65] update to 4.6.2
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:29:06 UTC 2012
commit f287814e94770332a33799d929cacfb109f34385
Author: sailer <sailer at fedoraproject.org>
Date: Fri Feb 26 02:33:54 2010 +0000
update to 4.6.2
.cvsignore | 1 +
mingw32-qt.spec | 5 ++-
qt-win-configure.patch | 99 +++++++++++++++++++++++++-----------------------
qt-win-configure.sh | 2 +-
sources | 2 +-
5 files changed, 59 insertions(+), 50 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index edf5cda..2f15ff8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ 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
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 1cc73d6..26f5008 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -25,7 +25,7 @@
#global dbgsubdirs
Name: mingw32-qt
-Version: 4.6.1
+Version: 4.6.2
Release: 1%{?pre}%{?dist}
Summary: Qt for Windows
@@ -288,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 26 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.2-1
+- update to 4.6.2
+
* Sun Jan 31 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.1-1
- update to 4.6.1
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index cc0aa3d..8bdc6df 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -11,10 +11,10 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/.qmake.cache qt-everywhere-ope
+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
++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.1
-+QT_SOURCE_TREE = Z:\mnt\xbox\home\sailer\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.1
++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
@@ -22,9 +22,9 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/.qmake.cache qt-everywhere-ope
+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
+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
+win32-fedora-cross
@@ -56,10 +56,10 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.cache qt-everywhere-
+-no-sse2
+-release
+-shared
-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 @@
+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.
@@ -89,11 +89,15 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.output qt-everywhere
+ e:\test
+ f:\
+ h:\src\series60\sdk\s60_30\
-+ h:\src\series60\sdk\s60_30\epoc32\tools
++ 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 Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.13
++See Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.23
+
-+ or Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.1L
++ or Z:/mnt/xbox/home/sailer/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.2L
+
+Configuration:
+ minimal-config
@@ -115,7 +119,6 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.output qt-everywhere
+ scripttools
+ xmlpatterns
+ multimedia
-+ multimedia
+ audio-backend
+ native-gestures
+ svg
@@ -185,8 +188,8 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.output qt-everywhere
+ SQLite2.................no
+ InterBase...............no
+
-+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
++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
@@ -198,22 +201,23 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/configure.output qt-everywhere
+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.
+
-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
+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-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
+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-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
+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
@@ -327,10 +331,10 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qmake.conf qt-
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+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
++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 @@
+/****************************************************************************
+**
@@ -492,31 +496,32 @@ diff -urN qt-everywhere-opensource-src-4.6.1.orig/mkspecs/default/qplatformdefs.
+
+
+#endif // QPLATFORMDEFS_H
-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
+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 s60 ipv6 script scripttools xmlpatterns multimedia multimedia audio-backend 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 audio-backend native-gestures svg minimal-config small-config medium-config large-config full-config
+#versioning
-+QT_VERSION = 4.6.1
++QT_VERSION = 4.6.2
+QT_MAJOR_VERSION = 4
+QT_MINOR_VERSION = 6
-+QT_PATCH_VERSION = 1
++QT_PATCH_VERSION = 2
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-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
++#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-01-31";
++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";
@@ -542,9 +547,9 @@ diff -urN qt-everywhere-opensource-src-4.6.1.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.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
+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 */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index 426f8bb..e9976f7 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.1
+version=4.6.2
platform=win32-fedora-cross
set -e
diff --git a/sources b/sources
index edebcf5..5e18bc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0542a4be6425451ab5f668c6899cac36 qt-everywhere-opensource-src-4.6.1.tar.gz
+eb651ee4b157c01696aa56777fc6e0e5 qt-everywhere-opensource-src-4.6.2.tar.gz
More information about the scm-commits
mailing list