From 39994f903db9638633027951e64f7ca980ff8647 Mon Sep 17 00:00:00 2001
From: tchan <tchan@fe636330-a7f5-0310-8408-fdd8893149bb>
Date: Sun, 5 Jun 2005 01:48:12 +0000
Subject: [PATCH] Version bump to wxPython-2.6.1.0 (latest stable) and
 wxGTK-2.6.1.0 (AKA wxWidgets). Made the necessary changes to get both modules
 to compile/install.  Tested wxGTK with a jaffm and Python-2.4.1 and the
 demo.py that is part of the wxPython-src tarball.  Added some
 optional_depends to wxGTK (SDL, libgnomeprint).

git-svn-id: svn+ssh://tchan@foo-projects.org/var/svn/lunar/moonbase/trunk@15261 fe636330-a7f5-0310-8408-fdd8893149bb
---
 libs/wxGTK/BUILD      |  4 +---
 libs/wxGTK/DEPENDS    |  5 +++--
 libs/wxGTK/DETAILS    | 13 +++++--------
 libs/wxPython/BUILD   |  4 ++--
 libs/wxPython/DETAILS | 13 +++++++------
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/libs/wxGTK/BUILD b/libs/wxGTK/BUILD
index fd04709f0fd..de189da1e59 100644
--- a/libs/wxGTK/BUILD
+++ b/libs/wxGTK/BUILD
@@ -1,9 +1,7 @@
 ( 
-  patch_it $SOURCE2 0  &&
-
   ./configure   --build=$BUILD	\
                 --prefix=/usr  \
-		--enable-gtk2  \
+		--with-gtk  \
 		--enable-unicode  \
 		--enable-optimise  \
 		$OPTS  &&
diff --git a/libs/wxGTK/DEPENDS b/libs/wxGTK/DEPENDS
index 933682e1fb6..3d71b8afbfb 100644
--- a/libs/wxGTK/DEPENDS
+++ b/libs/wxGTK/DEPENDS
@@ -1,5 +1,6 @@
-depends  gtk+   &&
 depends  nasm   &&
 depends  bison  &&
 depends  flex   &&
-depends  gtk+-2
+depends  gtk+-2 &&
+optional_depends "SDL" "--with-sdl" "" "Use SDL for audio" &&
+optional_depends "libgnomeprint" "--with-gnomeprint" "" "For gnomeprint support" 
diff --git a/libs/wxGTK/DETAILS b/libs/wxGTK/DETAILS
index dc8db16e241..9e12af0befe 100644
--- a/libs/wxGTK/DETAILS
+++ b/libs/wxGTK/DETAILS
@@ -1,15 +1,12 @@
           MODULE=wxGTK
-         VERSION=2.4.2.4
-          SOURCE=wxPythonSrc-$VERSION.tar.gz
-	 SOURCE2=wxGTK242_noprivatefuncs.diff
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxPythonSrc-$VERSION
+         VERSION=2.6.1.0
+          SOURCE=wxPython-src-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxPython-src-$VERSION
       SOURCE_URL=$SFORGE_URL/wxpython/
-     SOURCE2_URL=ftp://ftp.excelcia.org/patches/
-      SOURCE_VFY=sha1:61d339c962a48128e6c7b8a7b93999759ea218e3
-     SOURCE2_VFY=sha1:01d792d0c44b5e81d111d652d3a2972888943117
+      SOURCE_VFY=sha1:e7f46b0eb83fb0e316e0d5b49fd38b3b7f00b95b
         WEB_SITE=http://www.wxwidgets.org/
          ENTERED=20011217
-         UPDATED=20040920
+         UPDATED=20050604
 
 SHORT="wxGTK is a GTK+ verion of wxWindows API."
 cat << EOF
diff --git a/libs/wxPython/BUILD b/libs/wxPython/BUILD
index 640c73c19a4..70fa55a1cc3 100644
--- a/libs/wxPython/BUILD
+++ b/libs/wxPython/BUILD
@@ -4,8 +4,8 @@
   prepare_install  &&
   python setup.py install WXPORT=gtk2 UNICODE=1 \
         BUILD_OGL=0 BUILD_GLCANVAS=0 \
-        BUILD_STC=0 BUILD_XRC=0 \
-        BUILD_GIZMOS=0 \
+        BUILD_STC=0 BUILD_GIZMOS=0 \
+        BUILD_ANIMATE=0 \
         WX_CONFIG=/usr/bin/wx-config
 
 ) > $C_FIFO 2>&1
diff --git a/libs/wxPython/DETAILS b/libs/wxPython/DETAILS
index b6fb5190534..6364de81d86 100644
--- a/libs/wxPython/DETAILS
+++ b/libs/wxPython/DETAILS
@@ -1,12 +1,13 @@
           MODULE=wxPython
-         VERSION=2.4.2.4
-          SOURCE=${MODULE}Src-$VERSION.tar.gz
-      SOURCE_VFY=sha1:61d339c962a48128e6c7b8a7b93999759ea218e3
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}Src-$VERSION
-   SOURCE_URL[0]=$SFORGE_URL/wxpython/
+         VERSION=2.6.1.0
+          SOURCE=${MODULE}-src-$VERSION.tar.gz
+      SOURCE_VFY=sha1:
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}-src-$VERSION
+      SOURCE_URL=$SFORGE_URL/wxpython/
+      SOURCE_VFY=sha1:e7f46b0eb83fb0e316e0d5b49fd38b3b7f00b95b
         WEB_SITE=http://www.wxpython.org
          ENTERED=20010927
-         UPDATED=20041017
+         UPDATED=20050604
            SHORT="wxPython is a GUI toolkit for the Python programming language"
 
 cat << EOF