Hello community,
here is the log from the commit of package python-orbit for openSUSE:Factory
checked in at Thu Aug 6 18:13:12 CEST 2009.
--------
--- GNOME/python-orbit/python-orbit.changes 2009-04-30 00:16:00.000000000 +0200
+++ python-orbit/python-orbit.changes 2009-08-06 14:04:45.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 6 14:03:42 CEST 2009 - matejcik@suse.cz
+
+- update to 2.24.0
+ * Added weakref support to Python CORBA objects
+ * Allow accessing reference count data
+ * Misc. build fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pyorbit-2.14.3.tar.bz2
New:
----
pyorbit-2.24.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-orbit.spec ++++++
--- /var/tmp/diff_new_pack.k0d6nh/_old 2009-08-06 18:12:56.000000000 +0200
+++ /var/tmp/diff_new_pack.k0d6nh/_new 2009-08-06 18:12:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-orbit (Version 2.14.3)
+# spec file for package python-orbit (Version 2.24.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
BuildRequires: gtk2-devel indent libidl-devel orbit2-devel python-devel update-desktop-files
Url: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/
Summary: Python bindings for ORBit
-Version: 2.14.3
-Release: 138
+Version: 2.24.0
+Release: 1
License: LGPL v2.1 or later
Group: Development/Libraries/Python
Source: %{_name}-%{version}.tar.bz2
++++++ pyorbit-2.14.3.tar.bz2 -> pyorbit-2.24.0.tar.bz2 ++++++
++++ 19594 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/ChangeLog new/pyorbit-2.24.0/ChangeLog
--- old/pyorbit-2.14.3/ChangeLog 2007-05-26 15:17:08.000000000 +0200
+++ new/pyorbit-2.24.0/ChangeLog 2008-09-23 14:31:01.000000000 +0200
@@ -1,3 +1,39 @@
+== PyORBit 2.24.0 ==
+2008-09-23 Gustavo J. A. M. Carneiro
+
+ * NEWS: Update.
+
+ * configure.in: Bump version to 2.24.0.
+
+2007-12-11 Eitan Isaacson
+
+ Bug 471391 – Allow accessing reference count data.
+
+ reviewed by: Gustavo Carneiro.
+
+ * src/pycorba-object.c: (get_orbit_object_refcount) new method which
+ allows examining the current reference count of a given object.
+
+2008-04-12 Thomas Lee
+
+ reviewed by: Gustavo Carneiro.
+
+ * m4/python-module.m4: Bug 522593 – AM_CHECK_PYTHON_HEADERS not
+ taking MODLIBS into account.
+
+2007-12-11 Eitan Isaacson
+
+ * src/pyorbit.h (struct):
+ * src/pycorba-object.c (pycorba_object_dealloc),
+ (PyCORBA_Object_Type),
+ (pycorba_object_new_with_type): Added weakref support to Python
+ CORBA objects (bug #502925).
+
+2007-06-18 Sebastien Bacher
+
+ * m4/python-module.m4: use python-config to get python includes
+ (Closes #448178)
+
== PyORBit 2.14.3 ==
2007-05-26 Gustavo J. A. M. Carneiro
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/INSTALL new/pyorbit-2.24.0/INSTALL
--- old/pyorbit-2.14.3/INSTALL 2007-02-24 23:04:31.000000000 +0100
+++ new/pyorbit-2.24.0/INSTALL 2008-08-30 19:11:46.000000000 +0200
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +191,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/MAINTAINERS new/pyorbit-2.24.0/MAINTAINERS
--- old/pyorbit-2.14.3/MAINTAINERS 2007-01-03 23:51:18.000000000 +0100
+++ new/pyorbit-2.24.0/MAINTAINERS 2008-05-01 19:36:55.000000000 +0200
@@ -1,7 +1,9 @@
Current Maintainers
===================
-Gustavo J. A. M. Carneiro
+Gustavo J. A. M. Carneiro
+E-mail: gjc inescporto pt
+Userid: gjc
Former Maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/NEWS new/pyorbit-2.24.0/NEWS
--- old/pyorbit-2.14.3/NEWS 2007-05-26 15:16:46.000000000 +0200
+++ new/pyorbit-2.24.0/NEWS 2008-09-23 14:31:01.000000000 +0200
@@ -1,3 +1,8 @@
+pyorbit-2.24.0: 23-Sep-2008
+ - Added weakref support to Python CORBA objects (Eitan Isaacson, #502925)
+ - Allow accessing reference count data (Eitan Isaacson, #471391)
+ - Misc. build fixes (Thomas Lee, #522593, Sebastien Bacher, #448178)
+
pyorbit-2.14.3: 26-May-2007
- Fix build problem on Mac OS X
- Fix compatibility with non-ORBit2 based servants
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/PKG-INFO new/pyorbit-2.24.0/PKG-INFO
--- old/pyorbit-2.14.3/PKG-INFO 2007-05-26 15:17:28.000000000 +0200
+++ new/pyorbit-2.24.0/PKG-INFO 2008-09-23 14:31:37.000000000 +0200
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: PyORBit
-Version: 2.14.3
+Version: 2.24.0
Summary: Python bindings for the ORBit2 CORBA ORB
Home-page: http://www.daa.com.au/~james/software/pygtk/
Author: James Henstridge
Author-email: james@daa.com.au
License: GNU LGPL
-Download-url: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/pyorbit-2.14.3.tar.gz
+Download-url: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/pyorbit-2.24.0.tar.gz
Description: PyORBit is a binding for the ORBit2 CORBA ORB. It aims
to be compatible with the Python language mapping standard
(http://www.omg.org/cgi-bin/doc?formal/02-09-07), implementing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/configure.in new/pyorbit-2.24.0/configure.in
--- old/pyorbit-2.14.3/configure.in 2007-05-26 15:15:05.000000000 +0200
+++ new/pyorbit-2.24.0/configure.in 2008-09-23 14:27:43.000000000 +0200
@@ -2,8 +2,8 @@
AC_PREREQ(2.52)
m4_define(pyorbit_major_version, 2)
-m4_define(pyorbit_minor_version, 14)
-m4_define(pyorbit_micro_version, 3)
+m4_define(pyorbit_minor_version, 24)
+m4_define(pyorbit_micro_version, 0)
m4_define(pyorbit_version, pyorbit_major_version.pyorbit_minor_version.pyorbit_micro_version)
m4_define(orbit2_required_version, 2.12)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/m4/python-module.m4 new/pyorbit-2.24.0/m4/python-module.m4
--- old/pyorbit-2.14.3/m4/python-module.m4 2007-03-28 18:33:31.000000000 +0200
+++ new/pyorbit-2.24.0/m4/python-module.m4 2008-05-01 19:36:54.000000000 +0200
@@ -53,10 +53,14 @@
dnl deduce PYTHON_INCLUDES
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+if test -x "$PYTHON-config"; then
+PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+else
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
if test "$py_prefix" != "$py_exec_prefix"; then
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
fi
+fi
dnl check if the headers exist:
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
@@ -77,7 +81,7 @@
dnl use distutils to get some python configuration variables..
PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"`
-PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS')"`
+PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS'), sysconfig.get_config_var('MODLIBS')"`
PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"`
PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"`
@@ -98,7 +102,11 @@
$1], dnl
[
- PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
+ if test -x "$PYTHON-config"; then
+ PYTHON_EMBED_LIBS=`$PYTHON-config --ldflags 2>/dev/null`
+ else
+ PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
+ fi
LIBS="$save_LIBS $PYTHON_EMBED_LIBS";
AC_TRY_LINK_FUNC(Py_Initialize, dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/missing new/pyorbit-2.24.0/missing
--- old/pyorbit-2.14.3/missing 2007-02-24 23:04:31.000000000 +0100
+++ new/pyorbit-2.24.0/missing 2008-08-30 19:11:46.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/pyorbit.spec new/pyorbit-2.24.0/pyorbit.spec
--- old/pyorbit-2.14.3/pyorbit.spec 2007-05-26 15:17:28.000000000 +0200
+++ new/pyorbit-2.24.0/pyorbit.spec 2008-09-23 14:31:37.000000000 +0200
@@ -3,7 +3,7 @@
Summary: Python bindings for ORBit2.
Name: pyorbit
-Version: 2.14.3
+Version: 2.24.0
Release: 1
Copyright: LGPL
Group: Development/Languages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/src/pycorba-object.c new/pyorbit-2.24.0/src/pycorba-object.c
--- old/pyorbit-2.14.3/src/pycorba-object.c 2007-05-06 13:36:53.000000000 +0200
+++ new/pyorbit-2.24.0/src/pycorba-object.c 2008-08-31 15:49:13.000000000 +0200
@@ -28,12 +28,15 @@
static void
pycorba_object_dealloc(PyCORBA_Object *self)
{
+ if (self->in_weakreflist != NULL)
+ PyObject_ClearWeakRefs((PyObject *) self);
+
if (self->objref)
- CORBA_Object_release(self->objref, NULL);
+ CORBA_Object_release(self->objref, NULL);
self->objref = NULL;
if (self->ob_type->tp_free)
- self->ob_type->tp_free((PyObject *)self);
+ self->ob_type->tp_free((PyObject *)self);
else
PyObject_DEL(self);
}
@@ -252,6 +255,13 @@
}
+static PyObject *
+pycorba_object__get_orbit_object_refcount(PyCORBA_Object *self)
+{
+ ORBit_RootObject robj = (ORBit_RootObject)self->objref;
+ return Py_BuildValue("i", robj->refs);
+}
+
static PyMethodDef pycorba_object_methods[] = {
{ "_is_nil", (PyCFunction)pycorba_object__is_nil, METH_NOARGS,
"_is_nil() -> boolean" },
@@ -267,6 +277,9 @@
"_hash(maximum) -> int" },
{ "_narrow", (PyCFunction)pycorba_object__narrow, METH_VARARGS,
"_narrow(stub) -> object" },
+ { "_get_orbit_object_refcount",
+ (PyCFunction)pycorba_object__get_orbit_object_refcount, METH_NOARGS,
+ "_get_orbit_object_refcount() -> integer"},
{ NULL, NULL, 0 }
};
@@ -297,7 +310,7 @@
(traverseproc)0, /* tp_traverse */
(inquiry)0, /* tp_clear */
(richcmpfunc)0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
+ offsetof(PyCORBA_Object, in_weakreflist), /* tp_weaklistoffset */
(getiterfunc)0, /* tp_iter */
(iternextfunc)0, /* tp_iternext */
pycorba_object_methods, /* tp_methods */
@@ -337,6 +350,7 @@
args = PyTuple_New(0);
self = (PyCORBA_Object *)stub->tp_new(stub, args, NULL);
+ self->in_weakreflist = NULL;
Py_DECREF(args);
if (!self)
return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.3/src/pyorbit.h new/pyorbit-2.24.0/src/pyorbit.h
--- old/pyorbit-2.14.3/src/pyorbit.h 2007-01-03 23:51:18.000000000 +0100
+++ new/pyorbit-2.24.0/src/pyorbit.h 2008-05-01 19:36:54.000000000 +0200
@@ -26,6 +26,7 @@
typedef struct {
PyObject_HEAD
CORBA_Object objref;
+ PyObject *in_weakreflist;
} PyCORBA_Object;
typedef struct {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org