From owner-freebsd-openoffice@FreeBSD.ORG Sun Dec 30 07:54:47 2007 Return-Path: Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F77616A41A for ; Sun, 30 Dec 2007 07:54:47 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from mail09.syd.optusnet.com.au (mail09.syd.optusnet.com.au [211.29.132.190]) by mx1.freebsd.org (Postfix) with ESMTP id 96EBD13C458 for ; Sun, 30 Dec 2007 07:54:46 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from server.vk2pj.dyndns.org (c220-239-20-82.belrs4.nsw.optusnet.com.au [220.239.20.82]) by mail09.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id lBU7sd5m010619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 30 Dec 2007 18:54:40 +1100 Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by server.vk2pj.dyndns.org (8.14.2/8.14.1) with ESMTP id lBU7scTa076360; Sun, 30 Dec 2007 18:54:38 +1100 (EST) (envelope-from peter@server.vk2pj.dyndns.org) Received: (from peter@localhost) by server.vk2pj.dyndns.org (8.14.2/8.14.2/Submit) id lBU7scGV076359; Sun, 30 Dec 2007 18:54:38 +1100 (EST) (envelope-from peter) Date: Sun, 30 Dec 2007 18:54:38 +1100 From: Peter Jeremy To: Kris Moore Message-ID: <20071230075437.GA75947@server.vk2pj.dyndns.org> References: <4773BFF6.4020203@pcbsd.org> <4774142C.50709@pcbsd.com> <20071228215415.GQ40785@server.vk2pj.dyndns.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="cmJC7u66zC7hs+87" Content-Disposition: inline In-Reply-To: <20071228215415.GQ40785@server.vk2pj.dyndns.org> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.17 (2007-11-01) Cc: freebsd-openoffice@freebsd.org, jeff.colter@gmail.com Subject: Re: Problem with openoffice 2.3.1 on freebsd... X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2007 07:54:47 -0000 --cmJC7u66zC7hs+87 Content-Type: multipart/mixed; boundary="HlL+5n6rz5pIUxbD" Content-Disposition: inline --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 29, 2007 at 08:54:15AM +1100, Peter Jeremy wrote: >On Thu, Dec 27, 2007 at 10:08:38AM -0500, Kris Moore wrote: >>I noticed that a patch was made to fix it: >> >>http://lists.freebsd.org/pipermail/freebsd-openoffice/2007-December/00346= 4.html > >I've tried this patch and it had no effect - OOo still reports the same >glib initialisation errors and hangs. I tried to short-cut the OOo build and whilst systemshell.cxx was recompiled and libsysshell.a re-created, it seems that libsfx680fi.so was not (I'd verified the former but not the latter). Apologies for misleading the group. In any case, I created a slightly extended version of the patch (which removes all the offending code), did a full re-compile and it now works. --=20 Peter Jeremy Please excuse any delays as the result of my ISP's inability to implement an MTA that is either RFC2821-compliant or matches their claimed behaviour. --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-gtkfix Content-Transfer-Encoding: quoted-printable --- shell/source/unix/sysshell/systemshell.cxx.orig 2007-12-29 07:58:28.000= 000000 +1100 +++ shell/source/unix/sysshell/systemshell.cxx 2007-12-29 20:15:55.00000000= 0 +1100 @@ -72,8 +72,10 @@ const rtl::OUString LIB_RECENT_FILE =3D UNISTRING("librecentfile.so"); const rtl::OUString DEFAULT_CONTEXT =3D UNISTRING("DefaultContext"); =20 +#ifdef GTK_IS_BROKEN void * (* sym_gtk_recent_manager_get_default) () =3D NULL; void (* sym_gtk_recent_manager_add_item) (void *, const char *) =3D NULL; +#endif =20 // We need to re-encode file urls because osl_getFileURLFromSystemPath con= verts // to UTF-8 before encoding non ascii characters, which is not what other = apps expect. @@ -114,6 +116,7 @@ return url; } =20 +#ifdef GTK_IS_BROKEN bool init_recent_manager_api() { oslModule hDefault; @@ -128,24 +131,28 @@ bool ret =3D (NULL !=3D sym_gtk_recent_manager_get_default) && (NU= LL !=3D sym_gtk_recent_manager_add_item); return ret; } - =20 +#endif =20 //############################## void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl:= :OUString& aMimeType) { +#ifdef GTK_IS_BROKEN static bool bIsRecentManagerPresent =3D init_recent_manager_api(); +#endif =20 // Convert file URL for external use (see above) rtl::OUString externalUrl =3D translateToExternalUrl(aFileUrl); if( 0 =3D=3D externalUrl.getLength() ) externalUrl =3D aFileUrl; =20 +#ifdef GTK_IS_BROKEN if( bIsRecentManagerPresent ) { void * recent_manager =3D sym_gtk_recent_manager_get_default(); sym_gtk_recent_manager_add_item(recent_manager, rtl::OUStringT= oOString(aFileUrl, RTL_TEXTENCODING_UTF8).getStr()); } else +#endif { rtl::OUString librecentfile_url =3D get_absolute_library_url(L= IB_RECENT_FILE); =20 --HlL+5n6rz5pIUxbD-- --cmJC7u66zC7hs+87 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFHd069/opHv/APuIcRAh3AAKC0b/CFnTViHYnK8y5Qv4peUm1nJgCeLZHc 0tkxmojipBNPa03/AHUkw0M= =7cnp -----END PGP SIGNATURE----- --cmJC7u66zC7hs+87--