CVS: moonbase/libs/wxPython BUILD, 1.3, 1.4 CONFIGURE, 1.1, 1.2 DEPENDS, 1.3, 1.4 DETAILS, 1.5, 1.6

[jmhodges at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/libs/wxPython
In directory dbguin.lunar-linux.org:/tmp/cvs-serv2638

Modified Files:
	BUILD CONFIGURE DEPENDS DETAILS 
Log Message:
some of you think im committing a crime against humanity for messing    
with wxPython, i on the other hand am happy i can now run pype.  Version 
bump and with it a fairly large retooling of the module (read: it 
compiles, unlike the last one).  have fun kiddies



Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	12 Apr 2003 19:56:22 -0000	1.3
+++ BUILD	22 Jul 2003 04:28:30 -0000	1.4
@@ -1,16 +1,31 @@
 (
   if [[ $GTK2 == "y" ]]; then
-    OPTS="$OPTS WXPORT=gtk2 "
+    PGTK="WXPORT=gtk2 "
+    CGTK="--enable-gtk2"
   fi
   if [[ $UNICODE == "y" ]]; then
-    OPTS="$OPTS UNICODE=1"
+    PUNI="UNICODE=1"
+    CUNI="--enable-unicode"
   fi
-
+  if [[ $OPENGL == "n" ]]; then
+    PGL="BUILD_GLCANVS=0";  else 
+    CGL="--with-opengl"
+  fi
+POPTS="$PGTK $PUNI $PGL" 
+OPTS="$OPTS $CGTK $CUNI $CGL"
+#Install wxGTK that comes with wxPython
+    ./configure 	--with-gtk \
+               		--prefix=/usr \
+                	--enable-geometry \
+                     	--enable-optimise \
+                     	--enable-debug_flag \
+			$OPTS  &&
+    make &&
+    make install &&
     cd $SOURCE_DIRECTORY/wxPython   &&
     python setup.py                 \
-        $OPTS                       \
-	BUILD_GLCANVAS=0            \
-        build install
+        $POPTS                       \
+	build install
 
     
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	12 Apr 2003 19:56:22 -0000	1.1
+++ CONFIGURE	22 Jul 2003 04:28:30 -0000	1.2
@@ -1,5 +1,5 @@
 if  !  grep  -q  "GTK2"  $MODULE_CONFIG;  then
-  if    query  "Enable Gtk+ 2x support?" y
+ if    query  "Enable Gtk+ 2x support?" y
   then  echo   "GTK2=y"  >>  $MODULE_CONFIG
   else  echo   "GTK2=n"  >>  $MODULE_CONFIG
   fi
@@ -11,3 +11,9 @@
   fi
 fi
 
+if ! grep -q "OPENGL" $MODULE_CONFIG; then
+ if   query "Enable OpenGL support?" y
+  then echo "OPENGL=y" >> $MODULE_CONFIG
+  else echo "OPENGL=n" >> $MODULE_CONFIG
+ fi
+fi

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	12 Apr 2003 19:56:22 -0000	1.3
+++ DEPENDS	22 Jul 2003 04:28:30 -0000	1.4
@@ -1,4 +1,3 @@
 depends		Python			&&
-depends		wxGTK 			&&
 optional_depends    "PyOpenGL"	 ""   ""  "for OpenGL support"
 optional_depends "gtk+-2" "" "" "for gtk+2 support"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	12 Apr 2003 19:57:57 -0000	1.5
+++ DETAILS	22 Jul 2003 04:28:30 -0000	1.6
@@ -1,11 +1,11 @@
           MODULE=wxPython
-         VERSION=2.4.0.7
+         VERSION=2.4.1.2
           SOURCE=${MODULE}Src-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}Src-$VERSION
    SOURCE_URL[0]=$SFORGE_URL/wxpython/$SOURCE
         WEB_SITE=http://www.wxpython.org
          ENTERED=20010927
-         UPDATED=20030412
+         UPDATED=20030722
            SHORT="wxPython is a GUI toolkit for the Python programming language"
 
 cat << EOF