Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2105/main/finkinfo/languages

Modified Files:
      Tag: pangocairo-branch
        wxpython-py.patch 
Log Message:
more build fixes and updates

Index: wxpython-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/wxpython-py.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- wxpython-py.patch   17 Feb 2006 21:17:36 -0000      1.1
+++ wxpython-py.patch   13 Mar 2007 13:15:47 -0000      1.1.2.1
@@ -1,6 +1,44 @@
---- wxPython/config.py.orig    Thu Apr 29 06:01:37 2004
-+++ wxPython/config.py Thu Apr 29 06:05:14 2004
-@@ -664,47 +664,37 @@
+--- wxPython/src/generic/dcpsg.cpp     2004-08-09 17:36:39.000000000 -0400
++++ wxPython/src/generic/dcpsg.cpp     2007-03-12 15:44:47.000000000 -0400
+@@ -1201,21 +1201,21 @@
+   wxPostScriptDC* caller;
+ };
+ 
+-static int paps_move_to( FT_Vector* to, void *user_data)
++static int paps_move_to( const FT_Vector* to, void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+   outline_info->caller->PsPrintf( wxT("%d %d moveto\n"), (int)to->x, 
(int)to->y );
+   return 0;
+ }
+ 
+-static int paps_line_to( FT_Vector*  to, void *user_data)
++static int paps_line_to( const FT_Vector*  to, void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+   outline_info->caller->PsPrintf( wxT("%d %d lineto\n"), (int)to->x , 
(int)to->y );
+   return 0;
+ }
+ 
+-static int paps_conic_to( FT_Vector*  control, FT_Vector*  to, void 
*user_data)
++static int paps_conic_to( const FT_Vector*  control, const FT_Vector*  to, 
void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+   outline_info->caller->PsPrintf( wxT("%d %d %d %d conicto\n"),
+@@ -1227,8 +1227,8 @@
+ }
+ 
+ static int
+-paps_cubic_to( FT_Vector*  control1, FT_Vector*  control2,
+-               FT_Vector*  to, void *user_data)
++paps_cubic_to( const FT_Vector*  control1, const FT_Vector*  control2,
++               const FT_Vector*  to, void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+   outline_info->caller->PsPrintf(wxT("%d %d %d %d %d %d curveto\n"),
+--- wxPython/config.py 2004-08-27 14:53:18.000000000 -0400
++++ wxPython/config.py 2007-03-12 15:44:24.000000000 -0400
+@@ -664,40 +664,31 @@
      WXPREFIX   = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
  
  
@@ -62,10 +100,11 @@
  
  
      # Move the various -I, -D, etc. flags we got from the *config scripts
-     # into the distutils lists.
+@@ -705,7 +696,6 @@
      cflags = adjustCFLAGS(cflags, defines, includes)
      lflags = adjustLFLAGS(lflags, libdirs, libs)
--
  
+-
  #----------------------------------------------------------------------
  else:
+     raise 'Sorry, platform not supported...'


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to