Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80210 by Daniel Goller for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 80210 by Daniel Goller for review
  • Date: Mon, 5 Jun 2006 00:05:01 +0100 (BST)

Change 80210 by daniel_goller@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) ====




  • [SM-Commit] PERFORCE change 80210 by Daniel Goller for review, Perforce Review Daemon, 06/04/2006

Archive powered by MHonArc 2.6.24.

Top of Page