Date: Tue, 19 Feb 2019 12:05:20 -0500 From: Greg Veldman <freebsd@gregv.net> To: Li-Wen Hsu <lwhsu@freebsd.org> 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: <20190219170520.GC98237@aurora.gregv.net> In-Reply-To: <CAKBkRUztkbJJTHe2B24MmCpcVeeR83%2Bi9Y6pUUhDO-P8bgOomw@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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. ;-) -- Greg Veldman
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190219170520.GC98237>