[mingw-qt: 14/65] update to 4.5.2
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:27:56 UTC 2012
commit 48dc6c3e9372ff373a7e2ffbfeabd2b0982af8c2
Author: sailer <sailer at fedoraproject.org>
Date: Mon Jun 29 14:37:14 2009 +0000
update to 4.5.2
.cvsignore | 1 +
mingw32-qt.spec | 11 +++--
qt-win-configure.patch | 133 +++++++++++++++++++----------------------------
qt-win-configure.sh | 4 +-
sources | 2 +-
5 files changed, 65 insertions(+), 86 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index d49f233..82260fe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
qt-win-opensource-src-4.5.1.zip
+qt-win-opensource-src-4.5.2.zip
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 8b0f0c6..3480161 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.1
-Release: 7%{?dist}
+Version: 4.5.2
+Release: 1%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -89,7 +89,7 @@ Fedora Windows cross-compiler.
%patch11 -p1
-for f in LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt KNOWN.ISSUES README; do
+for f in LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README; do
dos2unix --keepdate $f
done
@@ -180,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc configure.output
-%doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt KNOWN.ISSUES README
+%doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README
%{_mingw32_bindir}/Qt3Support4.dll
%{_mingw32_bindir}/Qt3Supportd4.dll
%{_mingw32_bindir}/QtCore4.dll
@@ -242,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 26 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.2-1
+- update to 4.5.2
+
* Thu Jun 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.1-7
- hopefully finally solve the 32 vs 64 bit builder issues
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index a66f127..e468e6c 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,6 +1,6 @@
-diff -urN qt-win-opensource-src-4.5.0.orig/configure.cache qt-win-opensource-src-4.5.0/configure.cache
---- qt-win-opensource-src-4.5.0.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/configure.cache 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1,30 @@
+-platform
+fedora-win32-cross
@@ -32,28 +32,13 @@ diff -urN qt-win-opensource-src-4.5.0.orig/configure.cache qt-win-opensource-src
+-no-sse2
+-release
+-shared
-diff -urN qt-win-opensource-src-4.5.0.orig/configure.output qt-win-opensource-src-4.5.0/configure.output
---- qt-win-opensource-src-4.5.0.orig/configure.output 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/configure.output 2009-03-11 21:28:03.000000000 +0100
-@@ -0,0 +1,154 @@
-+err:wineboot:ProcessRunKeys Error running cmd #2 (2)
-+err:wineboot:ProcessRunKeys Error running cmd #0 (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
-+No protocol specified
-+No protocol specified
-+No protocol specified
+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 ?
++Type 'c' if you want to use the Commercial Edition.
++Type 'o' if you want to use the Open Source Edition.
+
+This is the Qt for Windows Open Source Edition.
+
@@ -73,18 +58,12 @@ diff -urN qt-win-opensource-src-4.5.0.orig/configure.output qt-win-opensource-sr
+ LIB=
+ Unset
+ PATH=
-+ 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 LGPL version 2.1 or the GNU GPL version 3.
-+See J:/rpmbuild/SOURCES/qt-win-opensource-src-4.5.0/LICENSE.LGPL
-+ or J:/rpmbuild/SOURCES/qt-win-opensource-src-4.5.0/LICENSE.GPL3
++ C:\windows\system32
++ C:\windows
++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
++
++ or H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.2L
+
+Configuration:
+ dist-config
@@ -115,6 +94,7 @@ diff -urN qt-win-opensource-src-4.5.0.orig/configure.output qt-win-opensource-sr
+Architecture................windows
+Maketool....................make
+Debug symbols...............no
++Link Time Code Generation...no
+Accessibility support.......yes
+STL support.................yes
+Exception support...........yes
@@ -165,8 +145,8 @@ diff -urN qt-win-opensource-src-4.5.0.orig/configure.output qt-win-opensource-sr
+ SQLite2.................no
+ InterBase...............no
+
-+Sources are in..............J:\rpmbuild\SOURCES\qt-win-opensource-src-4.5.0
-+Build is done in............J:\rpmbuild\SOURCES\qt-win-opensource-src-4.5.0
++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
+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
@@ -181,29 +161,20 @@ diff -urN qt-win-opensource-src-4.5.0.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.
+
-+No protocol specified
-+No protocol specified
-+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.
-+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.
-+fixme:powrprof:DllMain (0x60750000, 1, (nil)) not fully implemented
-+err:rundll32:WinMain Unable to find the entry point L"LoadCurrentPwrScheme" in L"powrprof.dll"
-+fixme:powrprof:DllMain (0x60750000, 0, (nil)) not fully implemented
-diff -urN qt-win-opensource-src-4.5.0.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.0/include/Qt/qconfig.h
---- qt-win-opensource-src-4.5.0.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/include/Qt/qconfig.h 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.0.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.0/include/QtCore/qconfig.h
---- qt-win-opensource-src-4.5.0.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/include/QtCore/qconfig.h 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1 @@
+#include "../../src/corelib/global/qconfig.h"
-diff -urN qt-win-opensource-src-4.5.0.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.0/mkspecs/default/qmake.conf
---- qt-win-opensource-src-4.5.0.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/mkspecs/default/qmake.conf 2009-03-11 21:28:03.000000000 +0100
-@@ -0,0 +1,109 @@
+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
+@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
+# (Fedora Windows cross-compiler)
@@ -303,19 +274,23 @@ diff -urN qt-win-opensource-src-4.5.0.orig/mkspecs/default/qmake.conf qt-win-ope
+QMAKE_UIC = uic-qt4
+QMAKE_IDC = idc
+
++QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc
++
+QMAKE_IDL = midl
+QMAKE_LIB = i686-pc-mingw32-ar -ru
+QMAKE_RC = i686-pc-mingw32-windres
+QMAKE_ZIP = zip -r -9
+
++#QT_LIBINFIX = 4
++
+QMAKE_STRIP = strip
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+load(qt_config)
+
-+QMAKESPEC_ORIGINAL=J:/rpmbuild/SOURCES/qt-win-opensource-src-4.5.0/mkspecs/fedora-win32-cross
-diff -urN qt-win-opensource-src-4.5.0.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.0/mkspecs/default/qplatformdefs.h
---- qt-win-opensource-src-4.5.0.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/mkspecs/default/qplatformdefs.h 2009-03-11 21:27:56.000000000 +0100
++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
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -477,24 +452,24 @@ diff -urN qt-win-opensource-src-4.5.0.orig/mkspecs/default/qplatformdefs.h qt-wi
+
+
+#endif // QPLATFORMDEFS_H
-diff -urN qt-win-opensource-src-4.5.0.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.0/mkspecs/qconfig.pri
---- qt-win-opensource-src-4.5.0.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/mkspecs/qconfig.pri 2009-03-11 21:28:03.000000000 +0100
+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
@@ -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.0
++QT_VERSION = 4.5.2
+QT_MAJOR_VERSION = 4
+QT_MINOR_VERSION = 5
-+QT_PATCH_VERSION = 0
++QT_PATCH_VERSION = 2
+#Qt for Windows CE c-runtime deployment
+QT_CE_C_RUNTIME = no
-diff -urN qt-win-opensource-src-4.5.0.orig/.qmake.cache qt-win-opensource-src-4.5.0/.qmake.cache
---- qt-win-opensource-src-4.5.0.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/.qmake.cache 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
+OBJECTS_DIR = tmp\obj\release_shared
@@ -505,10 +480,10 @@ diff -urN qt-win-opensource-src-4.5.0.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 = J:\rpmbuild\SOURCES\qt-win-opensource-src-4.5.0\mkspecs\fedora-win32-cross
++QMAKESPEC = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2\mkspecs\fedora-win32-cross
+ARCH = windows
-+QT_BUILD_TREE = J:\rpmbuild\SOURCES\qt-win-opensource-src-4.5.0
-+QT_SOURCE_TREE = J:\rpmbuild\SOURCES\qt-win-opensource-src-4.5.0
++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
+QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe
+QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe
+QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe
@@ -516,9 +491,9 @@ diff -urN qt-win-opensource-src-4.5.0.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.0.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.0/src/corelib/global/qconfig.cpp
---- qt-win-opensource-src-4.5.0.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/src/corelib/global/qconfig.cpp 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1,27 @@
+/* Licensed */
+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
@@ -547,9 +522,9 @@ diff -urN qt-win-opensource-src-4.5.0.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.0.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.0/src/corelib/global/qconfig.h
---- qt-win-opensource-src-4.5.0.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100
-+++ qt-win-opensource-src-4.5.0/src/corelib/global/qconfig.h 2009-03-11 21:28:03.000000000 +0100
+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
@@ -0,0 +1,102 @@
+/* Everything */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index 42dfb81..bc22f1a 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.0
+version=4.5.2
platform=fedora-win32-cross
set -e
@@ -41,7 +41,7 @@ cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross
cd $srcdir
-wine configure.exe \
+echo "o" | wine configure.exe \
-platform $platform \
-confirm-license \
-no-qmake \
diff --git a/sources b/sources
index d1e9213..ac9a1d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef2934257c893b7694437cc8d1e37bd9 qt-win-opensource-src-4.5.1.zip
+05d3d3448218acc72bd7a5bbfae9312a qt-win-opensource-src-4.5.2.zip
More information about the scm-commits
mailing list