summaryrefslogtreecommitdiff
path: root/devel/fnorb
diff options
context:
space:
mode:
authorJohann Visagie <wjv@FreeBSD.org>2001-10-09 10:52:12 +0000
committerJohann Visagie <wjv@FreeBSD.org>2001-10-09 10:52:12 +0000
commitaf55a3704656038199673db579381eadf6b8682b (patch)
treea5782719676163f99f02e4ab47377374ebcd8b40 /devel/fnorb
parent- Update to version 2.50.39 (diff)
- Add yet another patch to ensure compatibility with Python 2.0 and later.
- Bump PORTREVISION. Submitted by: The inimitable Brad Champan <chapmanb@arches.uga.edu>
Notes
Notes: svn path=/head/; revision=48595
Diffstat (limited to 'devel/fnorb')
-rw-r--r--devel/fnorb/Makefile2
-rw-r--r--devel/fnorb/files/patch-aa2
-rw-r--r--devel/fnorb/files/patch-orb-TypeCode.py32
3 files changed, 34 insertions, 2 deletions
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 5a691bb5a6ff..1e6e1038c9f2 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fnorb
PORTVERSION= 1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel python
MASTER_SITES= http://www.fnorb.org/download/ \
ftp://ftp.dstc.edu.au/DSTC/fnorb/
diff --git a/devel/fnorb/files/patch-aa b/devel/fnorb/files/patch-aa
index 477164e4779f..e85be8eb3f3a 100644
--- a/devel/fnorb/files/patch-aa
+++ b/devel/fnorb/files/patch-aa
@@ -1,4 +1,4 @@
-Allow the port to work with Python 2.0. This should be fixed in the next
+Allow the port to work with Python 2.0+. This should be fixed in the next
release of Fnorb. (Caveat: There may be more broken calls.)
Thanks to Mike Meyer <mwm@mired.org>, Brad Chapman <chapmanb@arches.uga.edu>.
diff --git a/devel/fnorb/files/patch-orb-TypeCode.py b/devel/fnorb/files/patch-orb-TypeCode.py
new file mode 100644
index 000000000000..a714d4dec4f4
--- /dev/null
+++ b/devel/fnorb/files/patch-orb-TypeCode.py
@@ -0,0 +1,32 @@
+Yet another patch to ensure compatibility with Python 2.0+.
+
+Thanks to Brad Chapman <chapmanb@arches.uga.edu> and
+David Konerding <dek@cgl.ucsf.edu>.
+
+-- Johann <wjv@FreeBSD.org>
+
+
+--- orb/TypeCode.py.orig Mon Apr 3 16:08:35 2000
++++ orb/TypeCode.py Tue Oct 9 12:38:52 2001
+@@ -1240,13 +1240,17 @@
+ def _fnorb_marshal_value(self, cursor, value):
+ """ Marshal a VALUE of this type onto an octet stream. """
+
+- if (not isinstance(value, CORBA.Object) and
+- not isinstance(value, CORBA.Object_skel)):
+- raise CORBA.BAD_PARAM()
+-
++ ## Bugfix: check if value is None *before* checking its
++ ## instance type (otherwise, trying to return a None
++ ## in place of an InterfaceObject would fail with BAD_PARAM
++
+ # Python 'None' is used to represent CORBA 'nil'
+ if value is None:
+ value = CORBA.Object(IOP.IOR())
++
++ if (not isinstance(value, CORBA.Object) and
++ not isinstance(value, CORBA.Object_skel)):
++ raise CORBA.BAD_PARAM()
+
+ value._fnorb_marshal(cursor)
+