Bug 271530 - textproc/py-sphinxcontrib-svg2pdfconverter: should follow LIBRSVG2_DEFAULT for librsvg2 dependency
Summary: textproc/py-sphinxcontrib-svg2pdfconverter: should follow LIBRSVG2_DEFAULT fo...
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: Robert Clausecker
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-05-20 11:45 UTC by Robert Clausecker
Modified: 2023-05-21 17:28 UTC (History)
1 user (show)

See Also:
agh: maintainer-feedback+
agh: merge-quarterly?


Attachments
textproc/py-sphinxcontrib-svg2pdfconverter: use USES=gnome to depend on librsvg2 (1.61 KB, patch)
2023-05-20 11:45 UTC, Robert Clausecker
fuz: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker freebsd_committer freebsd_triage 2023-05-20 11:45:57 UTC
Created attachment 242293 [details]
textproc/py-sphinxcontrib-svg2pdfconverter: use USES=gnome to depend on librsvg2

This port currently selects which rsvg2 dependency to use based on a port option.  This is quite suboptimal as most (but not all) architectures use the rust variant by default, but this port uses the old C variant.  Thus there are package conflicts when you try to install this port and and various GUI ports at the same time.

To fix this, the port should not supply an option but rather depend on rsvg by using

    USES= gnome
    USE_GNOME= librsvg2

This will pick the correct librsvg dependency depending on which one the user selected as his/her default and on what is installed.

Attached patch implements this change.
Comment 1 Alastair Hogge 2023-05-20 12:04:17 UTC
Wow this is a great improvement. I am all in favour of merging provided build testing has been done?

Thanks.
Comment 2 Robert Clausecker freebsd_committer freebsd_triage 2023-05-20 12:10:15 UTC
Comment on attachment 242293 [details]
textproc/py-sphinxcontrib-svg2pdfconverter: use USES=gnome to depend on librsvg2

I always perform build tests before commit and I've done a manual build test and ran all the usual QA tools before submitting this patch to you.

Will take this as approval from your side.  How's the test with your mame patch going?
Comment 3 Robert Clausecker freebsd_committer freebsd_triage 2023-05-20 12:11:15 UTC
Will commit with my next batch.
Comment 4 Alastair Hogge 2023-05-20 13:37:55 UTC
(In reply to Robert Clausecker from comment #2)

All good from my side, thanks. mame is a worth adversary.
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-05-21 17:27:34 UTC
A commit in branch main references this bug:

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

commit bce94ecce5f905028f4f922b80bb32e5e1563dda
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-05-20 11:44:04 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-21 17:25:41 +0000

    textproc/py-sphinxcontrib-svg2pdfconverter: depend on correct librsvg2 automatically

    Instead of providing a port option, have USES=gnome figure out the
    right librsvg2 to depend on.  This avoids conflicts when installing mame
    with other ports that depend on librsvg2{,-rust}.

    Approved by:    agh@riseup.net (maintainer)
    MFH:            2023Q2
    PR:             271530

 textproc/py-sphinxcontrib-svg2pdfconverter/Makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-05-21 17:28:38 UTC
A commit in branch 2023Q2 references this bug:

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

commit dc299b36fdc2faedaab1b411afa5e6cae7b68619
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-05-20 11:44:04 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-21 17:27:20 +0000

    textproc/py-sphinxcontrib-svg2pdfconverter: depend on correct librsvg2 automatically

    Instead of providing a port option, have USES=gnome figure out the
    right librsvg2 to depend on.  This avoids conflicts when installing mame
    with other ports that depend on librsvg2{,-rust}.

    Approved by:    agh@riseup.net (maintainer)
    MFH:            2023Q2
    PR:             271530

    (cherry picked from commit bce94ecce5f905028f4f922b80bb32e5e1563dda)

 textproc/py-sphinxcontrib-svg2pdfconverter/Makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
Comment 7 Robert Clausecker freebsd_committer freebsd_triage 2023-05-21 17:28:55 UTC
Thank you for your contribution.