Bug 264628 - irc/irssi: Update to 1.4.1
Summary: irc/irssi: Update to 1.4.1
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: Daniel Engberg
URL: https://github.com/irssi/irssi/releas...
Keywords:
Depends on:
Blocks:
 
Reported: 2022-06-12 09:50 UTC by Daniel Engberg
Modified: 2022-07-09 21:52 UTC (History)
2 users (show)

See Also:
dor.bsd: maintainer-feedback+


Attachments
Patch for irssi (9.03 KB, patch)
2022-06-12 09:50 UTC, Daniel Engberg
no flags Details | Diff
Patch for irssi v2 (9.33 KB, patch)
2022-06-13 06:36 UTC, Daniel Engberg
no flags Details | Diff
Patch for irssi v3 (9.02 KB, patch)
2022-06-14 17:31 UTC, Daniel Engberg
no flags Details | Diff
Patch for irssi v4 (16.12 KB, patch)
2022-07-07 23:59 UTC, Daniel Engberg
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Engberg freebsd_committer freebsd_triage 2022-06-12 09:50:35 UTC
Created attachment 234633 [details]
Patch for irssi

* Use DISTVERSION instead of PORTVERSION as per Porters Handbook
* Switch to Meson

Compile and run-tested on 13.1-RELEASE (aarch64)
Poudriere testport OK 12.3-RELEASE (amd64)
Poudriere testport OK 13.1-RELEASE (i386)

Note: The only different(?) behaviour I've noticed is that /j somechannel defaults to &somechannel rather than #somechannel

Botti compiles despite what the release notice says.
Perl module is untested as I don't use it.
Comment 1 Daniel Engberg freebsd_committer freebsd_triage 2022-06-12 21:34:30 UTC
Tracked upstream, https://github.com/irssi/irssi/issues/1385
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2022-06-13 06:36:14 UTC
Created attachment 234659 [details]
Patch for irssi v2

Backport upstream commit a5f5ea7d79274fcf547ef81f019b0c38c6863051 to fix channel prefix issue
Comment 3 Daniel Engberg freebsd_committer freebsd_triage 2022-06-14 17:31:53 UTC
Created attachment 234684 [details]
Patch for irssi v3

Update pkg-message as per advice by upstream
Comment 4 David O'Rourke 2022-07-02 13:12:10 UTC
Sorry for the delay here, I've been pretty busy recently. Taking a look at this patch now, thank you.
Comment 5 David O'Rourke 2022-07-03 21:52:44 UTC
Comment on attachment 234684 [details]
Patch for irssi v3

Looks good, thanks.

The only thing I'm unsure of is the decrease of PORTEPOCH, since the handbook says it never decreases.
Comment 6 Niels Bakker 2022-07-07 17:33:24 UTC
Epoch indeed shouldn't decrease. Otherwise, the patch works for me.
Comment 7 Daniel Engberg freebsd_committer freebsd_triage 2022-07-07 18:29:25 UTC
I maintained my own tree for a while and missed it while porting it back. Thanks for making me aware.
Comment 8 Daniel Engberg freebsd_committer freebsd_triage 2022-07-07 18:32:50 UTC
I also lost the backport patch in v3 but I'll add that back when committing
Comment 9 Daniel Engberg freebsd_committer freebsd_triage 2022-07-07 23:59:59 UTC
Created attachment 235116 [details]
Patch for irssi v4

Fix PORTEPOCH
Backport upstream commits from maintenance branch:
3404d822c83546b031d47a99e37ae65b887bec94
f17fb682573985656fa26bf10370b9e1d88e3bdf
c6a7f02042f63d01a38e8d522cff8f5d951afd51
730c3c1a12f782b92d710883f52a106e37f148e4
1b6b92ffff6950ee28c1b7936f53d83988843ed4

References:
https://github.com/ailin-nemui/irssi/commit/3404d822c83546b031d47a99e37ae65b887bec94
https://github.com/ailin-nemui/irssi/commit/f17fb682573985656fa26bf10370b9e1d88e3bdf
https://github.com/ailin-nemui/irssi/commit/c6a7f02042f63d01a38e8d522cff8f5d951afd51
https://github.com/ailin-nemui/irssi/commit/730c3c1a12f782b92d710883f52a106e37f148e4
https://github.com/ailin-nemui/irssi/commit/1b6b92ffff6950ee28c1b7936f53d83988843ed4
Comment 10 Daniel Engberg freebsd_committer freebsd_triage 2022-07-08 00:01:21 UTC
This should be the final one, please review
Comment 11 David O'Rourke 2022-07-08 09:58:49 UTC
Comment on attachment 235116 [details]
Patch for irssi v4

Looks good!
Thanks for showing off the PATCH_SITES stuff too, that's really neat.
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-07-09 21:52:07 UTC
A commit in branch main references this bug:

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

commit bc97cc7b70dea8f491605a7670932805dcb9ea97
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-07-09 21:39:44 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-07-09 21:49:32 +0000

    irc/irssi: Update to 1.4.1

    Changelog: https://github.com/irssi/irssi/releases/tag/1.4.1

    Backport upstream commits from maintenance branch:
    3404d822c83546b031d47a99e37ae65b887bec94
    f17fb682573985656fa26bf10370b9e1d88e3bdf
    c6a7f02042f63d01a38e8d522cff8f5d951afd51
    730c3c1a12f782b92d710883f52a106e37f148e4
    1b6b92ffff6950ee28c1b7936f53d83988843ed4

    References:
    https://github.com/ailin-nemui/irssi/commit/3404d822c83546b031d47a99e37ae65b887bec94
    https://github.com/ailin-nemui/irssi/commit/f17fb682573985656fa26bf10370b9e1d88e3bdf
    https://github.com/ailin-nemui/irssi/commit/c6a7f02042f63d01a38e8d522cff8f5d951afd51
    https://github.com/ailin-nemui/irssi/commit/730c3c1a12f782b92d710883f52a106e37f148e4
    https://github.com/ailin-nemui/irssi/commit/1b6b92ffff6950ee28c1b7936f53d83988843ed4

    PR:             264628
    Reviewed by:    David O'Rourke <dor.bsd@xm0.uk> (maintainer)

 irc/irssi/Makefile                                 |  81 +++++-----
 irc/irssi/distinfo                                 |  14 +-
 irc/irssi/files/patch-Makefile.in (gone)           |  22 ---
 irc/irssi/files/patch-configure.ac (gone)          |  15 --
 ...-f17fb682573985656fa26bf10370b9e1d88e3bdf (new) | 172 +++++++++++++++++++++
 irc/irssi/files/patch-perl-Makefile (gone)         |  22 ---
 irc/irssi/pkg-message (new)                        |   8 +
 irc/irssi/pkg-plist                                |  11 +-
 8 files changed, 232 insertions(+), 113 deletions(-)
Comment 13 Daniel Engberg freebsd_committer freebsd_triage 2022-07-09 21:52:49 UTC
Thanks