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

Modified Files:
        gnome-python2-py.info gnome-python2-py.patch 
Log Message:
new version


Index: gnome-python2-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-python2-py.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gnome-python2-py.info       20 Oct 2008 04:16:02 -0000      1.17
+++ gnome-python2-py.info       20 Oct 2008 06:50:56 -0000      1.18
@@ -1,94 +1,102 @@
 Info2: <<
 Package: gnome-python2-py%type_pkg[python]
-Version: 2.20.1
-Revision: 2
+Version: 2.22.3
+Revision: 1
 Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-Source: mirror:gnome:sources/gnome-python/2.20/gnome-python-%v.tar.bz2
-Source-MD5: f05d67b0f288728e703faa8f74995358
+Source: mirror:gnome:sources/gnome-python/2.22/gnome-python-%v.tar.bz2
+Source-MD5: ab12d94954a57de39b25eb7903d8429c
 Type: python (2.5)
 Depends: <<
-       atk1-shlibs (>= 1.20.0-1),
+       atk1-shlibs (>= 1.24.0-1),
        audiofile-shlibs,
+       cairo-shlibs (>= 1.8-1),
+       dbus-shlibs (>= 1.2.1-1),
        esound-shlibs (>= 0.2.38-1),
-       gconf2-shlibs (>= 2.20.0-1),
-       glib2-shlibs (>= 2.14.0-1),
+       expat1-shlibs,
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.7-7),
+       gconf2-shlibs (>= 2.24.0-1),
+       glib2-shlibs (>= 2.18.0-1),
+       glitz-shlibs,
        gnome-keyring-shlibs (>= 0.8.1-1),
-       gnome-vfs2-unified (>= 1:2.20.0-1),
-       gtk+2-shlibs (>= 2.12.0-1),
+       gnome-vfs2-unified (>= 1:2.24.0-1),
+       gtk+2-shlibs (>= 2.14.0-1),
        libart2-shlibs,
-       libbonobo2 (>= 2.20.0-1),
-       libbonoboui2 (>= 2.20.0-1),
+       libavahi-client3-shlibs,
+       libavahi-common3-shlibs,
+       libavahi-glib1-shlibs,
+       libbonobo2 (>= 2.24.0-1),
+       libbonoboui2 (>= 2.24.0-1),
        libgettext3-shlibs,
-       libgnome2-shlibs (>= 2.20.0-1),
-       libgnomecanvas2-shlibs (>= 2.20.0-1),
-       libgnomeui2-shlibs (>= 2.20.0-1),
+       libgnome2-shlibs (>= 2.24.0-1),
+       libgnomecanvas2-shlibs (>= 2.20.1.1-1),
+       libgnomeui2-shlibs (>= 2.20.4-1),
        libiconv,
-       libjpeg-shlibs,
+       libpng3-shlibs,
        libxml2-shlibs (>= 2.6.30-1),
-       orbit2-shlibs (>= 2.14.9-1),
-       pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+       orbit2-shlibs (>= 2.14.16-1),
+       pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+       pixman-shlibs (>= 0.12.0-1),
        popt-shlibs,
-       pygtk2-gtk-py%type_pkg[python] (>= 2.10.0-1),
-       pyorbit2-py%type_pkg[python] (>= 2.0.1-1005),
-       (%type_pkg[python] != 23) pyorbit2-py%type_pkg[python] (>= 2.14.3-1),
+       pycairo-py%type_pkg[python] (>= 1.6.4-1),
+       pygobject2-py%type_pkg[python] (>= 2.14.2-2),
+       pygtk2-gtk-py%type_pkg[python] (>= 2.12.1-3),
+       pyorbit2-py%type_pkg[python] (>= 2.14.3-1),
        python%type_pkg[python],
        x11-shlibs
 <<
 BuildDepends: <<
-       atk1 (>= 1.20.0-1),
-       autoconf (>= 2.60),
+       atk1 (>= 1.24.0-1),
        audiofile,
-       automake1.9,
+       automake1.10,
        avahi-dev,
-       cairo (>= 1.6-1),
-       dbus-dev (>= 1.0-1),
+       cairo (>= 1.8-1),
+       dbus-dev (>= 1.2.1-1),
        esound (>= 0.2.38-1),
        expat1,
        fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.5-1),
-       gconf2-dev (>= 2.20.0-1),
-       gail18-dev (>= 1.20.1-1),
-       glib2-dev (>= 2.14.0-1),
+       freetype219 (>= 2.3.7-7),
+       gconf2-dev (>= 2.24.0-1),
+       glib2-dev (>= 2.18.0-1),
        glitz,
        gnome-common (>= 2.20.0),
+       gnome-doc-utils (>= 0.14.0-1),
        gnome-keyring-dev (>= 0.8.1-1),
-       gnome-vfs2-unified-dev (>= 1:2.20.0-1),
-       gtk+2-dev (>= 2.12.0-1),
+       gnome-vfs2-unified-dev (>= 1:2.24.0-1),
+       gtk+2-dev (>= 2.14.0-1),
        libart2,
        libavahi-glib1-dev,
-       libbonobo2-dev (>= 2.20.0-1),
-       libbonoboui2-dev (>= 2.20.0-1),
+       libbonobo2-dev (>= 2.24.0-1),
+       libbonoboui2-dev (>= 2.24.0-1),
        libgettext3-dev,
-       libgnome2-dev (>= 2.20.0-1),
-       libgnomecanvas2-dev (>= 2.20.0-1),
-       libgnomeui2-dev (>= 2.20.0-1),
+       libgnome2-dev (>= 2.24.0-1),
+       libgnomecanvas2-dev (>= 2.20.1.1-1),
+       libgnomeui2-dev (>= 2.24.0-1),
        libiconv-dev,
-       libjpeg,
        libpng3,
-       libtool14,
        libxml2 (>= 2.6.30-1),
-       orbit2-dev (>= 2.14.9-1),
-       pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.10.0-1),
-       pkgconfig (>= 0.21-1),
+       orbit2-dev (>= 2.14.16-1),
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
        popt,
-       pycairo-py%type_pkg[python]-dev,
-       pygobject2-py%type_pkg[python]-dev (>= 2.12.0-1),
-       pygtk2-gtk-py%type_pkg[python]-dev (>= 2.10.0-1),
-       pyorbit2-py%type_pkg[python]-dev (>= 2.0.1-1005),
-       (%type_pkg[python] != 23) pyorbit2-py%type_pkg[python]-dev (>= 
2.14.3-1),
+       pycairo-py%type_pkg[python]-dev (>= 1.6.4-1),
+       pygobject2-py%type_pkg[python]-dev (>= 2.14.2-2),
+       pygtk2-gtk-py%type_pkg[python]-dev (>= 2.12.1-3),
+       pyorbit2-py%type_pkg[python]-dev (>= 2.14.3-1),
        x11-dev,
        xft2-dev
 <<
 Replaces: %{Ni}23, %{Ni}24
 Suggests: gnome-python2-extras-py%type_pkg[python]
 PatchFile: %{ni}.patch
-PatchFile-MD5: 44bcb2bdb7d1ec0d11a67a1ffea7b4dc
+PatchFile-MD5: f5c0f3f29f5a902698c8e1bd261a3a85
 SetCPPFLAGS: -fno-common
-ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
 CompileScript: <<
-       autoreconf -f -i
+#      autoreconf -f -i
+       automake
        PYTHON='%p/bin/python%type_raw[python]' ./configure %c
        make
 #      make check
@@ -115,13 +123,28 @@
                lib/python%type_raw[python]/site-packages/gtk-2.0/bonobo/*.la 
                lib/pkgconfig
                share/pygtk
+               share/gtk-doc
        <<
        DocFiles: AUTHORS COPYING ChangeLog* NEWS README
 <<
 #
 SplitOff2: <<
        Package: %N-vfsmodule
-       Depends: %N (= %v-%r)
+       Depends: <<
+               dbus-shlibs (>= 1.2.1-1),
+               gconf2-shlibs (>= 2.24.0-1),
+               glib2-shlibs (>= 2.18.0-1),
+               gnome-vfs2-unified-shlibs (>= 2.20.1.1-1),
+               libavahi-client3-shlibs,
+               libavahi-common3-shlibs,
+               libavahi-glib1-shlibs,
+               libbonobo2-shlibs (>= 2.24.0-1),
+               libgettext3-shlibs,
+               libiconv,
+               libxml2-shlibs (>= 2.6.30-1),
+               orbit2-shlibs (>= 2.14.16-1),
+               python%type_pkg[python]-shlibs
+       <<
        Conflicts: %{Ni}23-vfsmodule, %{Ni}24-vfsmodule, %{Ni}25-vfsmodule
        Replaces: %{Ni}23-vfsmodule, %{Ni}24-vfsmodule, %{Ni}25-vfsmodule
        Files: lib/gnome-vfs-2.0
@@ -147,6 +170,12 @@
        configure autodetects and builds bindinds for whatever support libs
        are found. We want to make sure we get things built as expected, so
        patch configure to crash unless desired bindings would be built.
+
+       No 2.24 release...use version from garnome-2.24.0
+
+       WAF build system is a disaster of hard-coded system paths and
+       incorrect assumptions about compiler flags. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=557030
 <<
 DescPort: <<
        Fix Makefiles so that pkg-config *_CFLAGS, are only passed to

Index: gnome-python2-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-python2-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnome-python2-py.patch      15 Jul 2008 01:40:57 -0000      1.2
+++ gnome-python2-py.patch      20 Oct 2008 06:50:56 -0000      1.3
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/bonobo/Makefile.am 
gnome-python-2.20.1/bonobo/Makefile.am
---- gnome-python-2.20.1.orig/bonobo/Makefile.am        2007-09-15 
12:45:41.000000000 -0400
-+++ gnome-python-2.20.1/bonobo/Makefile.am     2008-01-23 17:11:32.000000000 
-0500
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/bonobo/Makefile.am 
gnome-python-2.22.3/bonobo/Makefile.am
+--- gnome-python-2.22.3.orig/bonobo/Makefile.am        2008-08-28 
13:45:52.000000000 -0400
++++ gnome-python-2.22.3/bonobo/Makefile.am     2008-10-20 01:54:28.000000000 
-0400
 @@ -31,7 +31,7 @@
  if BUILD_BONOBO_ACTIVATION
  pybonoboexec_LTLIBRARIES += activation.la
@@ -28,24 +28,29 @@
  ui_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initui
  ui_la_LIBADD = $(BONOBOUI_LIBS) $(PYTHON_LIBS)
  ui_la_SOURCES = bonobouimodule.c
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/configure 
gnome-python-2.20.1/configure
---- gnome-python-2.20.1.orig/configure 2007-11-24 12:07:48.000000000 -0500
-+++ gnome-python-2.20.1/configure      2008-01-23 15:49:09.000000000 -0500
-@@ -23685,3 +23685,11 @@
-   echo "and gnomeui bindings."
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/configure 
gnome-python-2.22.3/configure
+--- gnome-python-2.22.3.orig/configure 2008-09-22 06:58:46.000000000 -0400
++++ gnome-python-2.22.3/configure      2008-10-20 01:56:58.000000000 -0400
+@@ -24596,8 +24596,11 @@
    echo "Download it from: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/";
  fi
+ 
+-echo 
"*****************************************************************************"
+-echo "*** WARNING: You are using a deprecated build system (autotools)."
+-echo "***          You should be using WAF instead; see the file INSTALL.WAF."
+-echo "***          The autotools build system will be removed in a future 
version."
+-echo 
"*****************************************************************************"
 +# make sure all expected modules will be built
 +# (missing deps just disable modules instead of crashing ./configure)
-+if $build_gnome && $build_gnomeui && $build_gnomecanvas && $build_gnomevfs && 
$build_pyvfsmodule && $build_gconf && $build_bonobo && $build_bonobo_activation 
&& $build_bonoboui; then
++if $build_gnome && $build_gnomeui && $build_gnomecanvas && $build_gnomevfs && 
$build_gnomevfsbonobo && $build_pyvfsmodule && $build_gconf && $build_bonobo && 
$build_bonobo_activation && $build_bonoboui; then
 +  :
 +else
 +  echo "Incomplete package configuration."
 +  exit 1
 +fi
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/gconf/Makefile.am 
gnome-python-2.20.1/gconf/Makefile.am
---- gnome-python-2.20.1.orig/gconf/Makefile.am 2007-09-15 12:45:40.000000000 
-0400
-+++ gnome-python-2.20.1/gconf/Makefile.am      2008-01-23 17:11:18.000000000 
-0500
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/gconf/Makefile.am 
gnome-python-2.22.3/gconf/Makefile.am
+--- gnome-python-2.22.3.orig/gconf/Makefile.am 2008-08-28 13:45:52.000000000 
-0400
++++ gnome-python-2.22.3/gconf/Makefile.am      2008-10-20 01:54:28.000000000 
-0400
 @@ -12,7 +12,7 @@
  # gconf binding
  
@@ -55,9 +60,9 @@
  gconf_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgconf
  gconf_la_LIBADD = $(GCONF_LIBS) $(PYTHON_LIBS)
  gconf_la_SOURCES = \
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/gnome/Makefile.am 
gnome-python-2.20.1/gnome/Makefile.am
---- gnome-python-2.20.1.orig/gnome/Makefile.am 2007-09-15 12:45:40.000000000 
-0400
-+++ gnome-python-2.20.1/gnome/Makefile.am      2008-01-23 17:11:13.000000000 
-0500
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/gnome/Makefile.am 
gnome-python-2.22.3/gnome/Makefile.am
+--- gnome-python-2.22.3.orig/gnome/Makefile.am 2008-08-28 13:45:52.000000000 
-0400
++++ gnome-python-2.22.3/gnome/Makefile.am      2008-10-20 01:54:28.000000000 
-0400
 @@ -22,7 +22,7 @@
  # libgnome binding
  
@@ -76,28 +81,28 @@
  ui_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initui
  ui_la_LIBADD = $(GNOMEUI_LIBS) $(PYTHON_LIBS)
  ui_la_SOURCES = uimodule.c
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/gnomecanvas/Makefile.am 
gnome-python-2.20.1/gnomecanvas/Makefile.am
---- gnome-python-2.20.1.orig/gnomecanvas/Makefile.am   2007-09-15 
12:45:40.000000000 -0400
-+++ gnome-python-2.20.1/gnomecanvas/Makefile.am        2008-01-23 
17:11:05.000000000 -0500
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/gnomecanvas/Makefile.am 
gnome-python-2.22.3/gnomecanvas/Makefile.am
+--- gnome-python-2.22.3.orig/gnomecanvas/Makefile.am   2008-08-28 
13:45:52.000000000 -0400
++++ gnome-python-2.22.3/gnomecanvas/Makefile.am        2008-10-20 
01:54:28.000000000 -0400
 @@ -12,7 +12,7 @@
  
  # libgnomecanvas binding
  pkgpyexec_LTLIBRARIES = gnomecanvas.la
 -gnomecanvas_la_CFLAGS = $(GNOMECANVAS_CFLAGS)
 +gnomecanvas_la_CPPFLAGS = $(GNOMECANVAS_CFLAGS)
- gnomecanvas_la_LDFLAGS = $(common_ldflags) $(PYTHON_LDFLAGS) 
-export-symbols-regex initgnomecanvas
+ gnomecanvas_la_LDFLAGS = $(common_ldflags) -export-symbols-regex 
initgnomecanvas
  gnomecanvas_la_LIBADD = $(GNOMECANVAS_LIBS) $(PYTHON_LIBS)
  gnomecanvas_la_SOURCES = canvasmodule.c
-diff -Nurd -x'*~' gnome-python-2.20.1.orig/gnomevfs/Makefile.am 
gnome-python-2.20.1/gnomevfs/Makefile.am
---- gnome-python-2.20.1.orig/gnomevfs/Makefile.am      2007-09-15 
12:45:40.000000000 -0400
-+++ gnome-python-2.20.1/gnomevfs/Makefile.am   2008-01-23 17:10:58.000000000 
-0500
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/gnomevfs/Makefile.am 
gnome-python-2.22.3/gnomevfs/Makefile.am
+--- gnome-python-2.22.3.orig/gnomevfs/Makefile.am      2008-08-28 
13:45:52.000000000 -0400
++++ gnome-python-2.22.3/gnomevfs/Makefile.am   2008-10-20 01:54:28.000000000 
-0400
 @@ -12,7 +12,7 @@
  
  # libgnomevfs binding
  gnomevfs_LTLIBRARIES = _gnomevfs.la
 -_gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS)
 +_gnomevfs_la_CPPFLAGS = $(GNOMEVFS_CFLAGS)
- _gnomevfs_la_LDFLAGS = $(common_ldflags) $(PYTHON_LDFLAGS) 
-export-symbols-regex init_gnomevfs
+ _gnomevfs_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gnomevfs
  _gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(PYTHON_LIBS)
  _gnomevfs_la_SOURCES = vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c 
\
 @@ -23,7 +23,7 @@
@@ -106,7 +111,7 @@
  endif
 -gnomevfsbonobo_la_CFLAGS = $(GNOMEVFSBONOBO_CFLAGS)  
-DGNOME_VFS_INCLUDE_BONOBO
 +gnomevfsbonobo_la_CPPFLAGS = $(GNOMEVFSBONOBO_CFLAGS)  
-DGNOME_VFS_INCLUDE_BONOBO
- gnomevfsbonobo_la_LDFLAGS = $(common_ldflags) $(PYTHON_LDFLAGS) 
-export-symbols-regex initgnomevfsbonobo
+ gnomevfsbonobo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex 
initgnomevfsbonobo
  gnomevfsbonobo_la_LIBADD = $(GNOMEVFSBONOBO_LIBS) $(PYTHON_LIBS)
  gnomevfsbonobo_la_SOURCES = vfsbonobomodule.c pygnomevfsbonobo.h
 @@ -40,7 +40,7 @@
@@ -118,3 +123,14 @@
  libpythonmethod_la_SOURCES = gnome-vfs-python-method.c
  libpythonmethod_la_LDFLAGS = $(common_ldflags) -export-symbols-regex 
"vfs_module_(init|shutdown)"
  libpythonmethod_la_LIBADD = $(GNOME_VFS_MODULE_LIBS) $(PYTHON_EMBED_LIBS)
+diff -Nurd -x'*~' gnome-python-2.22.3.orig/wscript gnome-python-2.22.3/wscript
+--- gnome-python-2.22.3.orig/wscript   2008-09-22 06:41:18.000000000 -0400
++++ gnome-python-2.22.3/wscript        2008-10-20 00:57:41.000000000 -0400
+@@ -88,6 +88,7 @@
+         print "** The following modules will NOT be built:"
+         for m in not_built:
+             print "\t%s" % m
++        sys.exit(1)
+ 
+     conf.write_config_header('config.h')
+ 


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to