Bug 272210 - devel/gettext: update to 0.22
Summary: devel/gettext: update to 0.22
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tijl Coosemans
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-06-25 18:18 UTC by Tijl Coosemans
Modified: 2023-07-15 16:03 UTC (History)
1 user (show)

See Also:
tijl: exp-run?


Attachments
patch (14.17 KB, patch)
2023-06-25 18:18 UTC, Tijl Coosemans
no flags Details | Diff
patch2 (13.57 KB, patch)
2023-06-26 20:09 UTC, Tijl Coosemans
no flags Details | Diff
patch3 (14.76 KB, patch)
2023-06-27 08:20 UTC, Tijl Coosemans
no flags Details | Diff
patch4 (37.35 KB, patch)
2023-07-05 12:15 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2023-06-25 18:18:19 UTC
Created attachment 242993 [details]
patch

Update devel/gettext and related ports to 0.22.
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2023-06-26 13:45:52 UTC
gettext-tools fails to build, at least on 12.4 i386

https://pkg-status.freebsd.org/pb2/data/124i386-default-foo/2023-06-26_08h25m15s/logs/errors/gettext-tools-0.22.log
Comment 2 Tijl Coosemans freebsd_committer freebsd_triage 2023-06-26 20:09:38 UTC
Created attachment 243020 [details]
patch2

Fix i386.
Comment 3 Antoine Brodin freebsd_committer freebsd_triage 2023-06-26 20:48:19 UTC
On amd64 misc/help2man fails which causes a lot of skipped:

https://pkg-status.freebsd.org/package22/data/131amd64-default-foo/2023-06-26_08h25m13s/logs/help2man-1.49.3.log
Comment 4 Tijl Coosemans freebsd_committer freebsd_triage 2023-06-27 08:20:09 UTC
Created attachment 243033 [details]
patch3

Fix exported symbols.
Comment 5 Antoine Brodin freebsd_committer freebsd_triage 2023-07-03 17:38:26 UTC
Some new failure logs:

https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/audacity-3.3.3.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/gtimer-2.0.0_4.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/efl-1.26.3_8.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/proftpd-1.3.8_1.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/tornado-1.4_3.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/tgif-4.2.5_2.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/weechat-3.8.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/motion-4.3.2_5.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/fontforge-20220308_1.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/p5-Crypt-GCrypt-1.26_3.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/xfsprogs-3.2.4_2.log
https://pkg-status.freebsd.org/package23/data/131i386-default-foo/2023-07-02_07h15m10s/logs/errors/mate-panel-1.26.2_1,1.log
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-07-05 12:03:12 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=991525b997a3e3c34f32ce20db2b34de45cbdd7b

commit 991525b997a3e3c34f32ce20db2b34de45cbdd7b
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-07-04 12:04:05 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2023-07-05 12:00:41 +0000

    security/p5-Crypt-GCrypt: Fix configure with llvm16

    This came up during an exp-run for gettext 0.22.

    PR:             272210

 security/p5-Crypt-GCrypt/files/patch-Makefile.PL (new) | 10 ++++++++++
 1 file changed, 10 insertions(+)
Comment 7 Tijl Coosemans freebsd_committer freebsd_triage 2023-07-05 12:15:30 UTC
Created attachment 243264 [details]
patch4

Fix fallout.

The fix for p5-Crypt-GCrypt requires a change to lang/perl5* that also requires an exp-run, so everything that depends on lang/perl5* should also be included in the next run.

lang/perl5*: Link with -pthread instead of -lpthread

During configure of security/p5-Crypt-GCrypt a test program is
compiled and run to test libgcrypt.  This program segfaults when perl5
is built with the THREADS option.  Libgcrypt links with libgpg-error
which has an init function which calls into libintl (gettext) which
calls pthread functions before libthr is initialised.

The compiler command line is provided by perl and it includes both
-pthread and -lpthread.  Patch perl to remove -lpthread.  With -pthread
the compiler will pass -lpthread to the linker such that it is
initialised early.

Discovered by the exp-run for gettext 0.22.

While here also remove -lc unconditionally and remove the code that
replaced it with -lc_r for old version of FreeBSD because the version
test is incorrect (missing a dot).  The -pthread flag already tells
the compiler to use -lc_r on those old versions.
Comment 8 Tijl Coosemans freebsd_committer freebsd_triage 2023-07-05 12:17:50 UTC
Add perl maintainer to CC list.
Comment 10 Tijl Coosemans freebsd_committer freebsd_triage 2023-07-11 19:16:37 UTC
(In reply to Antoine Brodin from comment #9)
Thanks, I can test those locally.

- tgif: use EUC-JP instead of JISX-0208-1983-0
- weechat: already fixed by recent update
- motion: replace another %Llu with %llu
Comment 11 commit-hook freebsd_committer freebsd_triage 2023-07-11 20:20:23 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b59b9276418ce4fce8a73871a13598397ab2f2e

commit 0b59b9276418ce4fce8a73871a13598397ab2f2e
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-07-04 14:22:05 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2023-07-11 20:10:58 +0000

    lang/perl5*: Link with -pthread instead of -lpthread

    During configure of security/p5-Crypt-GCrypt a test program is
    compiled and run to test libgcrypt.  This program segfaults when perl5
    is built with the THREADS option.  Libgcrypt links with libgpg-error
    which has an init function which calls into libintl (gettext) which
    calls pthread functions before libthr is initialised.

    The compiler command line is provided by perl and it includes both
    -pthread and -lpthread.  Patch perl to remove -lpthread.  With -pthread
    the compiler will pass -lpthread to the linker such that it is
    initialised early.

    Discovered by the exp-run for gettext 0.22.

    While here also remove -lc unconditionally and remove the code that
    replaced it with -lc_r for old version of FreeBSD because the version
    test is incorrect (missing a dot).  The -pthread flag already tells
    the compiler to use -lc_r on those old versions.

    PR:             272210

 lang/perl5-devel/Makefile                     |  2 +-
 lang/perl5-devel/files/patch-hints_freebsd.sh | 43 ++++++++++++++++++++-------
 lang/perl5.32/Makefile                        |  2 +-
 lang/perl5.32/files/patch-hints_freebsd.sh    | 41 +++++++++++++++++++------
 lang/perl5.34/Makefile                        |  2 +-
 lang/perl5.34/files/patch-hints_freebsd.sh    | 43 ++++++++++++++++++++-------
 lang/perl5.36/Makefile                        |  1 +
 lang/perl5.36/files/patch-hints_freebsd.sh    | 43 ++++++++++++++++++++-------
 lang/perl5.38/Makefile                        |  2 +-
 lang/perl5.38/files/patch-hints_freebsd.sh    | 43 ++++++++++++++++++++-------
 10 files changed, 169 insertions(+), 53 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2023-07-11 20:20:24 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2c2ec62c72ca36f480a349a7f69ad755a4d226dd

commit 2c2ec62c72ca36f480a349a7f69ad755a4d226dd
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-06-25 07:53:33 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2023-07-11 20:15:43 +0000

    devel/gettext: Update to 0.22

    Convert post-patch commands to real patches.  This way there are errors
    when the underlying code changes.

    */*: Fix gettext issues.  The new gettext tools are more strict.

    PR:             272210
    Exp-run by:     antoine

 audio/audacity/Makefile                            |  5 +-
 audio/audacity/distinfo                            |  4 +-
 deskutils/gtimer/Makefile                          |  2 +-
 deskutils/gtimer/files/patch-po_es.po (new)        | 11 ++++
 deskutils/gtimer/files/patch-po_fr.po (new)        | 11 ++++
 devel/efl/Makefile                                 |  2 +-
 ...-src_examples_edje_en__IN_domain__name.po (new) |  9 ++++
 ...-src_examples_edje_hi__IN_domain__name.po (new) |  9 ++++
 devel/gettext-runtime/files/patch-configure        |  8 +--
 .../files/patch-intl_Makefile.in (new)             | 11 ++++
 ... => patch-intl_gnulib-lib_glthread_threadlib.c} | 10 ++--
 devel/gettext-runtime/pkg-plist                    |  1 +
 devel/gettext-tools/Makefile                       | 19 +------
 devel/gettext-tools/files/patch-configure          | 25 +++++-----
 .../files/patch-src_Makefile.in (new)              | 11 ++++
 .../files/patch-tests_Makefile.in (new)            | 11 ++++
 .../gettext-tools/files/patch-tests_lang-c++ (new) | 11 ++++
 devel/gettext-tools/pkg-plist                      | 58 +++++++++++++++++++++-
 devel/gettext/Makefile.common                      |  2 +-
 devel/gettext/distinfo                             |  6 +--
 devel/libtextstyle/pkg-plist                       |  2 +-
 ftp/proftpd/Makefile                               |  2 +-
 ftp/proftpd/files/patch-locale_en__US.po (new)     | 11 ++++
 games/tornado/Makefile                             |  2 +-
 games/tornado/files/patch-po_no.po (new)           | 11 ++++
 games/tornado/files/patch-po_pt.po (new)           | 11 ++++
 graphics/tgif/Makefile                             |  2 +-
 graphics/tgif/files/patch-po_fr_fr.po (new)        | 11 ++++
 graphics/tgif/files/patch-po_ja_ja.po (new)        | 11 ++++
 multimedia/motion/Makefile                         |  2 +-
 multimedia/motion/files/patch-po_de.po (new)       | 11 ++++
 multimedia/motion/files/patch-po_fi.po (new)       | 11 ++++
 print/fontforge/Makefile                           | 27 ++++++----
 sysutils/xfsprogs/Makefile                         |  2 +-
 sysutils/xfsprogs/files/patch-po_de.po (new)       | 11 ++++
 x11/mate-panel/Makefile                            |  2 +-
 .../patch-libmate-panel-applet_Makefile.in (new)   | 11 ++++
 37 files changed, 302 insertions(+), 64 deletions(-)