[mingw-qt: 21/65] build fixes
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:28:31 UTC 2012
commit bf72149bc51e877d391231c6d4faf9193e3e5ae0
Author: sailer <sailer at fedoraproject.org>
Date: Wed Nov 18 11:28:49 2009 +0000
build fixes
mingw32-qt.spec | 10 ++++++----
qmake.cache.in | 2 +-
qt-win-configure.patch | 32 ++++++++++++++++----------------
qt-win-configure.sh | 24 ++++++++++++------------
4 files changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index b6df9a0..e87bb35 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -7,6 +7,8 @@
%global pre beta1
+%global platform win32-fedora-cross
+
# NOTES, please read these carefully first:
#
# . We only build a few libraries at the moment, those listed in
@@ -98,8 +100,8 @@ rm .qmake.cache
sed -e s, at builddir@,$(pwd),g < %{SOURCE2} > .qmake.cache
# Cross-compilation qmake target.
-mkdir mkspecs/fedora-win32-cross
-cp %{SOURCE3} %{SOURCE4} mkspecs/fedora-win32-cross
+mkdir mkspecs/%{platform}
+cp %{SOURCE3} %{SOURCE4} mkspecs/%{platform}
%build
@@ -173,8 +175,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/qt4/bin
rm $RPM_BUILD_ROOT%{_libdir}/*.prl
# add links with version suffix for convenience
-ln -s $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain4.a
-ln -s $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind4.a
+ln -s libqtmain.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain4.a
+ln -s libqtmaind.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind4.a
diff --git a/qmake.cache.in b/qmake.cache.in
index 587b1dd..a1a94cd 100644
--- a/qmake.cache.in
+++ b/qmake.cache.in
@@ -7,7 +7,7 @@ styles += windows plastique cleanlooks motif cde
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 = @builddir@/mkspecs/fedora-win32-cross
+QMAKESPEC = @builddir@/mkspecs/win32-fedora-cross
ARCH = windows
QT_BUILD_TREE = @builddir@
QT_SOURCE_TREE = @builddir@
diff --git a/qt-win-configure.patch b/qt-win-configure.patch
index 19c4734..3f37b4a 100644
--- a/qt-win-configure.patch
+++ b/qt-win-configure.patch
@@ -1,9 +1,9 @@
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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/configure.cache 2009-11-17 13:17:27.000000000 +0100
@@ -0,0 +1,30 @@
+-platform
-+fedora-win32-cross
++win32-fedora-cross
+-confirm-license
+-no-qmake
+-dont-process
@@ -34,7 +34,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.cache qt-every
+-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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/configure.output 2009-11-17 13:17:28.000000000 +0100
@@ -0,0 +1,155 @@
+err:wineboot:ProcessRunKeys Error running cmd L"C:\\WINDOWS\\SYSTEM\\mstask.exe" (2)
+err:wineboot:ProcessRunKeys Error running cmd L"ati2evxx.exe" (2)
@@ -51,7 +51,6 @@ 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
-+err:menubuilder:init_xdg error looking up the desktop directory
+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.
@@ -69,6 +68,7 @@ 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
@@ -116,7 +116,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+ large-config
+ full-config
+
-+QMAKESPEC...................fedora-win32-cross (commandline)
++QMAKESPEC...................win32-fedora-cross (commandline)
+Architecture................windows
+Maketool....................make
+Debug symbols...............no
@@ -193,17 +193,17 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/configure.output qt-ever
+
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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/include/Qt/qconfig.h 2009-11-17 13:17:27.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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/include/QtCore/qconfig.h 2009-11-17 13:17:27.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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qmake.conf 2009-11-17 13:17:28.000000000 +0100
@@ -0,0 +1,113 @@
+#
+# qmake configuration for fedora-win32-cross
@@ -317,10 +317,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/fedora-win32-cross
++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-16 17:02:21.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/default/qplatformdefs.h 2009-11-17 13:17:18.000000000 +0100
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
@@ -380,7 +380,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/default/qplatfor
+#include <errno.h>
+#include <sys/stat.h>
+#include <stdlib.h>
-+#include <windows.h>
++#include <qt_windows.h>
+#include <limits.h>
+
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
@@ -484,7 +484,7 @@ 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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/mkspecs/qconfig.pri 2009-11-17 13:17:27.000000000 +0100
@@ -0,0 +1,11 @@
+CONFIG+= release shared stl exceptions rtti
+QT_ARCH = windows
@@ -499,7 +499,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/mkspecs/qconfig.pri qt-e
+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-16 17:02:27.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0-beta1/.qmake.cache 2009-11-17 13:17:27.000000000 +0100
@@ -0,0 +1,20 @@
+QMAKE_QT_VERSION_OVERRIDE = 4
+OBJECTS_DIR = tmp\obj\release_shared
@@ -510,7 +510,7 @@ 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\fedora-win32-cross
++QMAKESPEC = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-everywhere-opensource-src-4.6.0-beta1\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
@@ -523,7 +523,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/.qmake.cache qt-everywhe
+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-16 17:02:27.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 @@
+/* Licensed */
+static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source";
@@ -554,7 +554,7 @@ diff -urN qt-everywhere-opensource-src-4.6.0-beta1.orig/src/corelib/global/qconf
+
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-16 17:02:27.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 @@
+/* Everything */
+
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index d9bbbc6..d1d5b4c 100755
--- a/qt-win-configure.sh
+++ b/qt-win-configure.sh
@@ -16,11 +16,11 @@
# . Same as above for -no-sse and -no-sse2
version=4.6.0-beta1
-platform=fedora-win32-cross
+platform=win32-fedora-cross
set -e
-if [ ! -f qt-everywhere-opensource-src-$version.tar.gz -o \
+if [ ! -f qt-everywhere-opensource-src-${version}.tar.gz -o \
! -f qmake.conf -o \
! -f qplatformdefs.h ]; then
echo "You're trying to run this from the wrong directory."
@@ -30,16 +30,16 @@ fi
echo "Unpacking source file ... (this can take a minute or two)"
-srcdir=qt-everywhere-opensource-src-$version
+srcdir=qt-everywhere-opensource-src-${version}
-rm -rf $srcdir.orig $srcdir
+rm -rf ${srcdir}.orig ${srcdir}
-tar xzf qt-everywhere-opensource-src-$version.tar.gz
-cp -a $srcdir $srcdir.orig
-mkdir $srcdir/mkspecs/fedora-win32-cross
-cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross
+tar xzf qt-everywhere-opensource-src-${version}.tar.gz
+cp -a ${srcdir} ${srcdir}.orig
+mkdir ${srcdir}/mkspecs/${platform}
+cp qmake.conf qplatformdefs.h ${srcdir}/mkspecs/${platform}
-cd $srcdir
+cd ${srcdir}
echo "o" | wine configure.exe \
-platform $platform \
@@ -62,10 +62,10 @@ echo "o" | wine configure.exe \
cd ..
-rm -r $srcdir/mkspecs/fedora-win32-cross
+rm -r ${srcdir}/mkspecs/${platform}
-diff -urN $srcdir.orig $srcdir > qt-win-configure.patch ||:
+diff -urN ${srcdir}.orig ${srcdir} > qt-win-configure.patch ||:
-rm -r $srcdir.orig $srcdir
+rm -r ${srcdir}.orig ${srcdir}
echo qt-win-configure.patch successfully updated
More information about the scm-commits
mailing list