Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Calibre 6 #33683

Closed
wants to merge 8 commits into from
Closed

Calibre 6 #33683

wants to merge 8 commits into from

Conversation

eli-schwartz
Copy link
Contributor

The main interesting thing is that this drops keywords. Will re-keyword along with unrardll and rapydscript-ng.

My intention is to leave the last 5.x version stable for a bit since people may wish to stay with that for qt5 reasons, and it does no harm.

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @eli-schwartz
Areas affected: ebuilds
Packages affected: app-text/calibre

app-text/calibre: @zmedico, @eli-schwartz

Linked bugs

Bugs linked: 622856, 752090


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Nov 5, 2023
Copy link
Member

@thesamesam thesamesam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some quick comments, should be fast to address.

--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
--system-liberation_fonts
if use system-mathjax; then
edo ${EPYTHON} setup.py mathjax --path-to-mathjax /usr/share/mathjax --system-mathjax
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
edo ${EPYTHON} setup.py mathjax --path-to-mathjax /usr/share/mathjax --system-mathjax
edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${BROOT}"/usr/share/mathjax --system-mathjax

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per discussion this is better off as EPREFIX rather than BROOT as additional work would be needed to handle cross compile correctly.

Namely, that whatever path is passed will also be the path baked into the package.

# raise ValueError, 'unknown locale: %s' % localename
#ValueError: unknown locale: 46
export -n LANG LANGUAGE ${!LC_*}
export LC_ALL=C.utf8 #709682
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer normalising as "bug #123456".


find "${ED}"/usr/share -type d -empty -delete || die

einfo "Converting python shebangs"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd consider dropping the two einfo calls but they're OK if you want to keep them.

}

pkg_postinst() {
xdg_desktop_database_update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inherit xdg instead and just drop these two pkg_* phases

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice cleanup! Done.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-11-05 23:41 UTC
Newest commit scanned: ed3f6d8
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/a48f674858/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-11-05 23:56 UTC
Newest commit scanned: c8326c5
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/7732038002/output.html

This ports over to Qt6 at last.

Drop code for upstream released fixes:
- zeroconf compatibility backport
- sed workaround for some extensions not respecting FLAGS

There is a new upstream dependency for font subsetting. Its absence is
handled fairly gracefully, many people could successfully use calibre
just fine without ever touching font subsetting, and it's not exactly
small -- add it as a default-enabled USE flag.

Closes: https://bugs.gentoo.org/892697
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
It's really not a problem for people to be told that an updated version
exists. Worst comes to worst, they might PR a version bump. ;) Or, they
could just click the builtin button to stop showing the notification.

But more importantly, this also means that users will not get
notifications about updated plugins.

This patch, too, was cargo-culted from debian alongside the one that
disabled the plugin dialog altogether. Time to drop it.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
This devendors a bundled copy of dev-libs/mathjax-3, creates symlinks to
the system copy, and regenerates the deployed assets.

Requires new package that has fewer keywords, so drop ours to match.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
This dependency was always wrong, because it was not directly used by
calibre -- calibre simply imported zeroconf and zeroconf required ipv6.
This was really supposed to be a USE dependency in the zeroconf package,
not the calibre one.

But zeroconf was fixed upstream and no longer requires it.

(Also, dev-lang/python no longer allows disabling ipv6 anyway.)

Closes: https://bugs.gentoo.org/752090
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
unrardll is now packaged.

n.b. This USE + dependency is required for the default upstream
experience, but is nonetheless being added as default disabled. It
requires non-free software (app-arch/unrar) and is a relatively niche
use case. It is important that users have the *option* to use it if they
want, but my judgment is that it is a bad tradeoff to push it on them
by default when a better option exists.

Closes: https://bugs.gentoo.org/622856
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
We inherit xdg and let it take care of defining these phases, rather
than inheriting a low-level eclass and manually performing it.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-11-06 19:51 UTC
Newest commit scanned: d06253a
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/7ee8a57af4/output.html

Copy link
Member

@zmedico zmedico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great, thanks! I'm upgrading my qt packages for this now...

zmedico pushed a commit to zmedico/gentoo that referenced this pull request Nov 8, 2023
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Closes: gentoo#33683
Signed-off-by: Zac Medico <zmedico@gentoo.org>
@gentoo-bot gentoo-bot closed this in 8e825fe Nov 8, 2023
@eli-schwartz eli-schwartz deleted the calibre-6 branch November 17, 2023 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
5 participants