# HG changeset patch # User Michael Schloh von Bennewitz # Date 1306664283 -7200 # Node ID 90f1326e8f73c7b11450692ad7c79c3739137ecc # Parent 24888fe4de94086c5f3c66bf8619267db107d17e Make a third cut at needed corrections for upgrade to version 4.7.3. diff -r 24888fe4de94 -r 90f1326e8f73 qt/qt.spec --- a/qt/qt.spec Sun May 29 12:16:43 2011 +0200 +++ b/qt/qt.spec Sun May 29 12:18:03 2011 +0200 @@ -101,7 +101,7 @@ echo " qt-everywhere-opensource-src-%{version} (6 Go)" echo " qt-%{version}-.--.rpm (2 Go)" echo "Building with no options takes 3,0 hours on a dual core" - echo "2 GHz CPU, or 7 hours with all build options enabled." + echo "2 GHz CPU, or 7,0 hours with all build options enabled." ) | %{l_rpmtool} msg -b -t notice %setup -q -n qt-everywhere-opensource-src-%{version} @@ -124,6 +124,11 @@ ln -s $plat `echo $plat | %{l_shtool} subst -e 's;\(.*\)-generic-\(.*\);\1-x86-\2;'` done ) || exit $? + # Trolltech Bug: + # yes was specified for OpenVG but cannot be enabled due to functionality tests! + %{l_shtool} subst \ + -e 's;lower_case_includes;lower_case_bug;g' \ + configure %{l_shtool} subst \ -e 's;\(-z[\t ][\t ]*\)\([^\t \"][^\t \"]*\);\1"\2";g' \ configure @@ -196,10 +201,19 @@ # Trolltech Bug: # PostgreSQL support cannot be enabled due to functionality tests! # Turn on verbose messaging (-v) to ./configure to see the final report. + pgldflags=`%{l_prefix}/bin/pg_config --ldflags` + pglibs=`%{l_prefix}/bin/pg_config --libs` %{l_shtool} subst \ - -e "s;\(LIBS.*= -lpq\);\1 `%{l_prefix}/bin/pg_config --libs` $loclibs;" \ + -e "s;\(LIBS.*= -lpq\);\1 $pgldflags $pglibs $loclibs -pthread;" \ config.tests/unix/psql/psql.pro # Trolltech Bug: + # make: *** [sub-examples-make_default-ordered] Error 2 + # QMAKE_PRL_LIBS in libQtSql.prl is generated defective. + %{l_shtool} subst \ + -e "s;\$\$*QT_LFLAGS_PSQL;$pgldflags;" \ + -e "s;-lpq;-lpq $pglibs $loclibs -pthread;" \ + src/sql/drivers/psql/qsql_psql.pri + # Trolltech Bug: # Iconv support cannot be enabled due to functionality tests! # Turn on verbose messaging (-v) to ./configure to see the final report. %{l_shtool} subst \ @@ -249,12 +263,24 @@ # /home/mschloh/opwrk/tmp/qt-everywhere-opensource-src-4.7.3/mkspecs/linux-g++-64. %{l_shtool} subst \ -e 's;^\(QMAKE_INCDIR[^a-zA-Z0-9=]*=\).*;\1 %{l_prefix}/include;' \ - -e 's;^\(QMAKE_LIBDIR[^a-zA-Z0-9=]*=\).*;\1;' \ - -e 's;^\(QMAKE_INCDIR_OPENGL[^=]*=\) *\(.*\);\1 %{l_prefix}/include \2;' \ - -e 's;^\(QMAKE_LIBDIR_OPENGL[^=]*=\) *\(.*\);\1 %{l_prefix}/lib \2;' \ + -e 's;^\(QMAKE_LIBDIR[^a-zA-Z0-9=]*=\).*;\1 %{l_prefix}/lib;' \ + -e "s;^\(QMAKE_INCDIR_OPENGL[^=]*=\).*;\1 $x11_incdir;" \ + -e "s;^\(QMAKE_LIBDIR_OPENGL[^=]*=\).*;\1 $x11_libdir;" \ + -e "s;^\(QMAKE_INCDIR_OPENVG[^=]*=\).*;\1 $x11_incdir;" \ + -e "s;^\(QMAKE_LIBDIR_OPENVG[^=]*=\).*;\1 $x11_libdir;" \ -e 's;^\(QMAKE_LFLAGS_RELEASE.*\);\1 -s;' \ mkspecs/qws/*/qmake.conf \ mkspecs/*/*.conf + # Trolltech Bug: + # yes was specified for OpenVG but cannot be enabled due to functionality tests! + %{l_shtool} subst \ + -e 's;\(\$\$*\)\(QMAKE_LIBS_OPENVG\);\1\2 \1QMAKE_LIBS_THREAD;' \ + config.tests/unix/openvg/openvg.pro + %{l_shtool} subst \ + -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 $x11_incdir;" \ + -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 $x11_libdir;" \ + mkspecs/qws/*/qmake.conf \ + mkspecs/*/qmake.conf # MSvB In R/D: %{l_shtool} subst \ # MSvB In R/D: -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \ # MSvB In R/D: src/corelib/corelib.pro @@ -272,11 +298,6 @@ %{l_shtool} subst \ -e 's;\(pathToJavaScriptCoreOutput *=\) *\$\$ARGS/\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;g' \ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri -# MSvB In R/D: %{l_shtool} subst \ -# MSvB In R/D: -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 %{l_prefix}/include $x11_incdir;" \ -# MSvB In R/D: -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 %{l_prefix}/lib $x11_libdir;" \ -# MSvB In R/D: mkspecs/qws/solaris*/qmake.conf \ -# MSvB In R/D: mkspecs/solaris*/qmake.conf # MSvB In R/D: echo "QMAKE_LIBDIR += %{l_prefix}/lib/qt/dynamic" \ # MSvB In R/D: >>mkspecs/features/shared.prf # MSvB In R/D: %{l_shtool} subst \ @@ -290,6 +311,13 @@ %{l_shtool} subst \ -e 's;\(#include *"\)\(tiffio.h"\);\1tiff/\2;' \ src/gui/image/qtiffhandler.cpp + # Trolltech Bug: + # In file included from ../../../gui/image/qjpeghandler.cpp:42:0: + # ../../../gui/image/qjpeghandler_p.h:45:35: fatal error: + # QtGui/qimageiohandler.h: No such file or directory + %{l_shtool} subst \ + -e 's;\(INCLUDEPATH *\*=\)\( *\);\1 $RPM_BUILD_DIR/qt-everywhere-opensource-src-%{version}/include\2;' \ + src/gui/image/qjpeghandler.pri # MSvB In R/D: %{l_shtool} subst \ # MSvB In R/D: -e 's;\(CONFIG[\t ]*+=[\t ]*qt\);\1 x11;' \ # MSvB In R/D: tools/qtconfig/qtconfig.pro @@ -305,6 +333,14 @@ # MSvB In R/D: tools/qdoc3/doc/files/qt.qdocconf \ # MSvB In R/D: tools/qdoc3/test/qt-build-docs.qdocconf \ # MSvB In R/D: tools/qdoc3/test/qt.qdocconf + # Trolltech Bug: + # In file included from qpaintengine_vg.cpp:42:0: + # qpaintengine_vg_p.h:66:39: error: expected initializer before ':' token + # make[1]: *** [.obj/release-static/qpaintengine_vg.o] Error 1 + # make: *** [sub-openvg-sub_src_target_ordered] Error 2 + %{l_shtool} subst \ + -e 's;Q_OPENVG_EXPORT;Q_DECL_EXPORT;g' \ + src/openvg/* %build # protect against sloppy code inclusion of all unused subprojects @@ -414,6 +450,7 @@ -pch \ -dbus-linked \ -opengl \ + -openvg \ -xrender \ -fontconfig \ -freetype @@ -540,6 +577,7 @@ -pch \ -dbus-linked \ -opengl \ + -openvg \ -xrender \ -fontconfig \ -freetype @@ -686,7 +724,7 @@ %if "%{with_shared}" == "yes" # correct temporary runtime link paths (dynamic libs) %{l_shtool} subst \ - -e 's;/./;/;g' \ + -e 's;/\./;/;g' \ -e 's;\(QMAKE_PRL_BUILD_DIR[\t ]*=\).*\(qt-everywhere-opensource-src-%{version}.*\);\1 /.../\2;' \ -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;' \ $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \ @@ -694,8 +732,8 @@ # keep library paths clean by removing redundant paths %{l_shtool} subst \ -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \ - $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \ - $RPM_BUILD_ROOT%{l_prefix}/lib/*.la + $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \ + $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.la %endif ## Doesn't work as expected, because RPM reads the --[in|ex]cludedocs