app-text/calibre: 4.17.0-r1 for QT 5.15 (bug 725020)

See: https://github.com/kovidgoyal/calibre/pull/1162
Closes: https://bugs.gentoo.org/725020
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5aeb0c1d1da9e29e58cec20423311b525381bdfe..abbfb2687ad9f695fde099ced22cfa1f5b4db148 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,5 +2,6 @@ DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d32
 DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
 DIST calibre-4.15.0.tar.xz 37033864 BLAKE2B fbb8965f438b438e0274fd8fbd23b633fb39bf3d746b0d8d1947e54cb6a21e39346031be6723adc1ecb83b4145562ec8a1e36805b96bad00451c0afbccb8d570 SHA512 d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04
 DIST calibre-4.16.0.tar.xz 36964244 BLAKE2B e2c94ea882addff3a7def2b7d0bc286fc3bc499190469e9bfea99d710b4cdbb6b59ca2848ef5551d4375d22c582462962634c0329f0adca05dd6dc137dbea0ba SHA512 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b
+DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
 DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71

diff --git a/app-text/calibre/calibre-4.17.0.ebuild b/app-text/calibre/calibre-4.17.0-r1.ebuild
similarity index 96%
rename from app-text/calibre/calibre-4.17.0.ebuild
rename to app-text/calibre/calibre-4.17.0-r1.ebuild
index 0191479d6be651897e34357c15143f3d16a050bd..bd20fd840abcb429c37add41c85a14eed130b93f 100644 (file)
--- a/app-text/calibre/calibre-4.17.0.ebuild
+++ b/app-text/calibre/calibre-4.17.0-r1.ebuild
@@ -10,7 +10,8 @@ inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+       https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
 
 LICENSE="
        GPL-3+
@@ -122,7 +123,8 @@ src_prepare() {
        # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
        eapply \
                "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-               "${FILESDIR}/${PN}-disable_plugins.patch"
+               "${FILESDIR}/${PN}-disable_plugins.patch" \
+               "${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
 
        eapply_user