Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12012

Modified Files:
        pygtk2-gtk-py.info 
Added Files:
        pygtk2-gtk-py.patch 
Log Message:
fix gtk-doc xrefs, dep-upgrade


--- NEW FILE: pygtk2-gtk-py.patch ---
diff -Nurd -x'*~' pygtk-2.12.1.orig/Makefile.in pygtk-2.12.1/Makefile.in
--- pygtk-2.12.1.orig/Makefile.in       2008-01-03 10:05:55.000000000 -0500
+++ pygtk-2.12.1/Makefile.in    2009-04-14 02:47:39.000000000 -0400
@@ -314,10 +314,10 @@
        $(ATK_DEFS) $(ATK_OVERRIDES) $(PANGO_DEFS) pango.override \
        $(PANGOCAIRO_DEFS) pangocairo.override
 INCLUDES = \
+       -I$(srcdir)/gtk                 \
        $(PYTHON_INCLUDES)              \
        $(PYGOBJECT_CFLAGS)             \
-       $(GLIB_CFLAGS)                  \
-       -I$(srcdir)/gtk
+       $(GLIB_CFLAGS)
 
 
 # pkg-config files
diff -Nurd -x'*~' pygtk-2.12.1.orig/gtk/Makefile.in pygtk-2.12.1/gtk/Makefile.in
--- pygtk-2.12.1.orig/gtk/Makefile.in   2008-01-03 10:05:54.000000000 -0500
+++ pygtk-2.12.1/gtk/Makefile.in        2009-04-14 02:47:25.000000000 -0400
@@ -300,9 +300,9 @@
        $(GTK_2_10_DEFS) $(GTK_OVERRIDES) $(LIBGLADE_DEFS) \
        libglade.override $(GTKUNIXPRINT_DEFS) gtkunixprint.override
 INCLUDES = \
+       -I$(srcdir)/gtk \
        $(PYTHON_INCLUDES) \
-       $(PYGOBJECT_CFLAGS) \
-       -I$(srcdir)/gtk
+       $(PYGOBJECT_CFLAGS)
 
 
 # defs files

Index: pygtk2-gtk-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pygtk2-gtk-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pygtk2-gtk-py.info  19 Oct 2008 09:54:02 -0000      1.7
+++ pygtk2-gtk-py.info  14 Apr 2009 07:22:36 -0000      1.8
@@ -1,7 +1,7 @@
 Info2: <<
 Package: pygtk2-gtk-py%type_pkg[python]
 Version: 2.12.1
-Revision: 3
+Revision: 4
 Description: Python bindings for the GTK widget set
 DescDetail: <<
 PyGTK provides an object oriented interface that is slightly higher
@@ -10,6 +10,13 @@
 
 The original pygtk2-py binding set split into pygtk2-gtk-py and pygobject2-py
 <<
+DescPackaging: <<
+       Fix some -I ordering: local before global
+
+       Regenerating gtk-doc files The Right Way (--enable-gtk-doc) is
+       very slow, so just patch the prefix in the bad URLs in the
+       existing generated files.
+<<
 DescPort: <<
 If you have both pygtk and pygtk2 are installed in the same python, 
 read <http://www.async.com.br/faq/pygtk/index.py?req=all#2.1>. On
@@ -66,11 +73,9 @@
   libgettext3-dev,
   libglade2 (>= 2.6.3-1),
   libiconv-dev,
-  libjpeg,
   libpng3,
-  libtiff,
   libxml2 (>= 2.6.30-1),
-  pango1-xft2-ft219-dev (>= 1.22.0-4),
+  pango1-xft2-ft219-dev (>= 1.22.4-1),
   pixman (>= 0.12.0-1),
   pkgconfig (>= 0.23),
   pycairo-py%type_pkg[python]-dev (>= 1.6-4),
@@ -79,21 +84,22 @@
   xft2-dev
 <<
 Depends: <<
-  atk1-shlibs (>= 1.23.0-1),
+  atk1-shlibs (>= 1.24.0-1),
   cairo-shlibs (>= 1.8-1),
   expat1-shlibs,
+  fontconfig2-shlibs (>= 2.4.1-1),
+  freetype219-shlibs (>= 2.3.7-7),
   glib2-shlibs (>= 2.18.0-1),
   glitz-shlibs,
   gtk+2-shlibs (>= 2.14.0-1),
   libgettext3-shlibs,
   libglade2-shlibs (>= 2.6.3-1),
   libiconv,
-  libjpeg-shlibs,
   libpng3-shlibs,
-  libtiff-shlibs,
   libxml2-shlibs (>= 2.6.30-1),
   numeric-py%type_pkg[python],
-  pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+  pango1-xft2-ft219-shlibs (>= 1.22.4-1),
+  pixman-shlibs (>= 0.12.0-1),
   pycairo-py%type_pkg[python] (>= 1.6-4),
   pygobject2-py%type_pkg[python] (>= 2.14.1-1),
   python%type_pkg[python],
@@ -104,8 +110,12 @@
 Source: mirror:gnome:sources/pygtk/2.12/pygtk-%v.tar.bz2
 Source-MD5: a816346d750d61e3fa67a200e4292694
 Type: python (2.5)
+PatchFile: %{ni}.patch
+PatchFile-MD5: 2f2fcf17c795b8ed6f9ad70cfda08673
 PatchScript: <<
+       %{default_script}
   perl -pi -e 
's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python%type_raw[python]|' `find 
examples -name \*.py` codegen/*.py tests/*.py
+       perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g' 
docs/html/*.html
 <<
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
--datadir=%p/lib
 CompileScript: <<


------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to