# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1307974919 -7200
# Node ID 886b6dad933aa47a2fe7df7cea37cb34ceab963a
# Parent  062212fbda047a44102232e415091c66a921b164
Correct, adjust, and improve build configuration, nearing stable state:
Adjust freetype config due to custom lib name, remove nearly all
parallel make logic due to rule dependency errors, and resume iconv
corrections.

diff -r 062212fbda04 -r 886b6dad933a qt/qt.spec
--- a/qt/qt.spec	Wed Jun 08 21:12:01 2011 +0200
+++ b/qt/qt.spec	Mon Jun 13 16:21:59 2011 +0200
@@ -166,10 +166,10 @@
         -e 's;\(QT_CFLAGS_GLIB *=.*PKG_CONFIG.*\) --cflags-only-other ;\1 --cflags ;g' \
         -e 's;\(QT_CFLAGS_QGTKSTYLE *=.*PKG_CONFIG.*\) --cflags-only-other ;\1 --cflags ;g' \
         configure
-# MSvB In R/D:    %{l_shtool} subst \
-# MSvB In R/D:        -e 's;\(TRY_INCLUDEPATHS = \).*\(\$\$INCLUDEPATH\);\1\2;' \
-# MSvB In R/D:        -e 's;/freetype2;/freetype;' \
-# MSvB In R/D:        config.tests/unix/freetype/freetype.pri
+    %{l_shtool} subst \
+        -e 's;\(TRY_INCLUDEPATHS = \).*\(\$\$INCLUDEPATH\);\1\2;' \
+        -e 's;/freetype2;/freetype;' \
+        config.tests/unix/freetype/freetype.pri
     #   Trolltech Bug:
     #   /opdv/lib/libmng.a(libmng_cms.o): In function `mnglcms_initlibrary':
     #   libmng_cms.c:(.text+0xa): undefined reference to `cmsErrorAction'
@@ -276,14 +276,16 @@
     %{l_shtool} subst \
         -e 's;\(\$\$*\)\(QMAKE_LIBS_OPENVG\);\1\2 \1QMAKE_LIBS_THREAD;' \
         config.tests/unix/openvg/openvg.pro
+    echo 'QMAKE_LIBS_OPENVG = -lOpenVG' \
+        >>mkspecs/common/unix.conf
     %{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
+    %{l_shtool} subst \
+        -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
+        src/corelib/corelib.pro
     #   Trolltech Bug:
     #   In file included from ../JavaScriptCore/runtime/RegExp.h:29:0,
     #   ../JavaScriptCore/yarr/RegexJIT.h: In destructor 'JSC::Yarr::RegexCodeBlock::~RegexCodeBlock()':
@@ -460,11 +462,23 @@
     #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
 
     #   carry out shared build procedure
+    #   Trolltech Bug:
+    #   Problem with dependency order, causes compiling of source files
+    #     with unconfigured dependencies to other files to fail when
+    #     building the sources in parallel. The implemented work around
+    #     is disabling parallel make, causing a nearly 100% build deceleration.
+    #   itemviews/qlistview.cpp: In member function 'void QListModeViewBase::dragMoveEvent(QDragMoveEvent*)':
+    #   itemviews/qlistview.cpp:3134:1: internal compiler error: Segmentation fault
     ( cd src
-      %{l_make} %{l_mflags -O} \
+      %{l_make} %{l_mflags} \
           sub-moc sub-rcc sub-uic sub-uic3
     ) || exit $?
-    %{l_make} %{l_mflags -O} \
+    #   Trolltech Bug:
+    #   Problem with dependency order, causes compiling of source files
+    #     with unconfigured dependencies to other files to fail when
+    #     building the sources in parallel. The implemented work around
+    #     is disabling parallel make, causing a nearly 100% build deceleration.
+    %{l_make} %{l_mflags} \
         sub-corelib-make_default-ordered \
         sub-xml-make_default-ordered \
         sub-network-make_default-ordered \
@@ -601,7 +615,17 @@
       sub-tools-make_default-ordered sub-translations-make_default-ordered
 %endif
 %if "%{with_examples}" == "yes"
-    %{l_make} %{l_mflags -O} \
+    #   Trolltech Bug:
+    #   Another problem with dependency order with the same work around,
+    #     disabling parallel make and causing a nearly 100% build deceleration.
+    #   In file included from main.cpp:136:0:
+    #   .moc/release-static/main.moc:84:1: internal compiler error: Segmentation fault
+    #   Please submit a full bug report,
+    #   with preprocessed source if appropriate.
+    #   See <http://openpkg.org/> for instructions.
+    #   make[3]: *** [.obj/release-static/main.o] Error 1
+    #   make[2]: *** [sub-validators-make_default] Error 2
+    %{l_make} %{l_mflags} \
         sub-demos-make_default-ordered \
         sub-examples-make_default-ordered
 %endif