On Wed, 2005-09-07 at 15:42 +0200, Jules Colding wrote:
> Hi,
>
> The patch below fixes my earlier problems with ORBit2 and shared
> libraries. "make check" is happy and I have used a few days to spot for
> any unwanted side effect, but found none.
>
> Please comment. I'll commit shortly if no-one objects.
This version of the patch is has no whitespace noise. Sorry for the
other one.
--
jules
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.727
diff -u -p -r1.727 ChangeLog
--- ChangeLog 6 Sep 2005 13:22:30 -0000 1.727
+++ ChangeLog 7 Sep 2005 16:32:37 -0000
@@ -1,3 +1,10 @@
+2005-09-07 Jules Colding <[EMAIL PROTECTED]>
+
+ * configure.in (LT_VERSION): Version 2.13.2. This is needed as the
change
+ below actually makes some programs run when they would otherwise not.
+
+ * src/orb/GIOP/giop.c (giop_main_run): Remove g_assert().
+
2005-09-06 Mark McLoughlin <[EMAIL PROTECTED]>
* configure.in: Version 2.13.1
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ORBit2/configure.in,v
retrieving revision 1.158
diff -u -p -r1.158 configure.in
--- configure.in 6 Sep 2005 13:22:30 -0000 1.158
+++ configure.in 7 Sep 2005 16:32:37 -0000
@@ -18,7 +18,7 @@ AC_SUBST(LT_VERSION)
ORBIT_MAJOR_VERSION=2
ORBIT_MINOR_VERSION=13
-ORBIT_MICRO_VERSION=1
+ORBIT_MICRO_VERSION=2
ORBIT_VERSION=$ORBIT_MAJOR_VERSION.$ORBIT_MINOR_VERSION.$ORBIT_MICRO_VERSION
AC_SUBST(ORBIT_MAJOR_VERSION)
AC_SUBST(ORBIT_MINOR_VERSION)
Index: src/orb/GIOP/giop.c
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/GIOP/giop.c,v
retrieving revision 1.52
diff -u -p -r1.52 giop.c
--- src/orb/GIOP/giop.c 13 Apr 2005 11:40:08 -0000 1.52
+++ src/orb/GIOP/giop.c 7 Sep 2005 16:32:37 -0000
@@ -625,7 +625,6 @@ void
giop_main_run (void)
{
if (giop_thread_io ()) {
- g_assert (giop_thread_self () == giop_main_thread);
g_assert (giop_main_loop == NULL);
giop_main_loop = g_main_loop_new (NULL, TRUE);
g_main_loop_run (giop_main_loop);
_______________________________________________
orbit-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/orbit-list
