From owner-freebsd-openoffice@FreeBSD.ORG  Fri Dec 10 21:46:07 2004
Return-Path: <owner-freebsd-openoffice@FreeBSD.ORG>
Delivered-To: freebsd-openoffice@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2221516A4CE
	for <openoffice@freebsd.org>; Fri, 10 Dec 2004 21:46:07 +0000 (GMT)
Received: from rproxy.gmail.com (rproxy.gmail.com [64.233.170.199])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C52043D1F
	for <openoffice@freebsd.org>; Fri, 10 Dec 2004 21:46:06 +0000 (GMT)
	(envelope-from sander.vesik@gmail.com)
Received: by rproxy.gmail.com with SMTP id z35so479416rne
        for <openoffice@freebsd.org>; Fri, 10 Dec 2004 13:46:05 -0800 (PST)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
	s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:references;
	b=ZmN18Fv3FeWx6dztLM4WZHCPtHvehuV49Y2mspbCMwbteYUyCkffILpX7kPX4k1xXFsuH+RtflG9XoDqweweVAwsVZGFLKuHvbNsQgypJuO8KNK/UjWJrh+hWumBPw0LkF3V5hh5QHshaId/FA//8Ym+Rahhltxfxh9ItKQZh0E=
Received: by 10.38.104.13 with SMTP id b13mr684726rnc;
        Fri, 10 Dec 2004 13:46:05 -0800 (PST)
Received: by 10.38.66.64 with HTTP; Fri, 10 Dec 2004 13:46:05 -0800 (PST)
Message-ID: <dcb2c27a04121013467eb84035@mail.gmail.com>
Date: Fri, 10 Dec 2004 23:46:05 +0200
From: Sander Vesik <sander.vesik@gmail.com>
To: NAKATA Maho <chat95@mac.com>
In-Reply-To: <20041202.151042.730570312.chat95@mac.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
References: <dcb2c27a04112914476601baf7@mail.gmail.com>
	 <20041201.131943.783371855.chat95@mac.com>
	 <dcb2c27a04120108305a57b4c9@mail.gmail.com>
	 <20041202.151042.730570312.chat95@mac.com>
cc: openoffice@freebsd.org
Subject: Re: m62 break in sw
X-BeenThere: freebsd-openoffice@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Sander Vesik <sander.vesik@gmail.com>
List-Id: Porting OpenOffice to FreeBSD <freebsd-openoffice.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-openoffice>
List-Post: <mailto:freebsd-openoffice@freebsd.org>
List-Help: <mailto:freebsd-openoffice-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Dec 2004 21:46:07 -0000

On Thu, 02 Dec 2004 15:10:42 +0900 (JST), NAKATA Maho <chat95@mac.com> wrote:
> In Message-ID: <dcb2c27a04120108305a57b4c9@mail.gmail.com>
> Sander Vesik <sander.vesik@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