gnome-python2-py stable port information

Info2: <<
Package: gnome-python2-py%type_pkg[python]
Version: 2.20.1
Revision: 2
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: The Gnome Core Team
Source: mirror:gnome:sources/gnome-python/2.20/gnome-python-%v.tar.bz2
Source-MD5: f05d67b0f288728e703faa8f74995358
Type: python (2.3 2.4 2.5)
Depends: <<
atk1-shlibs (>= 1.20.0-1),
audiofile-shlibs,
esound-shlibs (>= 0.2.38-1),
gconf2-shlibs (>= 2.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gnome-keyring-shlibs (>= 0.8.1-1),
gnome-vfs2-unified (>= 1:2.20.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libart2-shlibs,
libbonobo2 (>= 2.20.0-1),
libbonoboui2 (>= 2.20.0-1),
libgettext3-shlibs,
libgnome2-shlibs (>= 2.20.0-1),
libgnomecanvas2-shlibs (>= 2.20.0-1),
libgnomeui2-shlibs (>= 2.20.0-1),
libiconv,
libjpeg-shlibs,
libxml2-shlibs (>= 2.6.30-1),
orbit2-shlibs (>= 2.14.9-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
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),
python%type_pkg[python],
x11-shlibs
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
autoconf (>= 2.60),
audiofile,
automake1.9,
avahi-dev,
cairo (>= 1.6-1),
dbus-dev (>= 1.0-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),
glitz,
gnome-common (>= 2.20.0),
gnome-keyring-dev (>= 0.8.1-1),
gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.12.0-1),
libart2,
libavahi-glib1-dev,
libbonobo2-dev (>= 2.20.0-1),
libbonoboui2-dev (>= 2.20.0-1),
libgettext3-dev,
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
libgnomeui2-dev (>= 2.20.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),
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),
x11-dev,
xft2-dev
<<
Replaces: %{Ni}23, %{Ni}24
Suggests: gnome-python2-extras-py%type_pkg[python]
PatchFile: %{ni}.patch
PatchFile-MD5: 44bcb2bdb7d1ec0d11a67a1ffea7b4dc
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
CompileScript: <<
autoreconf -f -i
PYTHON='%p/bin/python%type_raw[python]' ./configure %c
make
# make check
<<
InstallScript: <<
make -j1 install DESTDIR=%d
# install -d -m 755 %i/share/doc/%n/examples
# install -m 644 examples/* %i/share/doc/%n/examples
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README

#
SplitOff: <<
Package: %N-dev
Depends: %N (= %v-%r), python%type_pkg[python]-shlibs
Conflicts: %{Ni}23-dev, %{Ni}24-dev, %{Ni}25-dev
Replaces: %{Ni}23-dev, %{Ni}24-dev, %{Ni}23 (<< 2.12.0-1), %{Ni}24 (<< 2.12.0-1), %{Ni}25-dev
BuildDependsOnly: true
Files: <<
include
lib/gnome-vfs-2.0/modules/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/gnome/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/bonobo/*.la
lib/pkgconfig
share/pygtk
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
<<
#
SplitOff2: <<
Package: %N-vfsmodule
Depends: %N (= %v-%r)
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
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
Description: Plugin for gnome-vfs2
<<
#
Description: Python bindings for GNOME2
DescDetail: <<
gnome-python2 provides bindings for the GNOME2 libraries to use the
Python programming language.

Starting with version 2.9.1, some bindings that used to be in
gnome-python2-pyXX have been moved to gnome-python2-extras-pyXX.
That package may not be available yet, but older %N does not compile
reliably any more.
<<
DescPackaging: <<
Moved development files into %N-dev starting in 2.12.0-1.

'make check' requires active x11 display.

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.
<<
DescPort: <<
Fix Makefiles so that pkg-config *_CFLAGS, are only passed to
compiler, as they are intended to be used. See:
http://bugzilla.gnome.org/show_bug.cgi?id=511643
<<
Homepage: http://www.pygtk.org
License: LGPL
<<

gnome-python2-py stable port .patch

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
@@ -31,7 +31,7 @@
if BUILD_BONOBO_ACTIVATION
pybonoboexec_LTLIBRARIES += activation.la
endif
-activation_la_CFLAGS = $(BONOBO_ACTIVATION_CFLAGS)
+activation_la_CPPFLAGS = $(BONOBO_ACTIVATION_CFLAGS)
activation_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initactivation
activation_la_LIBADD = $(BONOBO_ACTIVATION_LIBS) $(PYTHON_LIBS)
activation_la_SOURCES = activationmodule.c
@@ -39,7 +39,7 @@
if BUILD_BONOBO
pybonoboexec_LTLIBRARIES += _bonobo.la
endif
-_bonobo_la_CFLAGS = $(BONOBO_CFLAGS)
+_bonobo_la_CPPFLAGS = $(BONOBO_CFLAGS)
_bonobo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_bonobo
_bonobo_la_LIBADD = $(BONOBO_LIBS) $(PYTHON_LIBS)
_bonobo_la_SOURCES = bonobomodule.c bonobo-arg.c pybonobo.h pybonobo.c
@@ -51,7 +51,7 @@
if BUILD_BONOBOUI
pybonoboexec_LTLIBRARIES += ui.la
endif
-ui_la_CFLAGS = $(BONOBOUI_CFLAGS)
+ui_la_CPPFLAGS = $(BONOBOUI_CFLAGS)
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."
echo "Download it from: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/"
fi
+# 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
+ :
+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
@@ -12,7 +12,7 @@
# gconf binding

pkgpyexec_LTLIBRARIES = gconf.la
-gconf_la_CFLAGS = $(GCONF_CFLAGS)
+gconf_la_CPPFLAGS = $(GCONF_CFLAGS)
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
@@ -22,7 +22,7 @@
# libgnome binding

pygnomeexec_LTLIBRARIES += _gnome.la
-_gnome_la_CFLAGS = $(GNOME_CFLAGS)
+_gnome_la_CPPFLAGS = $(GNOME_CFLAGS)
_gnome_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gnome
_gnome_la_LIBADD = $(GNOME_LIBS) $(PYTHON_LIBS)
_gnome_la_SOURCES = gnomemodule.c
@@ -36,7 +36,7 @@
if BUILD_GNOMEUI
pygnomeexec_LTLIBRARIES += ui.la
endif
-ui_la_CFLAGS = $(GNOMEUI_CFLAGS) -I$(top_srcdir)/gnomevfs
+ui_la_CPPFLAGS = $(GNOMEUI_CFLAGS) -I$(top_srcdir)/gnomevfs
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
@@ -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_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
@@ -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_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 @@
if BUILD_GNOMEVFSBONOBO
gnomevfs_LTLIBRARIES += gnomevfsbonobo.la
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_LIBADD = $(GNOMEVFSBONOBO_LIBS) $(PYTHON_LIBS)
gnomevfsbonobo_la_SOURCES = vfsbonobomodule.c pygnomevfsbonobo.h
@@ -40,7 +40,7 @@
vfsmethod_LTLIBRARIES =
endif

-libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
+libpythonmethod_la_CPPFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
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)

gnome-python2-py _unstable_ port information

Info2: <<
Package: gnome-python2-py%type_pkg[python]
Version: 2.20.1
Revision: 2
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: The Gnome Core Team
Source: mirror:gnome:sources/gnome-python/2.20/gnome-python-%v.tar.bz2
Source-MD5: f05d67b0f288728e703faa8f74995358
Type: python (2.3 2.4 2.5)
Depends: <<
atk1-shlibs (>= 1.20.0-1),
audiofile-shlibs,
esound-shlibs (>= 0.2.38-1),
gconf2-shlibs (>= 2.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gnome-keyring-shlibs (>= 0.8.1-1),
gnome-vfs2-unified (>= 1:2.20.0-1),
gtk+2-shlibs (>= 2.12.0-1),
libart2-shlibs,
libbonobo2 (>= 2.20.0-1),
libbonoboui2 (>= 2.20.0-1),
libgettext3-shlibs,
libgnome2-shlibs (>= 2.20.0-1),
libgnomecanvas2-shlibs (>= 2.20.0-1),
libgnomeui2-shlibs (>= 2.20.0-1),
libiconv,
libjpeg-shlibs,
libxml2-shlibs (>= 2.6.30-1),
orbit2-shlibs (>= 2.14.9-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
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),
python%type_pkg[python],
x11-shlibs
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
autoconf (>= 2.60),
audiofile,
automake1.9,
avahi-dev,
cairo (>= 1.6-1),
dbus-dev (>= 1.0-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),
glitz,
gnome-common (>= 2.20.0),
gnome-keyring-dev (>= 0.8.1-1),
gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.12.0-1),
libart2,
libavahi-glib1-dev,
libbonobo2-dev (>= 2.20.0-1),
libbonoboui2-dev (>= 2.20.0-1),
libgettext3-dev,
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
libgnomeui2-dev (>= 2.20.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),
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),
x11-dev,
xft2-dev
<<
Replaces: %{Ni}23, %{Ni}24
Suggests: gnome-python2-extras-py%type_pkg[python]
PatchFile: %{ni}.patch
PatchFile-MD5: 44bcb2bdb7d1ec0d11a67a1ffea7b4dc
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
CompileScript: <<
autoreconf -f -i
PYTHON='%p/bin/python%type_raw[python]' ./configure %c
make
# make check
<<
InstallScript: <<
make -j1 install DESTDIR=%d
# install -d -m 755 %i/share/doc/%n/examples
# install -m 644 examples/* %i/share/doc/%n/examples
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README

#
SplitOff: <<
Package: %N-dev
Depends: %N (= %v-%r), python%type_pkg[python]-shlibs
Conflicts: %{Ni}23-dev, %{Ni}24-dev, %{Ni}25-dev
Replaces: %{Ni}23-dev, %{Ni}24-dev, %{Ni}23 (<< 2.12.0-1), %{Ni}24 (<< 2.12.0-1), %{Ni}25-dev
BuildDependsOnly: true
Files: <<
include
lib/gnome-vfs-2.0/modules/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/gnome/*.la
lib/python%type_raw[python]/site-packages/gtk-2.0/bonobo/*.la
lib/pkgconfig
share/pygtk
<<
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
<<
#
SplitOff2: <<
Package: %N-vfsmodule
Depends: %N (= %v-%r)
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
DocFiles: AUTHORS COPYING ChangeLog* NEWS README
Description: Plugin for gnome-vfs2
<<
#
Description: Python bindings for GNOME2
DescDetail: <<
gnome-python2 provides bindings for the GNOME2 libraries to use the
Python programming language.

Starting with version 2.9.1, some bindings that used to be in
gnome-python2-pyXX have been moved to gnome-python2-extras-pyXX.
That package may not be available yet, but older %N does not compile
reliably any more.
<<
DescPackaging: <<
Moved development files into %N-dev starting in 2.12.0-1.

'make check' requires active x11 display.

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.
<<
DescPort: <<
Fix Makefiles so that pkg-config *_CFLAGS, are only passed to
compiler, as they are intended to be used. See:
http://bugzilla.gnome.org/show_bug.cgi?id=511643
<<
Homepage: http://www.pygtk.org
License: LGPL
<<

gnome-python2-py _unstable_ port .patch

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
@@ -31,7 +31,7 @@
if BUILD_BONOBO_ACTIVATION
pybonoboexec_LTLIBRARIES += activation.la
endif
-activation_la_CFLAGS = $(BONOBO_ACTIVATION_CFLAGS)
+activation_la_CPPFLAGS = $(BONOBO_ACTIVATION_CFLAGS)
activation_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initactivation
activation_la_LIBADD = $(BONOBO_ACTIVATION_LIBS) $(PYTHON_LIBS)
activation_la_SOURCES = activationmodule.c
@@ -39,7 +39,7 @@
if BUILD_BONOBO
pybonoboexec_LTLIBRARIES += _bonobo.la
endif
-_bonobo_la_CFLAGS = $(BONOBO_CFLAGS)
+_bonobo_la_CPPFLAGS = $(BONOBO_CFLAGS)
_bonobo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_bonobo
_bonobo_la_LIBADD = $(BONOBO_LIBS) $(PYTHON_LIBS)
_bonobo_la_SOURCES = bonobomodule.c bonobo-arg.c pybonobo.h pybonobo.c
@@ -51,7 +51,7 @@
if BUILD_BONOBOUI
pybonoboexec_LTLIBRARIES += ui.la
endif
-ui_la_CFLAGS = $(BONOBOUI_CFLAGS)
+ui_la_CPPFLAGS = $(BONOBOUI_CFLAGS)
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."
echo "Download it from: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/"
fi
+# 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
+ :
+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
@@ -12,7 +12,7 @@
# gconf binding

pkgpyexec_LTLIBRARIES = gconf.la
-gconf_la_CFLAGS = $(GCONF_CFLAGS)
+gconf_la_CPPFLAGS = $(GCONF_CFLAGS)
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
@@ -22,7 +22,7 @@
# libgnome binding

pygnomeexec_LTLIBRARIES += _gnome.la
-_gnome_la_CFLAGS = $(GNOME_CFLAGS)
+_gnome_la_CPPFLAGS = $(GNOME_CFLAGS)
_gnome_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gnome
_gnome_la_LIBADD = $(GNOME_LIBS) $(PYTHON_LIBS)
_gnome_la_SOURCES = gnomemodule.c
@@ -36,7 +36,7 @@
if BUILD_GNOMEUI
pygnomeexec_LTLIBRARIES += ui.la
endif
-ui_la_CFLAGS = $(GNOMEUI_CFLAGS) -I$(top_srcdir)/gnomevfs
+ui_la_CPPFLAGS = $(GNOMEUI_CFLAGS) -I$(top_srcdir)/gnomevfs
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
@@ -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_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
@@ -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_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 @@
if BUILD_GNOMEVFSBONOBO
gnomevfs_LTLIBRARIES += gnomevfsbonobo.la
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_LIBADD = $(GNOMEVFSBONOBO_LIBS) $(PYTHON_LIBS)
gnomevfsbonobo_la_SOURCES = vfsbonobomodule.c pygnomevfsbonobo.h
@@ -40,7 +40,7 @@
vfsmethod_LTLIBRARIES =
endif

-libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
+libpythonmethod_la_CPPFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
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)