[SM-Commit] PERFORCE change 80210 by Daniel Goller for review
Perforce Review Daemon
p4review at smee.org
Sun Jun 4 19:05:01 EDT 2006
Change 80210 by daniel_goller at daniel_goller on 2006/06/05 00:02:50
integrating from devel
Affected files ...
... //sgl/grimoires/test/x11-toolkits/qt4/BUILD#3 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/CONFIGURE#2 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/DEPENDS#2 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/DETAILS#5 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/HISTORY#6 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/INSTALL#2 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/PROVIDES#2 integrate
... //sgl/grimoires/test/x11-toolkits/qt4/qt.sh#2 integrate
Differences ...
==== //sgl/grimoires/test/x11-toolkits/qt4/BUILD#3 (xtext) ====
@@ -11,19 +11,20 @@
$QT_GIF \
$OPTS" &&
-echo "yes" | ./configure \
- -prefix $INSTALL_ROOT/usr/ \
- -bindir $INSTALL_ROOT/usr/bin/qt4 \
- -libdir $INSTALL_ROOT/usr/lib/qt4 \
- -docdir $INSTALL_ROOT/usr/share/doc/qt4 \
- -headerdir $INSTALL_ROOT/usr/include/qt4 \
- -plugindir $INSTALL_ROOT/usr/lib/qt4/plugins \
- -sysconfdir $INSTALL_ROOT/etc/qt4 \
+echo "yes" | ./configure \
+ -prefix $INSTALL_ROOT/usr/ \
+ -bindir $INSTALL_ROOT/usr/bin/qt4 \
+ -libdir $INSTALL_ROOT/usr/lib/qt4 \
+ -docdir $INSTALL_ROOT/usr/share/doc/qt4 \
+ -headerdir $INSTALL_ROOT/usr/include/qt4 \
+ -plugindir $INSTALL_ROOT/usr/lib/qt4/plugins \
+ -sysconfdir $INSTALL_ROOT/etc/qt4 \
-translationdir $INSTALL_ROOT//usr/share/doc/qt4/translations \
- -examplesdir $INSTALL_ROOT/usr/share/doc/qt4/examples \
- -demosdir $INSTALL_ROOT/usr/share/doc/qt4/demos \
- -datadir $INSTALL_ROOT/usr/share/qt4 \
- -platform linux-g++ \
- $OPTS &&
+ -examplesdir $INSTALL_ROOT/usr/share/doc/qt4/examples \
+ -demosdir $INSTALL_ROOT/usr/share/doc/qt4/demos \
+ -datadir $INSTALL_ROOT/usr/share/qt4 \
+ -platform linux-g++ \
+ -stl \
+ $OPTS &&
make
==== //sgl/grimoires/test/x11-toolkits/qt4/CONFIGURE#2 (xtext) ====
==== //sgl/grimoires/test/x11-toolkits/qt4/DEPENDS#2 (xtext) ====
@@ -23,8 +23,8 @@
'to use the system png library' &&
optional_depends stlport \
- '-stl' \
- '-no-stl' \
+ '' \
+ '' \
'for stlport support' &&
optional_depends firebird \
==== //sgl/grimoires/test/x11-toolkits/qt4/DETAILS#5 (xtext) ====
==== //sgl/grimoires/test/x11-toolkits/qt4/HISTORY#6 (text) ====
@@ -1,3 +1,8 @@
+2006-06-04 Daniel Goller <morfic at sourcemage.org>
+ * DEPENDS: remove -stl/-no-stl flags from optional stlport depend to avoid turning off STL support
+ * BUILD: add -stl to configure to ensure building with STL support,
+ fixes build errors with celestia and scribus that depend on it
+
2006-05-22 Treeve Jelbert <treeve01 at pi.be>
* DETAILS: Updated to 4.1.3
* BUILD: remove invoke_gcc ( done in default_pre_build)
==== //sgl/grimoires/test/x11-toolkits/qt4/INSTALL#2 (xtext) ====
==== //sgl/grimoires/test/x11-toolkits/qt4/PROVIDES#2 (xtext) ====
==== //sgl/grimoires/test/x11-toolkits/qt4/qt.sh#2 (text) ====
More information about the SM-Commit
mailing list