Date: Tue, 26 Feb 2019 21:38:28 +0800 From: Li-Wen Hsu <lwhsu@freebsd.org> To: Greg Veldman <freebsd@gregv.net> Cc: freebsd-office@freebsd.org, Greg V <greg@unrelenting.technology>, Jung-uk Kim <jkim@freebsd.org>, Justin Hibbits <jhibbits@freebsd.org> Subject: Re: [call for help] libreoffice 6.2 update Message-ID: <CAKBkRUze9ML3R_KJnEjktReO4vFuTKHhwqArpcx6VXJOG3u4tg@mail.gmail.com> In-Reply-To: <20190219170520.GC98237@aurora.gregv.net> References: <CAKBkRUwohGA4Lka-tpCZnj7rt2V=henc%2B0b==HtLxP-WLXeLJg@mail.gmail.com> <CAKBkRUyeYa4V8op6FS-mPqUUMXgwQ3mLze0WFFf3z2Z-_KNiBw@mail.gmail.com> <CAKBkRUyD3hXOdfMdNfU78CPUYWOEJT3TfUTm3OW_9JDHhs=Ebw@mail.gmail.com> <20190218144218.GA98237@aurora.gregv.net> <20190218150917.GB98237@aurora.gregv.net> <CAKBkRUztkbJJTHe2B24MmCpcVeeR83%2Bi9Y6pUUhDO-P8bgOomw@mail.gmail.com> <20190219170520.GC98237@aurora.gregv.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Feb 20, 2019 at 1:05 AM Greg Veldman <freebsd@gregv.net> wrote:
>
> On Tue, Feb 19, 2019 at 02:50:15AM +0900, Li-Wen Hsu wrote:
> > Thanks very much for the help! Dropping these patches and focusing on
> > the supported FreeBSD versions sounds very reasonable to me.
>
> OK, I have a clean build, and I've pushed my changes up to your
> GitHub repo. Highlights include:
>
> - bump to 6.2.1.1
> - remove patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx
> and patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx
> as these appear to be primarily for building on now-unsupported
> FreeBSD versions
> - update graphics/libetonyek01 to use mdds-1.4
> - in commit c53de0f of your repo, it appears you're trying to
> update the Makefile to account for the fact that
> emojione-color-font is now deprecated - I updated to reflect
> the fact that twemoji-color-font does not provide that file
> but instead provides TwitterColorEmoji-SVGinOT.ttf
> - in commit d4d3766 of upstream LibreOffice, several variables
> in sal/osl/unx/thread.cxx were declared to be const. However
> in function osl_thread_priority_init_Impl() they are assigned
> values based on the return of various sched_get_priority_*()
> functions. I'm not a C++ expert, but I believe this to be
> an upstream bug. Note that on Linux all of this code is
> skipped due to the definition of NO_PTHREAD_PRIORITY in
> sal/osl/unx/system.hxx, so the compiler error wouldn't show
> up. For now I've reverted that part of the commit. If there's
> a cleaner way to do this, let me know. If you agree it's
> actually a bug, I'll submit it upstream.
>
> I've tested that these changes build/run on my 11.2 box. I'll
> try on some other systems as I have time, but I wanted to get
> the changes I've been working on pushed back up to your repo
> in case anyone else wants to take a look, and also to protect
> against any possible loss. ;-)
Thanks very much for all these work! I haven't had time to get a
deeper test, but it also builds and runs fine on my 13-CURRENT system.
Here are some quick feedback from me:
- Now libreoffice doesn't build on i386 systems:
/wrkdirs/usr/ports/editors/libreoffice/work/libreoffice-6.2.1.1/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:167:32:
error: unknown type name '__si_class_type_info'
rtti = new __si_class_type_info(
^
/wrkdirs/usr/ports/editors/libreoffice/work/libreoffice-6.2.1.1/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx:173:32:
error: unknown type name '__class_type_info'
rtti = new __class_type_info( strdup( rttiName ) );
^
2 errors generated.
It seems because we removed the two
patch-bridges_source_cpp__uno_gcc3__linux__intel_* files, but
currently I don't know why this affect 32-bit systems. The full error
log is available at:
https://gist.github.com/lwhsu/957db6755bacc2ee086b2fae513e5406
- For the assigning values to const variables issue (commit d4d3766 of
LibreOffice), it also sounds a bug to me. I would suggest open an
issue at upstream and see what they reply.
- Haven't checked Calc can use libnumbertext correctly. I'll try to
do that later this week.
- There are some minor fixes pushed to the repository.
BTW, if this makes your development easier, please just commit
whatever you have to the repository for avoiding dropping single big
commit, or feel free to new branches. Thanks for the work again!
Li-Wen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAKBkRUze9ML3R_KJnEjktReO4vFuTKHhwqArpcx6VXJOG3u4tg>