[SM-Commit] PERFORCE change 80390 by Arwed von Merkatz for review

Perforce Review Daemon p4review at smee.org
Thu Jun 8 15:35:01 EDT 2006


Change 80390 by arwed_von_merkatz at arwed-Otherland on 2006/06/08 20:30:08

	export WX_CONTRIB and persistent_read it instead of just sourcing a foreign
	config file in wxpython, removed swig option as it doesn't work

Affected files ...

... //sgl/grimoires/devel/x11-toolkits/wxgtk/EXPORTS#1 add
... //sgl/grimoires/devel/x11-toolkits/wxgtk/HISTORY#27 edit
... //sgl/grimoires/devel/x11-toolkits/wxgtk/REPAIR^none^EXPORTS#1 add
... //sgl/grimoires/devel/x11-toolkits/wxpython/BUILD#4 edit
... //sgl/grimoires/devel/x11-toolkits/wxpython/DEPENDS#4 edit
... //sgl/grimoires/devel/x11-toolkits/wxpython/HISTORY#11 edit

Differences ...

==== //sgl/grimoires/devel/x11-toolkits/wxgtk/HISTORY#27 (text) ====

@@ -1,3 +1,7 @@
+2006-06-08 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* EXPORTS, REPAIR^none^EXPORTS: export the WX_CONTRIB variable, needed
+	  by wxpython
+
 2006-05-24 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: use -2 in patchfile name, rather than $PATCHLEVEL
 

==== //sgl/grimoires/devel/x11-toolkits/wxpython/BUILD#4 (xtext) ====

@@ -1,10 +1,10 @@
-source $DEPENDS_CONFIG/wxgtk.p &&
+persistent_read  wxgtk  WX_CONTRIB  WX_CONTRIB  &&
 
 PYOPTS='MONOLITHIC=0 UNICODE=1' &&
 for COMPONENT in $WX_CONTRIB; do
   PYOPTS="$PYOPTS BUILD_$(echo $COMPONENT | tr '[:lower:]' '[:upper:]')=1"
 done &&
-if echo $OPTS | grep -q with-swig; then PYOPTS="$PYOPTS USE_SWIG=1"; fi &&
+#if echo $OPTS | grep -q with-swig; then PYOPTS="$PYOPTS USE_SWIG=1"; fi &&
 
 cd wxPython &&
 python setup.py $PYOPTS build

==== //sgl/grimoires/devel/x11-toolkits/wxpython/DEPENDS#4 (xtext) ====

@@ -1,10 +1,10 @@
 depends  python  &&
-# TODO need subdepends on Python bindings of libxml2 here
-depends  libxml2 &&
-depends  wxgtk   &&
+depends -sub python  libxml2 &&
+depends  wxgtk
 
+# disabled, doesn't work with swig 1.3.28
 # SWIG option is fake and is only used in our BUILD file
-optional_depends  swig           \
-                  '--with-swig'  \
-                  ''             \
-                  'to regenerate wrappers from SWIG descriptors'
+#optional_depends  swig           \
+#                  '--with-swig'  \
+#                  ''             \
+#                  'to regenerate wrappers from SWIG descriptors'

==== //sgl/grimoires/devel/x11-toolkits/wxpython/HISTORY#11 (text) ====

@@ -1,3 +1,9 @@
+2006-06-08 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* BUILD: use persistent_read instad of sourcing the wxgtk.p file
+	* DEPENDS: added sub_depends on libxml2 python bindings
+	* BUILD, DEPENDS: commented the swig option as it's broken with swig
+	  1.3.28
+
 2006-04-13 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 2.6.3.2
 



More information about the SM-Commit mailing list