m62 break in sw

Sander Vesik sander.vesik at gmail.com
Fri Dec 10 13:46:07 PST 2004


On Thu, 02 Dec 2004 15:10:42 +0900 (JST), NAKATA Maho <chat95 at mac.com> wrote:
> In Message-ID: <dcb2c27a04120108305a57b4c9 at mail.gmail.com>
> Sander Vesik <sander.vesik at gmail.com> wrote:
> 
> > There are however problems with javaldx (which doesn't like the BSD
> > way of calling the jdk 1.4.2-p6 or similar and needs patching) and
> > something with libxml2.so version. And epm has some more
> > complaints....
> 
> yes. I know about it.
> javaldx always fails, as you know jvmfwk is largely changed.
> and also recently pythonupgrade cws is integrated...
> 
> thanks,
> -- NAKATA, Maho
> 
> 

A hack like this makes javaldx work: 

Index: plugins/sunmajor/pluginlib/sunversion.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v
retrieving revision 1.4
diff -u -r1.4 sunversion.cxx
--- plugins/sunmajor/pluginlib/sunversion.cxx   23 Jul 2004 11:52:17
-0000     1.4
+++ plugins/sunmajor/pluginlib/sunversion.cxx   10 Dec 2004 20:38:40 -0000
@@ -243,7 +243,9 @@
             m_preRelease = Rel_RC1;
         else if (! strcmp(pCur, "rc2"))
             m_preRelease = Rel_RC2;
-        else if (! strcmp(pCur, "rc3"))
+        else if (! strcmp(pCur, "p6"))
+               return true;
+       else if (! strcmp(pCur, "rc3"))
             m_preRelease = Rel_RC3;
         else
             return false;

getting it be a real patch would just be some extra changes to handle
the extra _0x and a #ifdef freebsd to surroundit all or very close to
that I think


More information about the freebsd-openoffice mailing list