Date: Sun, 30 Dec 2007 18:54:38 +1100 From: Peter Jeremy <peterjeremy@optushome.com.au> To: Kris Moore <kris@pcbsd.com> Cc: freebsd-openoffice@freebsd.org, jeff.colter@gmail.com Subject: Re: Problem with openoffice 2.3.1 on freebsd... Message-ID: <20071230075437.GA75947@server.vk2pj.dyndns.org> In-Reply-To: <20071228215415.GQ40785@server.vk2pj.dyndns.org> References: <4773BFF6.4020203@pcbsd.org> <4774142C.50709@pcbsd.com> <20071228215415.GQ40785@server.vk2pj.dyndns.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071230075437.GA75947>