Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1908/10.3/unstable/main/finkinfo/gnome
Modified Files:
pygtk2-py.info
Added Files:
pygobject2-py.info pygobject2-py.patch pygtk2-gtk-py.info
pygtk2-gtk-py.patch
Removed Files:
pygtk2-py.patch
Log Message:
New pygobject, now its own package, so need to play obsolete/bundle games
--- NEW FILE: pygtk2-gtk-py.patch ---
diff -Nurd -x'*~' pygtk-2.6.3.orig/Makefile.in pygtk-2.6.3/Makefile.in
--- pygtk-2.6.3.orig/Makefile.in 2005-07-14 08:33:20.000000000 -0400
+++ pygtk-2.6.3/Makefile.in 2006-12-21 16:08:14.000000000 -0500
@@ -190,7 +190,7 @@
@[EMAIL PROTECTED] = gtk
-SUBDIRS = codegen gobject . $(GTK_SUBDIR) docs examples tests
+SUBDIRS = codegen . $(GTK_SUBDIR) docs examples tests
PLATFORM_VERSION = 2.0
@@ -219,15 +219,13 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
- pygobject-$(PLATFORM_VERSION).pc\
$(am__append_1)
INCLUDES = \
$(PYTHON_INCLUDES) \
$(GLIB_CFLAGS) \
$(PANGO_CFLAGS) \
- $(ATK_CFLAGS) \
- -I$(top_srcdir)/gobject
+ $(ATK_CFLAGS)
COMMONDEFS = \
diff -Nurd -x'*~' pygtk-2.6.3.orig/configure pygtk-2.6.3/configure
--- pygtk-2.6.3.orig/configure 2005-07-14 08:33:17.000000000 -0400
+++ pygtk-2.6.3/configure 2006-12-21 17:03:50.000000000 -0500
@@ -20963,7 +20963,8 @@
;;
esac
-
ac_config_files="$ac_config_files
Makefile pygobject-2.0.pc pygtk-2.0.pc codegen/Makefile gobject/Makefile
gtk/Makefile docs/Makefile examples/Makefile tests/Makefile
codegen/pygtk-codegen-2.0 pygtk.spec PKG-INFO"
+CFLAGS="$CFLAGS `$PKG_CONFIG --cflags pygobject-2.0`"
+
ac_config_files="$ac_config_files
Makefile pygtk-2.0.pc codegen/Makefile gtk/Makefile docs/Makefile
examples/Makefile tests/Makefile codegen/pygtk-codegen-2.0 pygtk.spec PKG-INFO"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -22501,7 +22502,7 @@
echo
echo "The following modules will be built:"
echo
-true && echo gobject
+#true && echo gobject
$build_atk && echo atk
$build_pango && echo pango
$build_gtk && echo gtk
diff -Nurd -x'*~' pygtk-2.6.3.orig/gtk/Makefile.in pygtk-2.6.3/gtk/Makefile.in
--- pygtk-2.6.3.orig/gtk/Makefile.in 2005-07-14 08:33:22.000000000 -0400
+++ pygtk-2.6.3/gtk/Makefile.in 2006-12-21 16:53:51.000000000 -0500
@@ -206,7 +206,7 @@
CLEANFILES = gtk.c gdk.c libglade.c
pkginclude_HEADERS = pygtk.h
-INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES)
+INCLUDES = $(PYTHON_INCLUDES)
COMMONDEFS = $(srcdir)/gtk-types.defs $(srcdir)/gdk-types.defs \
$(top_srcdir)/atk-types.defs $(top_srcdir)/pango-types.defs
diff -Nurd -x'*~' pygtk-2.6.3.orig/py-compile pygtk-2.6.3/py-compile
--- pygtk-2.6.3.orig/py-compile 2004-06-20 04:56:22.000000000 -0400
+++ pygtk-2.6.3/py-compile 2006-12-21 16:06:54.000000000 -0500
@@ -29,12 +29,24 @@
PYTHON=python
fi
+destdir=
basedir=
+do_opts=1
+while [ $do_opts -ne 0 ]; do
+do_opts=0
case "$1" in
+ --destdir)
+ shift
+ destdir=$1
+ shift
+ do_opts=1
+ ;;
--basedir)
- basedir=$2
- shift 2
+ shift
+ basedir=$1
+ shift
+ do_opts=1
;;
--help)
echo "Usage: py-compile [--basedir DIR] PY_FILES ..."
@@ -47,6 +59,7 @@
exit 0
;;
esac
+done
if [ $# = 0 ]; then
echo "No files given to $0" 1>&2
@@ -60,6 +73,11 @@
else
trans="path = os.path.join('$basedir', file)"
fi
+if [ -z "$destdir$basedir" ]; then
+ trans_dest="dest = file"
+else
+ trans_dest="dest = os.path.join('$destdir$basedir', file)"
+fi
$PYTHON -c "
import sys, os, string, py_compile
@@ -68,11 +86,12 @@
print 'Byte-compiling python modules...'
for file in string.split(files):
$trans
+ $trans_dest
if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
continue
print file,
sys.stdout.flush()
- py_compile.compile(path)
+ py_compile.compile(dest,None,path)
print" || exit $?
# this will fail for python < 1.5, but that doesn't matter ...
@@ -83,10 +102,11 @@
print 'Byte-compiling python modules (optimized versions) ...'
for file in string.split(files):
$trans
+ $trans_dest
if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
continue
print file,
sys.stdout.flush()
- py_compile.compile(path)
+ py_compile.compile(dest,None,path)
print" 2>/dev/null || :
diff -Nurd -x'*~' pygtk-2.6.3.orig/tests/Makefile.in
pygtk-2.6.3/tests/Makefile.in
--- pygtk-2.6.3.orig/tests/Makefile.in 2005-07-14 08:33:22.000000000 -0400
+++ pygtk-2.6.3/tests/Makefile.in 2006-12-21 16:25:50.000000000 -0500
@@ -182,8 +182,7 @@
$(GLIB_CFLAGS) \
$(PANGO_CFLAGS) \
$(ATK_CFLAGS) \
- $(GTK_CFLAGS) \
- -I$(top_srcdir)/gobject
+ $(GTK_CFLAGS)
EXTRA_DIST = $(tests) common.py runtests.py test-thread.h test-unknown.h
--- NEW FILE: pygtk2-gtk-py.info ---
Info2: <<
Package: pygtk2-gtk-py%type_pkg[python]
Version: 2.6.3
Revision: 1
Description: Python bindings for the GTK widget set
DescDetail: <<
PyGTK provides an object oriented interface that is slightly higher
level than the C one. It automatically does all the type casting and
reference counting that you would have to do normally with the C API.
The original pygtk2-py binding set split into pygtk2-gtk-py and pygobject2-py
<<
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
OS X, there is a problem with parts of pygtk2 pulling in pygtk(1):
% examples/atk/atk-demo.py
Traceback (most recent call last):
File "examples/atk/atk-demo.py", line 4, in ?
import atk
ImportError: Failure linking new module: : dyld: python2.3 multiple
definitions of symbol _g_allocator_free
/sw/lib/libglib-1.2.0.dylib(gmem.lo) definition of _g_allocator_free
/sw/lib/libglib-2.0.0.dylib(libglib-2.0.0.200.1.dylib-master.o) definition
of _g_allocator_free
% examples/simple.py
dyld: python2.3 multiple definitions of symbol _g_get_current_time
/sw/lib/libglib-2.0.0.dylib(libglib-2.0.0.200.1.dylib-master.o) definition of
_g_get_current_time
/sw/lib/libglib-1.2.0.dylib(gmain.lo) definition of _g_get_current_time
Trace/BPT trap (core dumped)
which is solved by <http://www.async.com.br/faq/pygtk/index.py?req=all#2.4>
#The widget demo examples/pygtk-demo works, but some of the other
#examples in examples/* do not (for a variety of reasons).
^--no longer install examples/
^--See also http://bugzilla.gnome.org/show_bug.cgi?id=132058
Patched examples (not installed) and codegen, demos, tests scripts to
use the desired python interpretter.
py-compile makes it impossible to install to a temp location and so
Makefile treats DESTDIR as the normal prefix, unlike every other
autoconf pkg in the world. So we patch py-compile to take a new flag
for DESTDIR and patch all Makefile.in to pass it.
Thanks to Clef and graphics/pil for help debugging *Script in 2.0 pkgs.
Originally ported by Michel Alexandre Salim <[EMAIL PROTECTED]>
(up to pygtk2-1.99.15-1)
pygobject is now a its own external package (and is not part of newer
versions of pygtk2) so excise all bits of it from here and use that.
<<
Homepage: http://www.pygtk.org
License: LGPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
BuildDepends: <<
atk1 (>= 1.8.0-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.12.0-1),
gtk+2 (>= 2.3.4-1),
gtk+2-dev (>= 2.3.4-1),
gtk-doc (>= 1.1-1),
libgettext3-dev,
libglade2 (>= 2.4.0-1),
libiconv-dev,
libjpeg,
libpng3,
libtiff,
libxml2,
pango1-xft2-dev (>= 1.8.0-1),
pkgconfig (>= 0.9.0-1),
pygobject2-py%type_pkg[python]-dev,
x11-dev
<<
Depends: <<
atk1-shlibs (>= 1.8.0-1),
glib2-shlibs (>= 2.12.0-1),
gtk+2-shlibs (>= 2.3.4-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.4.0-1),
libiconv,
libjpeg-shlibs,
libpng3-shlibs,
libtiff-shlibs,
libxml2-shlibs,
numeric-py%type_pkg[python],
pango1-xft2-shlibs (>= 1.8.0-1),
pygobject2-py%type_pkg[python],
python%type_pkg[python],
x11
<<
Conflicts: pygtk2
Replaces: pygtk2, pygtk2-py%type_pkg[python]
Source: mirror:gnome:sources/pygtk/2.6/pygtk-%v.tar.bz2
Source-MD5: 5acd4a4f5807f93a80389c1e9af48808
Type: python (2.3 2.4)
Patch: %{ni}.patch
PatchScript: <<
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|(--basedir)\s+(\$\(DESTDIR\))|--destdir $2 $1 |' `find . -name
Makefile.in`
mv gobject{,_UNUSED}
mv pygobject-2.0.pc.in{,_UNUSED}
<<
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--datadir=%p/lib
CompileScript: <<
PYTHON=%p/bin/python%type_raw[python] ./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d
# remove things that moved into pygobject2-py%type_pkg[python]
rm %i/lib/python%type_raw[python]/site-packages/pygtk.*
rm %i/lib/python%type_raw[python]/site-packages/gtk-2.0/dsextras.*
<<
DocFiles: AUTHORS COPYING ChangeLog* MAPPING NEWS README THREADS TODO
SplitOff: <<
Package: %N-dev
Description: Tools for compiling against pygtk2
Depends: %N (= %v-%r)
BuildDependsOnly: true
Conflicts: <<
pygtk2-gtk-py22-dev, pygtk2-gtk-py23-dev, pygtk2-gtk-py24-dev,
pygtk2-gtk-py25-dev
<<
Replaces: <<
pygtk2-py22-dev, pygtk2-py23-dev, pygtk2-py24-dev, pygtk2-py25-dev,
pygtk2-gtk-py22-dev, pygtk2-gtk-py23-dev, pygtk2-gtk-py24-dev,
pygtk2-gtk-py25-dev
<<
Files: bin include lib/pkgconfig lib/pygtk
DocFiles: AUTHORS COPYING ChangeLog* MAPPING NEWS README THREADS TODO
<<
<<
--- pygtk2-py.patch DELETED ---
--- NEW FILE: pygobject2-py.info ---
Info2: <<
Package: pygobject2-py%type_pkg[python]
Version: 2.12.3
Revision: 1
Description: Python bindings for the Glib2 gobject library
DescDetail: <<
The original pygtk2-py binding set split into pygtk2-gtk-py and pygobject2-py
<<
DescPort: <<
Patched tests scripts to use the desired python interpretter.
Regenerate py-compile from automake1.9, which understands DESTDIR correctly
<<
Homepage: http://www.pygtk.org
License: LGPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
BuildDepends: <<
autoconf (>= 2.60-1),
automake1.9,
gettext-bin,
gettext-tools,
glib2-dev (>= 2.12.0-1),
gtk-doc (>= 1.1-1),
libgettext3-dev,
libglade2 (>= 2.4.0-1),
libiconv-dev,
libtool14,
libxml2,
libxslt-bin,
pkgconfig (>= 0.9.0-1)
<<
Depends: <<
glib2-shlibs (>= 2.12.0-1),
libgettext3-shlibs,
libiconv,
libxml2-shlibs,
python%type_pkg[python]
<<
Conflicts: pygtk2
Replaces: pygtk2, pygtk2-py%type_pkg[python]
Source: mirror:gnome:sources/pygobject/2.12/pygobject-%v.tar.bz2
Source-MD5: 009986021225b7ea6e0ba848707785af
Type: python (2.3 2.4)
#Patch: %{ni}.patch
PatchScript: <<
perl -pi -e
's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python%type_raw[python]|' tests/*.py
# perl -pi -e 's|(--basedir)\s+(\$\(DESTDIR\))|--destdir $2 $1 |' `find . -name
Makefile.in`
<<
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
CompileScript: <<
env ACLOCAL="aclocal -I m4" autoreconf -fi
PYTHON=%p/bin/python%type_raw[python] ./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
SplitOff: <<
Package: %N-dev
Description: Tools for compiling against pygobject
Depends: %N (= %v-%r)
BuildDependsOnly: true
Conflicts: <<
pygobject2-py23-dev, pygobject2-py24-dev, pygobject2-py25-dev
<<
Replaces: <<
pygtk2-py22-dev, pygtk2-py23-dev, pygtk2-py24-dev, pygtk2-py25-dev,
pygobject2-py23-dev, pygobject2-py24-dev, pygobject2-py25-dev
<<
Files: include lib/pkgconfig share/gtk-doc share/pygobject
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
<<
--- NEW FILE: pygobject2-py.patch ---
diff -Nurd -x'*~' pygtk-2.6.2.orig/py-compile pygtk-2.6.2/py-compile
--- pygtk-2.6.2.orig/py-compile 2004-06-20 04:56:22.000000000 -0400
+++ pygtk-2.6.2/py-compile 2005-06-29 06:38:23.000000000 -0400
@@ -29,12 +29,24 @@
PYTHON=python
fi
+destdir=
basedir=
+do_opts=1
+while [ $do_opts -ne 0 ]; do
+do_opts=0
case "$1" in
+ --destdir)
+ shift
+ destdir=$1
+ shift
+ do_opts=1
+ ;;
--basedir)
- basedir=$2
- shift 2
+ shift
+ basedir=$1
+ shift
+ do_opts=1
;;
--help)
echo "Usage: py-compile [--basedir DIR] PY_FILES ..."
@@ -47,6 +59,7 @@
exit 0
;;
esac
+done
if [ $# = 0 ]; then
echo "No files given to $0" 1>&2
@@ -60,6 +73,11 @@
else
trans="path = os.path.join('$basedir', file)"
fi
+if [ -z "$destdir$basedir" ]; then
+ trans_dest="dest = file"
+else
+ trans_dest="dest = os.path.join('$destdir$basedir', file)"
+fi
$PYTHON -c "
import sys, os, string, py_compile
@@ -68,11 +86,12 @@
print 'Byte-compiling python modules...'
for file in string.split(files):
$trans
+ $trans_dest
if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
continue
print file,
sys.stdout.flush()
- py_compile.compile(path)
+ py_compile.compile(dest,None,path)
print" || exit $?
# this will fail for python < 1.5, but that doesn't matter ...
@@ -83,10 +102,11 @@
print 'Byte-compiling python modules (optimized versions) ...'
for file in string.split(files):
$trans
+ $trans_dest
if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
continue
print file,
sys.stdout.flush()
- py_compile.compile(path)
+ py_compile.compile(dest,None,path)
print" 2>/dev/null || :
Index: pygtk2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pygtk2-py.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pygtk2-py.info 21 Dec 2006 19:19:50 -0000 1.11
+++ pygtk2-py.info 21 Dec 2006 23:27:48 -0000 1.12
@@ -1,85 +1,42 @@
Info2: <<
Package: pygtk2-py%type_pkg[python]
Version: 2.6.3
-Revision: 3
+Revision: 2000
Description: Python bindings for the GTK widget set
DescDetail: <<
PyGTK provides an object oriented interface that is slightly higher
level than the C one. It automatically does all the type casting and
reference counting that you would have to do normally with the C API.
<<
-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
-OS X, there is a problem with parts of pygtk2 pulling in pygtk(1):
-
- % examples/atk/atk-demo.py
- Traceback (most recent call last):
- File "examples/atk/atk-demo.py", line 4, in ?
- import atk
- ImportError: Failure linking new module: : dyld: python2.3 multiple
- definitions of symbol _g_allocator_free
- /sw/lib/libglib-1.2.0.dylib(gmem.lo) definition of _g_allocator_free
- /sw/lib/libglib-2.0.0.dylib(libglib-2.0.0.200.1.dylib-master.o) definition
- of _g_allocator_free
-
- % examples/simple.py
- dyld: python2.3 multiple definitions of symbol _g_get_current_time
- /sw/lib/libglib-2.0.0.dylib(libglib-2.0.0.200.1.dylib-master.o) definition
of _g_get_current_time
- /sw/lib/libglib-1.2.0.dylib(gmain.lo) definition of _g_get_current_time
- Trace/BPT trap (core dumped)
-
-which is solved by <http://www.async.com.br/faq/pygtk/index.py?req=all#2.4>
-
-#The widget demo examples/pygtk-demo works, but some of the other
-#examples in examples/* do not (for a variety of reasons).
-^--no longer install examples/
-^--See also http://bugzilla.gnome.org/show_bug.cgi?id=132058
-
-Patched examples (not installed) and codegen, demos, tests scripts to
-use the desired python interpretter.
-
-py-compile makes it impossible to install to a temp location and so
-Makefile treats DESTDIR as the normal prefix, unlike every other
-autoconf pkg in the world. So we patch py-compile to take a new flag
-for DESTDIR and patch all Makefile.in to pass it.
-
-Thanks to Clef and graphics/pil for help debugging *Script in 2.0 pkgs.
+DescUsage: <<
-Originally ported by Michel Alexandre Salim <[EMAIL PROTECTED]>
-(up to pygtk2-1.99.15-1)
+The original pygtk2-py binding set split into pygtk2-gtk-py and
+pygobject2-py. You should use those packages directly, not this
+upgrade-compatibility dummy package.
+<<
+DescPackaging: <<
+ Hard to propagate Type:bundle into SplitOff, so just touch a file manually
<<
Homepage: http://www.pygtk.org
License: LGPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
-BuildDepends: x11-dev, python%type_pkg[python], numeric-py%type_pkg[python],
pkgconfig (>= 0.9.0-1), glib2-dev (>= 2.12.0-1), pango1-xft2-dev (>= 1.8.0-1),
atk1 (>= 1.8.0-1), gtk+2 (>= 2.3.4-1), gtk+2-dev (>= 2.3.4-1), libglade2 (>=
2.4.0-1), libxml2, libpng3, libjpeg, libtiff, libgettext3-dev, gettext-bin,
gettext-tools, libiconv-dev, gtk-doc (>= 1.1-1), fink (>= 0.20.2-1)
-Depends: x11, python%type_pkg[python], numeric-py%type_pkg[python],
glib2-shlibs (>= 2.12.0-1), pango1-xft2-shlibs (>= 1.8.0-1), atk1-shlibs (>=
1.8.0-1), gtk+2-shlibs (>= 2.3.4-1), libglade2-shlibs (>= 2.4.0-1),
libxml2-shlibs, libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs
-Conflicts: pygtk2
-Replaces: pygtk2
-Source: mirror:gnome:sources/pygtk/2.6/pygtk-%v.tar.bz2
-Source-MD5: 5acd4a4f5807f93a80389c1e9af48808
-Type: python (2.3 2.4)
-Patch: %{ni}.patch
-PatchScript: <<
- 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|(--basedir)\s+(\$\(DESTDIR\))|--destdir $2 $1 |' `find .
-name Makefile.in`
-<<
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--datadir=%p/lib
-CompileScript: <<
- PYTHON=%p/bin/python%type_raw[python] ./configure %c
- make
-<<
+Depends: pygtk2-gtk-py%type_pkg[python], pygobject2-py%type_pkg[python],
fink-obsolete-packages
+Type: python (2.3 2.4), nosource
+CompileScript: #
InstallScript: <<
- make install DESTDIR=%d
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%n
<<
-DocFiles: AUTHORS COPYING ChangeLog* MAPPING NEWS README THREADS TODO
SplitOff: <<
Package: %N-dev
- Description: Tools for compiling against pygtk2
- Depends: %N (= %v-%r)
+ Description: Tools for compiling against %N
+ Depends: pygtk2-gtk-py%type_pkg[python]-dev,
pygobject2-py%type_pkg[python]-dev, fink-obsolete-packages
Conflicts: pygtk2-py22-dev, pygtk2-py23-dev, pygtk2-py24-dev, pygtk2-py25-dev
Replaces: pygtk2-py22-dev, pygtk2-py23-dev, pygtk2-py24-dev, pygtk2-py25-dev
- Files: bin include lib/pkgconfig lib/pygtk
- DocFiles: AUTHORS COPYING ChangeLog* MAPPING NEWS README THREADS TODO
+ BuildDependsOnly: true
+ InstallScript: <<
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%n
+ <<
<<
<<
-------------------------------------------------------------------------
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
