Bug 239167 - x11-fonts/fontconfig: update to 2.13.1
Summary: x11-fonts/fontconfig: update to 2.13.1
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-07-12 16:15 UTC by Steve Wills
Modified: 2019-07-28 13:50 UTC (History)
5 users (show)

See Also:
bugzilla: maintainer-feedback? (gnome)
swills: exp-run?


Attachments
patch to update fontconfig (10.99 KB, patch)
2019-07-12 16:15 UTC, Steve Wills
no flags Details | Diff
Proposed patch for x11-fonts/fontconfig (since 479806 revision) (2.68 KB, patch)
2019-07-15 01:43 UTC, lightside
no flags Details | Diff
Proposed patch for x11-fonts/fontconfig-reference (since 469428 revision) (1.89 KB, patch)
2019-07-15 01:44 UTC, lightside
no flags Details | Diff
Proposed patch for x11-fonts/fontconfig (since 479806 revision) (18.87 KB, patch)
2019-07-15 22:14 UTC, lightside
no flags Details | Diff
Proposed patch for x11-fonts/fontconfig (since 479806 revision) (22.37 KB, patch)
2019-07-16 18:48 UTC, lightside
no flags Details | Diff
x11-fonts/fontconfig (since 479806 revision) (22.37 KB, patch)
2019-07-18 00:32 UTC, lightside
no flags Details | Diff
updated unified patch relative to PORTSDIR (5.11 KB, patch)
2019-07-23 12:40 UTC, Steve Wills
no flags Details | Diff
updated unified patch relative to PORTSDIR, with missing patch (24.82 KB, patch)
2019-07-23 12:59 UTC, Steve Wills
no flags Details | Diff
Proposed unified patch (since 479806 revision) (29.60 KB, patch)
2019-07-24 08:57 UTC, lightside
no flags Details | Diff
Proposed unified patch (since 479806 revision) (30.06 KB, patch)
2019-07-26 19:32 UTC, lightside
lightside: maintainer-approval? (gnome)
Details | Diff
Proposed patch for deskutils/simpleagenda (since 492056 revision) (1010 bytes, patch)
2019-07-28 13:36 UTC, lightside
lightside: maintainer-approval? (theraven)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Steve Wills freebsd_committer 2019-07-12 16:15:15 UTC
Created attachment 205723 [details]
patch to update fontconfig
Comment 1 Steve Wills freebsd_committer 2019-07-12 16:18:11 UTC
Obtained from: https://github.com/freebsd/freebsd-ports-gnome/tree/gnome-3.32
Comment 2 lightside 2019-07-15 01:43:53 UTC
Created attachment 205785 [details]
Proposed patch for x11-fonts/fontconfig (since 479806 revision)

Hello.

I propose some changes for x11-fonts/fontconfig update (based on attachment #205723 [details]):
- Fix pkg-plist for non-default options
- Revert changes for REFERENCE_PORT check
- Remove CONFIGURE_ENV changes, because of following changes:
https://cgit.freedesktop.org/fontconfig/commit/?id=8f4c4d278d013f6cc69ba7d7bf0f8aed11398dfb
Comment 3 lightside 2019-07-15 01:44:54 UTC
Created attachment 205786 [details]
Proposed patch for x11-fonts/fontconfig-reference (since 469428 revision)

Don't know why there is a need to remove x11-fonts/fontconfig-reference port.
Possible to update it, with using changes for pkg-plist file.
Comment 4 lightside 2019-07-15 22:14:57 UTC
Created attachment 205810 [details]
Proposed patch for x11-fonts/fontconfig (since 479806 revision)

There is also a possibility to use some patches from upstream repository (or 2.13.91 version with some patches).

Attached new patch with files/patch-2.13.1.diff, just in case.
Comment 5 lightside 2019-07-16 18:48:16 UTC
Created attachment 205827 [details]
Proposed patch for x11-fonts/fontconfig (since 479806 revision)

Added changes from the following commit to the files/patch-2.13.1.diff:
Improve the performance a bit
https://cgit.freedesktop.org/fontconfig/commit/?id=cb3e6ff4d7628b6eb1dd8f78737de5c387aaf2e1
Comment 6 lightside 2019-07-16 19:12:07 UTC
(In reply to comment #5)
I used following commands to create (and check) files/patch-2.13.1.diff file:
-8<--
% git clone git://anongit.freedesktop.org/fontconfig
% git clone fontconfig fontconfig-devel
% cd fontconfig-devel
% git checkout -b devel 2.13.1
% setenv COMMITS "8208f99fa1676c42bfd8d74de3e9dac5366c150c 806fd4c2c5164d66d978b0a4c579c157e5cbe766 1aa8b700c3f09a31c78e7834e0db373f80b5e226 67b4090321c0ec3cf3dc96f6d3cd7b9d03af0f25 e4788c5a96e0f384ad5702ad8096b0e144613895 ff5b49be2be0922f0fb6b9daf08f64a88d2fae6b 5f5ec5676c61b9773026a9335c9b0dfa73a73353 5f12f564f8748deaa603adb7a4b8f616b6390ad4 f7036d589bffe353c1982b881afae6ec0a2ef200 648e0cf3d5a53efeab93b24ae37490427d05229d 9d5149ac41e18ab67404ddba41d7ef7e71839ebc b047e299546ac3abb79cf0bac3c67f5c2dfc7fb6 699d6e4d8415a5d94483ea81fdf277964a33b8f1 586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16 97fa77d27facc6a31486fdca5b3b853c591f792c c336b8471877371f0190ba06f7547c54e2b890ba 66b0af41b81c5f0db1a8f952beaaada95e221d14 c0dc76268bb278c4bd123afbfb3409be64d0ed75 f2d4291d12ca1a2146d90da32a399fffff3e8227 322131f4330f972820fd903959999af9360120c0 a57f22bf6d93ad4079a6ae01fa00456921dc73e1 cb3e6ff4d7628b6eb1dd8f78737de5c387aaf2e1 2960391699ab3b417a17a0a2ac29e97e9c3d3c99"
% git cherry-pick $COMMITS
<..>
% git show -s --format="# %s%n# https://cgit.freedesktop.org/fontconfig/commit/?id=%H" $COMMITS > ../patch-2.13.1.diff
% echo >> ../patch-2.13.1.diff
% git diff --no-color --no-prefix 2.13.1 HEAD | sed -e '/^index/d ; /^deleted/d' >> ../patch-2.13.1.diff
% echo "How to check changes for used files in the final patch" > /dev/null
% sha256 fc-validate/fc-validate.c fontconfig/fontconfig.h fonts.dtd src/fccache.c src/fccfg.c src/fcdir.c src/fcfreetype.c src/fcint.h src/fcweight.c src/fcxml.c | sha256
a176090a086817ec1f7c3a42389d9264ce0372c088e113f895079268ad0a976b
% git checkout master
<..>
% git branch -D devel
<..>
-->8-
Comment 7 Steve Wills freebsd_committer 2019-07-16 23:02:50 UTC
Comment on attachment 205723 [details]
patch to update fontconfig

Other patches look fine to me, marking mine obsolete.
Comment 8 lightside 2019-07-18 00:32:53 UTC
Created attachment 205855 [details]
x11-fonts/fontconfig (since 479806 revision)

(In reply to comment #7)
Thanks for review.

Sorted OPTIONS_DEFINE.
Comment 9 Steve Wills freebsd_committer 2019-07-23 12:40:38 UTC
Created attachment 206007 [details]
updated unified patch relative to PORTSDIR

Here's an updated version of the patch that puts all changes in one file and is relative to PORTSDIR.
Comment 10 Steve Wills freebsd_committer 2019-07-23 12:59:27 UTC
Created attachment 206009 [details]
updated unified patch relative to PORTSDIR, with missing patch

Oops, missed adding a file there. This should be right.
Comment 11 Koop Mast freebsd_committer 2019-07-23 20:46:03 UTC
Apologies, I was under the impression that I already responded.

First off thanks for doing the work on this update.

I'm still having the opinion of deleting the -reference ports. They only contain development API documentation and I also keep forgetting they exist.
Comment 12 lightside 2019-07-24 08:57:16 UTC
Created attachment 206030 [details]
Proposed unified patch (since 479806 revision)

Thanks for review.

(In reply to comment #11)
If this is because of the need to update x11-fonts/fontconfig-reference/pkg-plist file, there is a possibility to remove it and use dynamic package list, like it already used for PORTDOCS in included devel/glib20-reference/bsd.gnome-reference.mk file:
--8<--
DATADIR=	${PREFIX}/man/man3
PORTDATA=	*
-->8--

How to check such package list:
-8<--
% make check-plist
% make -V TMPPLIST | xargs cat
-->8-

Attached this variant, just in case.
Comment 14 lightside 2019-07-26 19:32:57 UTC
Created attachment 206087 [details]
Proposed unified patch (since 479806 revision)

Added changes from the following commit to the files/patch-2.13.1.diff:
Fix a memory leak in FcFreeTypeQuery*()
https://cgit.freedesktop.org/fontconfig/commit/?id=e2f9f28aed1470a07c33a57940d68b6a3cbe235b
Comment 15 Antoine Brodin freebsd_committer 2019-07-28 05:30:56 UTC
New failure on 12.0 amd64:

http://package18.nyi.freebsd.org/data/120amd64-default-PR239167/2019-07-26_19h12m36s/logs/errors/simpleagenda-0.43_10.log

This seems to be a side effect of the new misc/e2fsprogs-libuuid dependency
Comment 16 lightside 2019-07-28 13:36:44 UTC
Created attachment 206117 [details]
Proposed patch for deskutils/simpleagenda (since 492056 revision)

Thanks for exp-run.

(In reply to comment #15)
> New failure on 12.0 amd64:
> <..>
> This seems to be a side effect of the new misc/e2fsprogs-libuuid dependency
Yes, the same happens for current x11-fonts/fontconfig v2.12.6, if install misc/e2fsprogs-libuuid port (for example, as dependency for other port(s)).

This is because of usage of following sed patch in deskutils/simpleagenda/Makefile:
https://github.com/freebsd/freebsd-ports/blob/0699c59a70f510b71506ecb61199c2ee997c9c8a/deskutils/simpleagenda/Makefile#L26
-8<--
	${REINPLACE_CMD} -e 's|-luuid||' ${WRKSRC}/GNUmakefile.preamble
-->8-
which removes linkage with uuid library.

Attached patch for deskutils/simpleagenda port.

To note:
The uuid library dependency was removed for fontconfig v2.13.91:
https://cgit.freedesktop.org/fontconfig/commit/?id=c4324f54ee16e648ba91f3e9c66af13ab3b1754c
Comment 17 lightside 2019-07-28 13:50:36 UTC
Comment on attachment 206117 [details]
Proposed patch for deskutils/simpleagenda (since 492056 revision)

(In reply to comment #16)
I also added base and gui to USE_GNUSTEP variable, because of stage-qa errors/warnings:
-8<--
====> Running Q/A tests (stage-qa)
<..>
Warning: you need USES+=gnustep and USE_GNUSTEP+=gui
<..>
Warning: you need USES+=gnustep and USE_GNUSTEP+=base
-->8-