| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Closes: https://bugs.gentoo.org/916074
Signed-off-by: Marek Szuba <marecki@gentoo.org>
|
|
|
|
| |
Signed-off-by: Florian Schmaus <flow@gentoo.org>
|
|
|
|
| |
Signed-off-by: Florian Schmaus <flow@gentoo.org>
|
|
|
|
|
|
| |
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33443
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
| |
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
|
|
|
|
| |
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
|
|
|
| |
From https://github.com/zlin/wgetpaste/pull/48
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33340
Signed-off-by: Florian Schmaus <flow@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This has never been caused by the upstream binary install, which
installs to /opt and does not affect from-source installs under any
circumstances ever.
What did happen is back during the major version update from 2.85 to
3.0, upstream stopped including a vendored regex/ module, and started
expecting it to be installed as a system dependency.
Under most circumstances, this was fine, and simply installing the
dependency would get things working. One possible edge case occurred,
however, when the old version of the package did NOT byte-compile the
vendored regex module, but calibre was run as root. (There are reasons
it might end up being run as root, the most obvious being that a user
wanted to run the headless server or another command-line tool.)
If this happened, then the python interpreter would automatically
byte-compile every module on import, but the PM wouldn't track it for
removal. After an upgrade, the cached file could still be imported and
would effectively mask the system version of the regex module, but would
be missing the binary portion.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
Historically, calibre has always supported this. Allow checking it. No
revbump needed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33292
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
Since calibre 3.3.0 the distfile has come with prebuilt manpages for the
CLI programs. Add them to the installation.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since there is no real standard and no real detection method for zsh
completions (and Debian tunes this to be something that doesn't work
anywhere else) the build system probes for the common locations.
Also, this probe is carried out against staging-root, not /, which
means that it will NEVER work. Not even if you have zsh installed.
Unless you create the directory in advance in the staging-root, which
you have to do anyways because otherwise you would need zsh as a BDEPEND
which is silly. ;)
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
calibre needs support for these image types, and tests for some of them,
but their USE flags aren't guaranteed to be enabled. Guarantee it, even
if until now people tended not to notice somehow. ;)
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Of note:
- dbus-python was deprecated and removed by the addition of jeepney
- cssselect was deprecated and removed by the addition of css-parser
The glib and libX* dependencies are an interesting bit of history. As
far as calibre is concerned, these have never been required (they are
not directly used). But the libheadless.so plugin which uses Qt private
APIs ends up inheriting a bunch of dependencies from Qt itself,
depending on whatever Qt internals get exposed by that private API. This
results in symbols inside libheadless.so linking to libraries that
QtCore also links to. We still have to rebuild libheadless.so on ever
update to Qt because private API, though. And the really fun bit is that
the dependencies do, of course, change over time. :) Currently libX* is
not actually used anymore, for example.
dbus-glib *looks* like it may have been superficially a recursive dep of
something else?
libwmf had extremely extremely old code in the calibre source tree which
could have compiled against it, but never really did so. There's a
custom encoder/decoder written in pure python.
zlib is not directly depended on by calibre, though some dependencies do
have to be built with USE=zlib which doesn't really help. For all direct
uses of zlib, calibre simply uses the python stdlib "zlib" module, which
is not optional anyway.
calibre has never been setuptools software, so that can be dropped.
There are two chardet modules of relevance: chardet and cchardet. At
runtime, calibre only uses the latter. The tests use both of them due to
reasons. We can avoid installing it except when USE=test.
PyQt-builder is used in the build system (and as the name implies, it is
a module for building code). It can be dropped to a build dependency.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
Since 2012, calibre has stopped building a compiled binding for poppler,
and started using the command-line utils via subprocesses. Make sure
those are installed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
A build-time compiler is installed. Getting rid of it is -124 KB which
isn't much but also is pure win.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Per https://wiki.gentoo.org/wiki/Project:Qt/Policies#Dependencies we
should not be using := unless we build against the Qt private API. As it
happens, we do. But also as it happens, we ended up slotting all
dependencies (other than the one I just added), whereas one of them was
not needed as it is only linked to via a compiled extension that doesn't
use private API.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
| |
Drops the necessity of a testsuite patch.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
guard a command that cannot die with `|| die` for style reasons. Drop a
commented-out bit of code that is no longer relevant.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
It is easier to add to as an array. Also add comment to note down that I
don't know why a couple of tests are being skipped.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The distribution packaging described here is no longer maintained by
said Calibre contributor, and there has been a corresponding decrease in
quality. I cannot in good faith advise taking inspiration from recent
changes there.
If advice is needed by a Calibre contributor, I can simply provide any
relevant advice directly to the Gentoo Project.
Alternatively, the Fedora packaging continues to be rather decent.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
| |
There's a bit of indirection here that isn't strictly needed:
- get_libdir is guaranteed to never fail
- PYTHONPATH is not necessary, setup.py internally handles this
- the --staging-root and --root options are aliases, and the last one
wins; simply pass it once
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This has never been caused by the upstream binary install, which
installs to /opt and does not affect from-source installs under any
circumstances ever.
What did happen is back during the major version update from 2.85 to
3.0, upstream stopped including a vendored regex/ module, and started
expecting it to be installed as a system dependency.
Under most circumstances, this was fine, and simply installing the
dependency would get things working. One possible edge case occurred,
however, when the old version of the package did NOT byte-compile the
vendored regex module, but calibre was run as root. (There are reasons
it might end up being run as root, the most obvious being that a user
wanted to run the headless server or another command-line tool.)
If this happened, then the python interpreter would automatically
byte-compile every module on import, but the PM wouldn't track it for
removal. After an upgrade, the cached file could still be imported and
would effectively mask the system version of the regex module, but would
be missing the binary portion.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A library file does not care what its shebang is. The intended purpose
of all these shebangs is to indicate to text editors, what the expected
syntax highlighting mode should be.
This has no practical effect on the resulting package. The installed
bytes are different, they just don't *do* anything different. No revbump
needed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The liberation fonts are removed and replaced with symlinks to the
system fonts. I've put quite a bit of work in upstream to make this work
in a supported manner; let's use that instead of fragile, unchecked
shell code.
In particular, upstream's buildsystem dies if the expected fonts do not
exist.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The install process does not rerun compiles, so setting variables there
is useless and does nothing. They didn't have any effect on src_compile
all this time, which means that whatever they tried to fix clearly was
not an issue. ;)
That being said, there are two things going on here:
- OVERRIDE_CFLAGS is used by the calibre build system in addition to
CFLAGS, so it is not actually necessary to override it, and using
both, means using -Wall and suchlike so respecting it seems reasonable
- the calibre build system respects either $PATH or $QMAKE to find the
qmake program. Instead of using the former method in src_compile and
the latter method in src_install, just use the latter method in
src_compile and avoid munging $PATH.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I do not know what kbuildsyscoca is, other than "does not exist
anymore"? So I am skeptical it is still relevant.
I do know that it is no longer necessary to fake out xdg-utils programs,
since I fixed this in 2019, as part of calibre 3.43.0; it now detects
when we are running a DESTDIR install and refrains from running:
- `xdg-desktop-menu forceupdate`
- `xdg-mime` at all (instead it uses shutil.copyfile to copy over one
file)
and sets up the requisite $XDG_* variables to make the utils operate on
a staged installation directory.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
Ever since calibre's python 3 port was completed, this variable was no
longer needed to unlock opting in to using python3. And thus, it is
neither checked nor used.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
|
| |
Historically, calibre has always supported this. Allow checking it. No
revbump needed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
|
|
|
| |
Copied 5.44.0-r1 to use as a base for commits from
https://github.com/gentoo/gentoo/pull/33292.
Signed-off-by: Zac Medico <zmedico@gentoo.org>
|
|
|
|
| |
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
|
| |
Signed-off-by: Philipp Rösner <rndxelement@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33092
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Philipp Rösner <rndxelement@protonmail.com>
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
|
|
|
|
|
|
| |
Signed-off-by: Philipp Rösner <rndxelement@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32779
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Philipp Rösner <rndxelement@protonmail.com>
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
|