changeset
Make a third cut at needed corrections for upgrade to version 4.7.3.
Sun, 29 May 2011 12:18:03 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sun, 29 May 2011 12:18:03 +0200
- changeset 342
- 90f1326e8f73
- parent 341
- 24888fe4de94
- child 343
- 1bee42cde1f7
Make a third cut at needed corrections for upgrade to version 4.7.3.
| qt/qt.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/qt/qt.spec Sun May 29 12:16:43 2011 +0200 1.2 +++ b/qt/qt.spec Sun May 29 12:18:03 2011 +0200 1.3 @@ -101,7 +101,7 @@ 1.4 echo " qt-everywhere-opensource-src-%{version} (6 Go)" 1.5 echo " qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (2 Go)" 1.6 echo "Building with no options takes 3,0 hours on a dual core" 1.7 - echo "2 GHz CPU, or 7 hours with all build options enabled." 1.8 + echo "2 GHz CPU, or 7,0 hours with all build options enabled." 1.9 ) | %{l_rpmtool} msg -b -t notice 1.10 1.11 %setup -q -n qt-everywhere-opensource-src-%{version} 1.12 @@ -124,6 +124,11 @@ 1.13 ln -s $plat `echo $plat | %{l_shtool} subst -e 's;\(.*\)-generic-\(.*\);\1-x86-\2;'` 1.14 done 1.15 ) || exit $? 1.16 + # Trolltech Bug: 1.17 + # yes was specified for OpenVG but cannot be enabled due to functionality tests! 1.18 + %{l_shtool} subst \ 1.19 + -e 's;lower_case_includes;lower_case_bug;g' \ 1.20 + configure 1.21 %{l_shtool} subst \ 1.22 -e 's;\(-z[\t ][\t ]*\)\([^\t \"][^\t \"]*\);\1"\2";g' \ 1.23 configure 1.24 @@ -196,10 +201,19 @@ 1.25 # Trolltech Bug: 1.26 # PostgreSQL support cannot be enabled due to functionality tests! 1.27 # Turn on verbose messaging (-v) to ./configure to see the final report. 1.28 + pgldflags=`%{l_prefix}/bin/pg_config --ldflags` 1.29 + pglibs=`%{l_prefix}/bin/pg_config --libs` 1.30 %{l_shtool} subst \ 1.31 - -e "s;\(LIBS.*= -lpq\);\1 `%{l_prefix}/bin/pg_config --libs` $loclibs;" \ 1.32 + -e "s;\(LIBS.*= -lpq\);\1 $pgldflags $pglibs $loclibs -pthread;" \ 1.33 config.tests/unix/psql/psql.pro 1.34 # Trolltech Bug: 1.35 + # make: *** [sub-examples-make_default-ordered] Error 2 1.36 + # QMAKE_PRL_LIBS in libQtSql.prl is generated defective. 1.37 + %{l_shtool} subst \ 1.38 + -e "s;\$\$*QT_LFLAGS_PSQL;$pgldflags;" \ 1.39 + -e "s;-lpq;-lpq $pglibs $loclibs -pthread;" \ 1.40 + src/sql/drivers/psql/qsql_psql.pri 1.41 + # Trolltech Bug: 1.42 # Iconv support cannot be enabled due to functionality tests! 1.43 # Turn on verbose messaging (-v) to ./configure to see the final report. 1.44 %{l_shtool} subst \ 1.45 @@ -249,12 +263,24 @@ 1.46 # /home/mschloh/opwrk/tmp/qt-everywhere-opensource-src-4.7.3/mkspecs/linux-g++-64. 1.47 %{l_shtool} subst \ 1.48 -e 's;^\(QMAKE_INCDIR[^a-zA-Z0-9=]*=\).*;\1 %{l_prefix}/include;' \ 1.49 - -e 's;^\(QMAKE_LIBDIR[^a-zA-Z0-9=]*=\).*;\1;' \ 1.50 - -e 's;^\(QMAKE_INCDIR_OPENGL[^=]*=\) *\(.*\);\1 %{l_prefix}/include \2;' \ 1.51 - -e 's;^\(QMAKE_LIBDIR_OPENGL[^=]*=\) *\(.*\);\1 %{l_prefix}/lib \2;' \ 1.52 + -e 's;^\(QMAKE_LIBDIR[^a-zA-Z0-9=]*=\).*;\1 %{l_prefix}/lib;' \ 1.53 + -e "s;^\(QMAKE_INCDIR_OPENGL[^=]*=\).*;\1 $x11_incdir;" \ 1.54 + -e "s;^\(QMAKE_LIBDIR_OPENGL[^=]*=\).*;\1 $x11_libdir;" \ 1.55 + -e "s;^\(QMAKE_INCDIR_OPENVG[^=]*=\).*;\1 $x11_incdir;" \ 1.56 + -e "s;^\(QMAKE_LIBDIR_OPENVG[^=]*=\).*;\1 $x11_libdir;" \ 1.57 -e 's;^\(QMAKE_LFLAGS_RELEASE.*\);\1 -s;' \ 1.58 mkspecs/qws/*/qmake.conf \ 1.59 mkspecs/*/*.conf 1.60 + # Trolltech Bug: 1.61 + # yes was specified for OpenVG but cannot be enabled due to functionality tests! 1.62 + %{l_shtool} subst \ 1.63 + -e 's;\(\$\$*\)\(QMAKE_LIBS_OPENVG\);\1\2 \1QMAKE_LIBS_THREAD;' \ 1.64 + config.tests/unix/openvg/openvg.pro 1.65 + %{l_shtool} subst \ 1.66 + -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 $x11_incdir;" \ 1.67 + -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 $x11_libdir;" \ 1.68 + mkspecs/qws/*/qmake.conf \ 1.69 + mkspecs/*/qmake.conf 1.70 # MSvB In R/D: %{l_shtool} subst \ 1.71 # MSvB In R/D: -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \ 1.72 # MSvB In R/D: src/corelib/corelib.pro 1.73 @@ -272,11 +298,6 @@ 1.74 %{l_shtool} subst \ 1.75 -e 's;\(pathToJavaScriptCoreOutput *=\) *\$\$ARGS/\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;g' \ 1.76 src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri 1.77 -# MSvB In R/D: %{l_shtool} subst \ 1.78 -# MSvB In R/D: -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 %{l_prefix}/include $x11_incdir;" \ 1.79 -# MSvB In R/D: -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 %{l_prefix}/lib $x11_libdir;" \ 1.80 -# MSvB In R/D: mkspecs/qws/solaris*/qmake.conf \ 1.81 -# MSvB In R/D: mkspecs/solaris*/qmake.conf 1.82 # MSvB In R/D: echo "QMAKE_LIBDIR += %{l_prefix}/lib/qt/dynamic" \ 1.83 # MSvB In R/D: >>mkspecs/features/shared.prf 1.84 # MSvB In R/D: %{l_shtool} subst \ 1.85 @@ -290,6 +311,13 @@ 1.86 %{l_shtool} subst \ 1.87 -e 's;\(#include *"\)\(tiffio.h"\);\1tiff/\2;' \ 1.88 src/gui/image/qtiffhandler.cpp 1.89 + # Trolltech Bug: 1.90 + # In file included from ../../../gui/image/qjpeghandler.cpp:42:0: 1.91 + # ../../../gui/image/qjpeghandler_p.h:45:35: fatal error: 1.92 + # QtGui/qimageiohandler.h: No such file or directory 1.93 + %{l_shtool} subst \ 1.94 + -e 's;\(INCLUDEPATH *\*=\)\( *\);\1 $RPM_BUILD_DIR/qt-everywhere-opensource-src-%{version}/include\2;' \ 1.95 + src/gui/image/qjpeghandler.pri 1.96 # MSvB In R/D: %{l_shtool} subst \ 1.97 # MSvB In R/D: -e 's;\(CONFIG[\t ]*+=[\t ]*qt\);\1 x11;' \ 1.98 # MSvB In R/D: tools/qtconfig/qtconfig.pro 1.99 @@ -305,6 +333,14 @@ 1.100 # MSvB In R/D: tools/qdoc3/doc/files/qt.qdocconf \ 1.101 # MSvB In R/D: tools/qdoc3/test/qt-build-docs.qdocconf \ 1.102 # MSvB In R/D: tools/qdoc3/test/qt.qdocconf 1.103 + # Trolltech Bug: 1.104 + # In file included from qpaintengine_vg.cpp:42:0: 1.105 + # qpaintengine_vg_p.h:66:39: error: expected initializer before ':' token 1.106 + # make[1]: *** [.obj/release-static/qpaintengine_vg.o] Error 1 1.107 + # make: *** [sub-openvg-sub_src_target_ordered] Error 2 1.108 + %{l_shtool} subst \ 1.109 + -e 's;Q_OPENVG_EXPORT;Q_DECL_EXPORT;g' \ 1.110 + src/openvg/* 1.111 1.112 %build 1.113 # protect against sloppy code inclusion of all unused subprojects 1.114 @@ -414,6 +450,7 @@ 1.115 -pch \ 1.116 -dbus-linked \ 1.117 -opengl \ 1.118 + -openvg \ 1.119 -xrender \ 1.120 -fontconfig \ 1.121 -freetype 1.122 @@ -540,6 +577,7 @@ 1.123 -pch \ 1.124 -dbus-linked \ 1.125 -opengl \ 1.126 + -openvg \ 1.127 -xrender \ 1.128 -fontconfig \ 1.129 -freetype 1.130 @@ -686,7 +724,7 @@ 1.131 %if "%{with_shared}" == "yes" 1.132 # correct temporary runtime link paths (dynamic libs) 1.133 %{l_shtool} subst \ 1.134 - -e 's;/./;/;g' \ 1.135 + -e 's;/\./;/;g' \ 1.136 -e 's;\(QMAKE_PRL_BUILD_DIR[\t ]*=\).*\(qt-everywhere-opensource-src-%{version}.*\);\1 /.../\2;' \ 1.137 -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;' \ 1.138 $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \ 1.139 @@ -694,8 +732,8 @@ 1.140 # keep library paths clean by removing redundant paths 1.141 %{l_shtool} subst \ 1.142 -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \ 1.143 - $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \ 1.144 - $RPM_BUILD_ROOT%{l_prefix}/lib/*.la 1.145 + $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \ 1.146 + $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.la 1.147 %endif 1.148 1.149 ## Doesn't work as expected, because RPM reads the --[in|ex]cludedocs
