[Lunar-commits] CVS: moonbase/libs/wxGTK BUILD, 1.5, 1.6 DEPENDS, 1.3, 1.4 DETAILS, 1.9, 1.10 CONFIGURE, 1.3, NONE

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/libs/wxGTK
In directory espresso.foo-projects.org:/tmp/cvs-serv19805/wxGTK

Modified Files:
	BUILD DEPENDS DETAILS 
Removed Files:
	CONFIGURE 
Log Message:
Whoever has been maintaining these modules .. he didn't catch up very well:
- Both can't be compiled with OpenGL support since there is no Mesa module (yet)
- CONFIGURE questioning is not the right way for enabling stuff (use DEPENDS)
- wxPython does not depend on wxGTK
- wxPython has autotools stuff .. use it
- wxPython depends on GTK2
- Bumped wxPython to 2.5.2.8, added sha1 checksums for both modules
- minor tweaks


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxGTK/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	20 Sep 2004 21:15:37 -0000	1.5
+++ BUILD	17 Oct 2004 12:25:55 -0000	1.6
@@ -1,12 +1,6 @@
-(
-  
-  if [[ $GTK2 == "y" ]]; then
-    OPTS="$OPTS --enable-gtk2 "
-  fi
-  if [[ $OPENGL == "y" ]]; then
-    OPTS="$OPTS --with-opengl"
-  fi
-  patch_it $SOURCE2 0 &&
+( 
+  patch_it $SOURCE2 0	&&
+
   ./configure   --with-gtk \
                 --prefix=/usr \
                 --enable-geometry \

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxGTK/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	10 Aug 2003 02:51:14 -0000	1.3
+++ DEPENDS	17 Oct 2004 12:25:55 -0000	1.4
@@ -2,4 +2,4 @@
 depends  nasm   &&
 depends  bison  &&
 depends  flex   &&
-optional_depends "gtk+-2" "" "" "for gtk+2 support"
+optional_depends "gtk+-2" "--enable-gtk2" "" "for gtk+2 support"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxGTK/DETAILS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DETAILS	5 Oct 2004 09:30:11 -0000	1.9
+++ DETAILS	17 Oct 2004 12:25:55 -0000	1.10
@@ -1,11 +1,11 @@
           MODULE=wxGTK
-         VERSION=2.4.2.4
-          SOURCE=wxPythonSrc-$VERSION.tar.gz 
+         VERSION=2.4.2
+          SOURCE=wxGTK-$VERSION.tar.bz2
 	 SOURCE2=wxGTK242_noprivatefuncs.diff
-      SOURCE_VFY=sha1:61d339c962a48128e6c7b8a7b93999759ea218e3
+      SOURCE_VFY=sha1:3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
      SOURCE2_VFY=sha1:01d792d0c44b5e81d111d652d3a2972888943117
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxPythonSrc-$VERSION
-      SOURCE_URL=$SFORGE_URL/wxpython/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+      SOURCE_URL=$SFORGE_URL/wxwindows/
      SOURCE2_URL=ftp://ftp.excelcia.org/patches/
         WEB_SITE=http://www.wxwidgets.org/
          ENTERED=20011217

--- CONFIGURE DELETED ---