[SM-Commit] PERFORCE change 80208 by Daniel Goller for review

Arwed von Merkatz v.merkatz at gmx.net
Sun Jun 4 19:04:08 EDT 2006


On Sun, Jun 04, 2006 at 11:55:01PM +0100, Perforce Review Daemon wrote:
> Change 80208 by daniel_goller at daniel_goller on 2006/06/04 23:54:27
> 
> 	always enabling STL support to allow celestia and scribus to build properly, if we do not want to use external stlport
> 
> Affected files ...
> 
> ... //sgl/grimoires/devel/x11-toolkits/qt4/BUILD#4 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/CONFIGURE#2 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/DEPENDS#2 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/DETAILS#6 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/HISTORY#10 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/INSTALL#4 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/PROVIDES#2 edit
> ... //sgl/grimoires/devel/x11-toolkits/qt4/qt.sh#2 edit
> 
> Differences ...
[...]
> ==== //sgl/grimoires/devel/x11-toolkits/qt4/CONFIGURE#2 (xtext) ====
> 
> 

You shouldn't submit empty edits. Just do a 'p4 revert -a' before
submitting, that will close all unmodified files that were opened for
edit.

> ==== //sgl/grimoires/devel/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/devel/x11-toolkits/qt4/DETAILS#6 (xtext) ====
> 
> 
> ==== //sgl/grimoires/devel/x11-toolkits/qt4/HISTORY#10 (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/devel/x11-toolkits/qt4/INSTALL#4 (xtext) ====
> 
> 
> ==== //sgl/grimoires/devel/x11-toolkits/qt4/PROVIDES#2 (xtext) ====
> 
> 
> ==== //sgl/grimoires/devel/x11-toolkits/qt4/qt.sh#2 (text) ====
> 
> _______________________________________________
> SM-Commit mailing list
> SM-Commit at lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
> 

-- 
Arwed v. Merkatz                              Source Mage GNU/Linux developer
                                                    http://www.sourcemage.org



More information about the SM-Commit mailing list