X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=qt-win%2Fqt-win-configure.sh;fp=qt-win%2Fqt-win-configure.sh;h=d6719e671f8c81fec1a6c1cfd992f49636709dba;hb=be15d9d51e251a8dcd4fec88db7a289a37072aa0;hp=2fc68f96237f22a152d6f7951b7f10eef353e06c;hpb=7098fa61f37cbf5c6b5497b15903dd22d11f9e4d;p=fedora-mingw.git

diff --git a/qt-win/qt-win-configure.sh b/qt-win/qt-win-configure.sh
index 2fc68f9..d6719e6 100755
--- a/qt-win/qt-win-configure.sh
+++ b/qt-win/qt-win-configure.sh
@@ -4,9 +4,45 @@
 #   . wine
 #   . qt-devel
 #   . mingw32-filesystem
+# and you need to have downloaded the source zip file.  Run this
+# command from the RPM SOURCES directory in order to (re-)create
+# qt-win-configure.patch
+
+# Notes:
+#   . -no-mmx is needed because we didn't enable MMX instructions
+#     when building GCC (I think?).  The error is:
+#     /usr/lib64/gcc/i686-pc-mingw32/4.3.2/include/mmintrin.h:35:3:
+#     error: #error "MMX instruction set not enabled"
+#   . Same as above for -no-sse and -no-sse2
+
+version=4.4.3
+platform=fedora-win32-cross
+
+set -e
+
+if [ ! -f qt-win-opensource-src-$version.zip -o \
+     ! -f qmake.conf -o \
+     ! -f qplatformdefs.h ]; then
+  echo "You're trying to run this from the wrong directory."
+  echo "Run it from the RPM SOURCES directory, or Fedora CVS checkout."
+  exit 1
+fi
+
+echo "Unpacking source file ... (this can take a minute or two)"
+
+srcdir=qt-win-opensource-src-$version
+
+rm -rf $srcdir.orig $srcdir
+
+unzip -qq qt-win-opensource-src-$version.zip
+cp -a $srcdir $srcdir.orig
+mkdir $srcdir/mkspecs/fedora-win32-cross
+cp qmake.conf qplatformdefs.h $srcdir/mkspecs/fedora-win32-cross
+
+cd $srcdir
 
 wine configure.exe \
-  -platform win32-g++ \
+  -platform $platform \
   -confirm-license \
   -no-qmake \
   -dont-process \
@@ -20,5 +56,16 @@ wine configure.exe \
   -libdir $(rpm --eval %{_mingw32_libdir}) \
   -plugindir $(rpm --eval %{_mingw32_libdir})/qt4/plugins \
   -translationdir $(rpm --eval %{_mingw32_datadir})/qt4/translations \
+  -no-mmx -no-sse -no-sse2 \
   -release \
-  -shared
+  -shared > configure.output 2>&1
+
+cd ..
+
+rm -r $srcdir/mkspecs/fedora-win32-cross
+
+diff -urN $srcdir.orig $srcdir > qt-win-configure.patch ||:
+
+rm -r $srcdir.orig $srcdir
+
+echo qt-win-configure.patch successfully updated
\ No newline at end of file