[mingw-qt: 23/65] work on upgrading to 4.6.0rc1
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:28:41 UTC 2012
commit e7ab0a8574a631ca499dcd01def7f5a797e3762b
Author: sailer <sailer at fedoraproject.org>
Date: Sun Nov 22 11:53:04 2009 +0000
work on upgrading to 4.6.0rc1
.cvsignore | 1 +
mingw32-qt.spec | 7 ++-
qt-win-configure.patch | 104 +++++++++++++++++++++++++++--------------------
qt-win-configure.sh | 2 +-
sources | 2 +-
5 files changed, 68 insertions(+), 48 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index c6c223f..63b2b74 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ 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
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 9918961..c09c289 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 beta1
+%global pre rc1
%global platform win32-fedora-cross
@@ -18,7 +18,7 @@
# 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/activeqt src/multimedia src/plugins
Name: mingw32-qt
Version: 4.6.0
@@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.rc1
+- update to 4.6.0-rc1
+
* Mon Nov 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.beta1
- update to 4.6.0-beta1
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index 3f37b4a..a46cb82 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache qt-everywhere-opensource-src-4.6.0-beta1/configure.cache
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/configure.cache 2009-11-17 13:17:27.000000000 +0100
+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
@@ -0,0 +1,30 @@
+-platform
+win32-fedora-cross
@@ -32,10 +32,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache qt-every
+-no-sse2
+-release
+-shared
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-everywhere-opensource-src-4.6.0-beta1/configure.output
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/configure.output 2009-11-17 13:17:28.000000000 +0100
-@@ -0,0 +1,155 @@
+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 @@
+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-beta1.orig/configure.output qt-ever
+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
-+Which edition of Qt do you want to use ?
++Invalid 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,7 +68,6 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+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
@@ -85,9 +84,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+ 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-beta13
++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc13
+
-+ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-beta1L
++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-everywhere-opensource-src-4.6.0-rc1L
+
+Configuration:
+ minimal-config
@@ -138,6 +137,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+Phonon support..............no
+QtMultimedia support........yes
+WebKit support..............no
++Declarative support.........no
+QtScript support............yes
+QtScriptTools support.......yes
+Graphics System.............raster
@@ -175,8 +175,8 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
-+Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
++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
+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,24 +186,30 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+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
-+Demos installed to........../usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/demos
++err:menubuilder:init_xdg error looking up the desktop directory
+
+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.0-beta1.orig/include/Qt/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/include/Qt/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/include/Qt/qconfig.h 2009-11-17 13:17:27.000000000 +0100
++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-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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/include/QtCore/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/include/QtCore/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/include/QtCore/qconfig.h 2009-11-17 13:17:27.000000000 +0100
+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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qmake.conf qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qmake.conf
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qmake.conf 2009-11-17 13:17:28.000000000 +0100
+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
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -317,10 +323,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qmake.co
+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-beta1/mkspecs/win32-fedora-cross
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatformdefs.h qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qplatformdefs.h
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qplatformdefs.h 2009-11-17 13:17:18.000000000 +0100
++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
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -482,9 +488,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatfor
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/qconfig.pri
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/qconfig.pri 2009-11-17 13:17:27.000000000 +0100
+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
@@ -0,0 +1,11 @@
+CONFIG+= release shared stl exceptions rtti
+QT_ARCH = windows
@@ -497,9 +503,9 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri qt-e
+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-beta1.orig/.qmake.cache qt-everywhere-opensource-src-4.6.0-beta1/.qmake.cache
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/.qmake.cache 2009-11-17 13:17:27.000000000 +0100
+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
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
+OBJECTS_DIR = tmp\obj\release_shared
@@ -510,10 +516,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache qt-everywhe
+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-beta1\mkspecs\win32-fedora-cross
++QMAKESPEC = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-rc1\mkspecs\win32-fedora-cross
+ARCH = windows
-+QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
-+QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1
++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
+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
@@ -521,13 +527,17 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache qt-everywhe
+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-beta1.orig/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.cpp
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.cpp 2009-11-17 13:17:28.000000000 +0100
-@@ -0,0 +1,27 @@
+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
+@@ -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_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";
@@ -552,10 +562,10 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconf
+#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-beta1.orig/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.h
---- qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0-beta1/src/corelib/global/qconfig.h 2009-11-17 13:17:27.000000000 +0100
-@@ -0,0 +1,114 @@
+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
+@@ -0,0 +1,120 @@
+/* Everything */
+
+#ifndef QT_DLL
@@ -604,6 +614,12 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconf
+# define QT_NO_DBUS
+#endif
+
++#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)
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index d1d5b4c..a0ab02d 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-beta1
+version=4.6.0-rc1
platform=win32-fedora-cross
set -e
diff --git a/sources b/sources
index 5739bd9..b41afa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60d136f17491ce0e56bb317ea7300aef qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
+56772a3f9128f00504d2b21dbe4186b3 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
More information about the scm-commits
mailing list