maintainer-approval requested: [Bug 236867] print/freetype2: Update to 2.10.0 : [Attachment 203809] Proposed patch (since 468892 revision)

[bugzilla-noreply at freebsd.org]

lightside <lightside at gmx.com> has asked freebsd-gnome mailing list
<gnome at FreeBSD.org> for maintainer-approval:
Bug 236867: print/freetype2: Update to 2.10.0
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236867

Attachment 203809: Proposed patch (since 468892 revision)
https://bugs.freebsd.org/bugzilla/attachment.cgi?id=203809&action=edit



--- Comment #2 from lightside <lightside at gmx.com> ---
Created attachment 203809
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=203809&action=edit
Proposed patch (since 468892 revision)

(In reply to comment #1)
> Submitter pointed out (via e-mail) that there are a few issues the current
> freetype2 releases.
Looks like, there are fixes for mentioned bug reports:
> bug #56092: [regression] Awesomenauts crash after upgrading to 2.10.0
> https://savannah.nongnu.org/bugs/?56092
[smooth] Fix segfault in direct mode (#56092).
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=1f271751a39e
5bc9c639adc213183ed5e58a9401

> bug #56067: PCF defaultChar changes in 2.10 causes FontConfig to
mis-detect(?)
> charsets
> https://savannah.nongnu.org/bugs/?56067
[pcf] Fix handling of undefined glyph (#56067).
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c149f7397e48
4c97f45fb75fa1c7fdda2fc646cd

> So deny the current patch until upstream can sort out these issues.
I guess, possible to wait for next (e.g. 2.10.1) release or apply mentioned
fixes for 2.10.0 release version.

Attached new patch with applied fixes.
This is how files/patch-2.10.0.diff was created:
-8<--
% git clone https://git.savannah.gnu.org/git/freetype/freetype2.git
<..>
% git clone freetype2 freetype2-devel
% cd freetype2-devel
% git checkout -b devel VER-2-10-0
<..>
% git cherry-pick 6986ddac1ece9404c9b640a512cbd99534205fda
<..>
% git checkout ChangeLog
Updated 1 path from the index
% git commit --no-edit
[devel 2e59841ea] [cff] Fix boundary checks.
<..>
% git cherry-pick 1f271751a39e5bc9c639adc213183ed5e58a9401
<..>
% git checkout VER-2-10-0 ChangeLog
Updated 1 path from 25a3e55ed
% git commit --no-edit
[devel f502783f6] [smooth] Fix segfault in direct mode (#56092).
<..>
% git cherry-pick c149f7397e484c97f45fb75fa1c7fdda2fc646cd
<..>
% git checkout VER-2-10-0 ChangeLog docs/CHANGES
Updated 2 paths from 25a3e55ed
% git commit --no-edit
[devel 12c204893] [pcf] Fix handling of undefined glyph (#56067).
<..>
% git show -s --format="# %s%n#
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=%H"
6986ddac1ece9404c9b640a512cbd99534205fda
1f271751a39e5bc9c639adc213183ed5e58a9401
c149f7397e484c97f45fb75fa1c7fdda2fc646cd > ../patch-2.10.0.diff
% echo >> ../patch-2.10.0.diff
% git diff --no-color --no-prefix VER-2-10-0 HEAD | sed -e '/^index/d ;
/^deleted/d' >> ../patch-2.10.0.diff
% git checkout master
<..>
% git branch -D devel
<..>
-->8-

Remove local freetype2-devel repository (including freetype2 directory, if
needed):
% cd .. && rm -rf freetype2-devel

Then move patch-2.10.0.diff to files directory of the print/freetype2 port (and
recreate patch(es) with `make makepatch` command, if needed).