Bug 283639 - print/xreader: update to 4.2.3
Summary: print/xreader: update to 4.2.3
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: Max Brazhnikov
URL: https://github.com/linuxmint/xreader/...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-12-26 21:12 UTC by Pavel Timofeev
Modified: 2025-02-10 21:40 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (gnome)


Attachments
port patch (21.02 KB, patch)
2024-12-26 21:12 UTC, Pavel Timofeev
no flags Details | Diff
port patch rev 2 (21.23 KB, patch)
2024-12-26 21:27 UTC, Pavel Timofeev
no flags Details | Diff
port patch rev 3 (21.96 KB, patch)
2024-12-27 05:26 UTC, Pavel Timofeev
no flags Details | Diff
port patch rev 4 (22.10 KB, patch)
2025-01-25 23:15 UTC, Pavel Timofeev
no flags Details | Diff
port patch rev 4.1 (22.07 KB, patch)
2025-01-26 15:52 UTC, Pavel Timofeev
no flags Details | Diff
port patch with orig order and indentations (21.34 KB, patch)
2025-02-04 20:27 UTC, Pavel Timofeev
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pavel Timofeev 2024-12-26 21:12:10 UTC
Created attachment 256168 [details]
port patch

WARNING! Depends on https://reviews.freebsd.org/D45878

Changes:
- update to 4.2.3 (latest now)
- modernize meson build option declaration
- dedicate backend options to a separate group
- add several of new options (comics and pixbuf backends, introspection). Keep their default values as before for compatibility
- fix t1lib build with localbase:ldflags
- add DOCS option and fix build if it's enabled (upstreaming in progress - https://github.com/linuxmint/xreader/pull/662)
Comment 1 Pavel Timofeev 2024-12-26 21:27:37 UTC
Created attachment 256171 [details]
port patch rev 2

add LICENSE_FILE
Comment 2 Pavel Timofeev 2024-12-27 05:26:17 UTC
Created attachment 256185 [details]
port patch rev 3

Apply portfmt and portclippy
Comment 3 Pavel Timofeev 2025-01-25 23:15:08 UTC
Created attachment 256996 [details]
port patch rev 4

- remove cairo and gdkpixbuf2 from USE_GNOME as they are implied by gtk30
- remove post-patch that removed gdkwayland. It seems like wayland is not something to fear these days
- xreader uses gdbus which is part of glib. Set DBUS_RUN_DEPENDS instead of DBUS_LIB_DEPENDS
Comment 4 Pavel Timofeev 2025-01-26 00:40:25 UTC
I would like to enable all BACKENDS by default. This is a reader that is supposed to be used to read various formats.
Any objections?
Comment 5 Pavel Timofeev 2025-01-26 15:52:09 UTC
Created attachment 257012 [details]
port patch rev 4.1

Bring cairo and gdkpixbuf2 back to USE_GNOME despite the face they are implied by gtk30.
It's probably better to keep direct dependency list as implications of USE_GNOME parts may change in time.
Comment 6 Pavel Timofeev 2025-02-04 20:27:17 UTC
Created attachment 257238 [details]
port patch with orig order and indentations
Comment 7 Max Brazhnikov freebsd_committer freebsd_triage 2025-02-05 08:58:20 UTC
(In reply to Pavel Timofeev from comment #6)
The port now pulls two copies of webkit: www/webkit2-gtk@41 via EPUB option directly and www/webkit2-gtk@40 via HELP option indirectly. Is this expected?
Comment 8 Pavel Timofeev 2025-02-05 16:49:14 UTC
(In reply to Max Brazhnikov from comment #7)
www/webkit2-gtk@41 is specifically required by EPUB support https://github.com/linuxmint/xreader/blob/4.2.3/meson.build#L128.
I. e. it doesn't build with any other version.
x11/yelp pulls whatever it needs.
Comment 9 Max Brazhnikov freebsd_committer freebsd_triage 2025-02-05 21:04:41 UTC
(In reply to Pavel Timofeev from comment #8)
Ok. One more question. If PIXBUF option does not need any dependency, why do you introduce it? Does it make sense to pass -Dpixbuf=true to meson unconditionally?
Comment 10 Pavel Timofeev 2025-02-05 21:40:09 UTC
I(In reply to Max Brazhnikov from comment #9)
I'm not really sure here.
It has always been OFF by default https://github.com/linuxmint/xreader/tree/4.2.3
I added it as an option to have a choice.
Comment 11 Max Brazhnikov freebsd_committer freebsd_triage 2025-02-06 12:29:38 UTC
(In reply to Pavel Timofeev from comment #10)
But does this choice make any difference? If it improves xreader user experience for no overhead, we should enable it unconditionally. If it disabled by upstream for a reason, we probably should not make an option for it. Just do not multiply options for the sake of the possibility to make a choice. It complicates ports maintenance, and gnome@ ports lack support right now.
I do not use xreader myself, so I have no idea which options are useful. It is up to you to decide.
Comment 12 Pavel Timofeev 2025-02-06 19:24:10 UTC
It's hard to say how they actually build it for linux mint.
It's been rather our default to have it off.

I can take maintainership of xed, xreader and xviewer
Comment 13 commit-hook freebsd_committer freebsd_triage 2025-02-10 21:21:25 UTC
A commit in branch main references this bug:

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

commit e89fc7ed1f22e72b4cea54cc43261161f5566920
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2025-02-10 21:18:57 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-02-10 21:18:57 +0000

    print/xreader: update to 4.2.3

    - Regroup options and add new ones: COMICS, PIXBUF, and INTROSPECTION.
    - Add LICENSE_FILE

    PR:             283639

 print/xreader/Makefile                             |  56 +++++----
 print/xreader/distinfo                             |   6 +-
 ...ch-help_reference_libdocument_meson.build (new) |  27 +++++
 .../patch-help_reference_libview_meson.build (new) |  30 +++++
 .../patch-help_reference_shell_meson.build (new)   |  29 +++++
 .../xreader/files/patch-libview_meson.build (new)  |  31 +++++
 print/xreader/files/patch-shell_meson.build        |  20 +++-
 print/xreader/pkg-plist                            | 130 +++++++++++++++++++++
 8 files changed, 304 insertions(+), 25 deletions(-)
Comment 14 Max Brazhnikov freebsd_committer freebsd_triage 2025-02-10 21:40:34 UTC
(In reply to Pavel Timofeev from comment #12)
> I can take maintainership of xed, xreader and xviewer

I'm not in power to pass the maintainership from gnome@. You should discuss this with gnome@ team. Or ever better, join the team :)