changeset 92f15db517e6 in tryton-overlay:default
details: https://hg.tryton.org/tryton-overlay?cmd=changeset&node=92f15db517e6
description:
app-office/trytond: Remove applied pillow truetype patch
issue10716
(Portage version: 3.0.20/hg/Linux x86_64, signed Manifest commit with
key 0x574F6EFF4E477517)
Signed-off-by: Cédric Krier <[email protected]>
diffstat:
app-office/trytond/Manifest | 19 +++++------
app-office/trytond/files/trytond-6.0.5-pillow-truetype.patch | 18 -----------
app-office/trytond/trytond-6.0.6.ebuild | 4 --
3 files changed, 9 insertions(+), 32 deletions(-)
diffs (75 lines):
diff -r 0ff2fdd3eccf -r 92f15db517e6 app-office/trytond/Manifest
--- a/app-office/trytond/Manifest Thu Sep 02 21:12:55 2021 +0200
+++ b/app-office/trytond/Manifest Fri Sep 03 15:36:07 2021 +0200
@@ -1,7 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX trytond-6.0.5-pillow-truetype.patch 676 BLAKE2B
e6a0b3e176a6071215d47a7176935d252f863453be63bf71f0b1f3137c8a229e3db6449a34c159cb243f5f9972a00f6bb21ec59a22508e6ef93cacb1b7585969
SHA512
bfcf32b5bc148119af91891e87363ab70fac746d8e024a76f7d9f6aed4e11b55abb0e78c76cdc41dd9f318d0d47973053a96dd8bf6503b8e8c873f68feaa62e9
AUX trytond-conf.d-2 183 BLAKE2B
0be9580db18911823fffc694ca372fccb68d2cc2c1b80f6604f92ef3e94c9e29d94be505631dd9189abf466d5662b4a447977fcea0b522d0dec650d12504374a
SHA512
c3d21f8bfb53c6927d1e328baf314af3d71ac79203b62eae890475c3263917507700904b4c9c7029c6f59f399673900e4dc12720ad398797246d00326e125a67
AUX trytond-cron-init.d-2 824 BLAKE2B
6084a7c7d1ea12a6dbff3a774598d83761c60281560e6b4d8a057103c3d2aba31c36cebd314f2f10cd76c6ecdd302ab95d18d177739a266a91f4f8a55b642238
SHA512
7bbb6b5b9815778b49303186e5b9981539878cdaf5d9a0f10eb5cc5ee9c4afd107b9cbe75e3e0ddf3860c5b165a8b548e722a55a2eda45c08c8254a53f9c3723
AUX trytond-init.d 538 BLAKE2B
9e1abe67243c8828941f5b981208dc9874d65de52113421b13676026558a3cd95fdfd8f4ad47744c91b8d02c0b25def4bf00334a26f41edbc433fb6c7c9a825f
SHA512
a86febe62bb7921b2808b9896e67c7c9b20c3082ee324f1562146550681c64e443e4548fdae6b782f4b84060181331eebf8165d6ef9f37baca3556c2ee69438d
@@ -12,18 +11,18 @@
DIST trytond-6.0.6.tar.gz 850723 BLAKE2B
fdaa9abe44e0dba65d2806a7f7691b82b1f3dbb0733b8470c621c5b5d62a96151556de2450b70af56b16a42a618cb6615d0150c6dba34b8d92936c3e33f047b1
SHA512
4061f66d0fed35482e499afc8c476f2ecbf6bc9d22647539f5effc028fbe63c49c4278fc741cab7cd5146b23d0af9f48e50eb181f15bd08268fe96eedf9faf98
EBUILD trytond-5.6.17.ebuild 2947 BLAKE2B
2a87e9647cf44dec001bff3e9d4958dc482386585cad8f6777f4b3c00f2e95c6e9b4516b80b73f978476523ee2a2f1370d41a4799e4a9f19ac8efc34d1837f6f
SHA512
da80e55aa1bc4517caa280eff8a149f41c589719e2b989772dae25e606dd40971f0514324eaad78c5d0bf6e71b01fa6633911379a0b253c32d416c5a93eef240
EBUILD trytond-5.8.12.ebuild 2947 BLAKE2B
3773608460c387ffa4af0b3fe7c200a3ed6264c5787cc3c7919b001dae7352c6120ec989928e15391fa58803451ca6a08c3338fc94fc0d7fefc494ae70f4b81e
SHA512
0e7cb6accf63d559673785e7b80ec54c7c5f175d6c4f2f375a03f8116d578ccf57dfcd1263ae3330c3f2c6745b1d23c2a26e712bca0da0134f4433732c229460
-EBUILD trytond-6.0.6.ebuild 3108 BLAKE2B
ba2228702f9f8e32efdd453f4972d9508e39e4aaef96d34d38d431b29873cb1b8c9f13ee2d656a64f845a707f75fefecec588a4a36e3bf089598a68d668bc3af
SHA512
45b9b2df29e48e9a7de4bb9f18ab2a8e6b2b3f152d1448f99574869527f6fc31d1716f2c810dc802489b3f36b93061c2b3f61d3f3dc3d6fb951ad3eb1a41a042
+EBUILD trytond-6.0.6.ebuild 3053 BLAKE2B
70a0ffdb0d8f0b8374b48d8b0e65ab159ff6b056837ca91801c65f6a3d0956ed52e9da69de7c6347b1ee2c2dd8c8452ffa6e2ac4603616b2342c9efee79c54f7
SHA512
d14b5c0401ec92f2849f5d23b02a79856ae94864f27c7a119ae7ec62222d1a510550907b6c76ab836947ed0e48a01ac5d7d059632f7649b23a453601d5564913
MISC ChangeLog 22532 BLAKE2B
391afdd0a9c008f8d3ab552eec64ffcd171c4df73dd3aefbc4b7834bb2f6ea3edab7821405435f2a9e416563fad3e0a3d75f653872f7244b4768537a544611b4
SHA512
f7edb623ed4a20b48ba8e81ee6f0c14942da036b9d37ab5be85ee1aac64e2968f65b4cc1d1c4c9a9c1219ddb020d53ef5ef115cc6acc32fce7ab26ab8a4efb4d
MISC metadata.xml 669 BLAKE2B
3409b4a9eecca9be78e9c0064ba8172a737b6dabcc75b4888ac8a12c0d239535299769802f1c5a4a96fc63fd346d015536020aa8798c4faf5e5ba565a614e8d5
SHA512
226319315274dedf45092e9923a652f9c31a0c8fe96fc800278d2cac57aed1101bc56d8f7ca959c7d098074f22926cb52035685182fff2aca33de3d8b7e2c50e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEzBAEBCAAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmExIjYACgkQV09u/05H
-dRfa7gf+IgncRmISvrdmGogGjkKPeynpo+wGPti/i0rUu28ETIFMwuBQlncCNM93
-SsoFBmmA3ogPCIFNjywmGGcjlXuMrDgSAFX1k1Wx5ZHJa5+Ol/NJMq4iUWdzhRn8
-Dt0fxYqvvjLrl9XOawvnMHjKCmMjtihvcxStdjvQadPREhfoGYGb+nqpym9/bmhc
-eSE0BgbC7Htrj8WzUFYn/va/jpsGrDVooPdJIf0nOk3SNyQjcttru19RI4jdmhfm
-eExoKUDU92QcBIB/M1EBI1lLKCX/NiSNMMdzSvd9P6CAr4dJCQts8ndwF5hgJq78
-vd+YB+uOOWVt/KoTT0oGSJDuolqGbw==
-=DX8f
+iQEzBAEBCAAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmEyJMYACgkQV09u/05H
+dRfIGwf/XlnMcqF7Jb69jNzW9MOkIgfDVZDGKJasHV1BjZFK+LXar2Gvvk9xUCkB
+Gyp8SqhMKNttkx53PhukFy7J9IywrGJHNphYXESQhyX7O6roV9he8mLG5aWEmK4A
+tReEEunz6Lhe+gSnRiVW1kpUJWeQWf5gr+47hjqt/NHv1kTTydt29CVbxtEbClcV
+PJxGhZmLqV7DJGDyVGzNNqaz/MBk6LzGTuGvtgzlPwcaC6d1otuEc5GX5zI+5sNs
+7aORha+jyIAYww3VsEBpSuHZPfdVlwyhNbZiIT+AiQYVccjlaPK570TIwtYbHNH2
+ihFgt/C1yqyZcoQHNF3J8U5BZfCs5Q==
+=42Tp
-----END PGP SIGNATURE-----
diff -r 0ff2fdd3eccf -r 92f15db517e6
app-office/trytond/files/trytond-6.0.5-pillow-truetype.patch
--- a/app-office/trytond/files/trytond-6.0.5-pillow-truetype.patch Thu Sep
02 21:12:55 2021 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff --git a/trytond/ir/avatar.py b/trytond/ir/avatar.py
---- a/trytond/ir/avatar.py
-+++ b/trytond/ir/avatar.py
-@@ -185,10 +185,13 @@ def generate(size, string):
- b = random.randint(0, 255)
- return r, v, b
-
-+ try:
-+ font = ImageFont.truetype(FONT, size=int(0.65 * size))
-+ except ImportError:
-+ return
- white = (255, 255, 255)
- image = Image.new('RGB', (size, size), background_color(string))
- draw = ImageDraw.Draw(image)
-- font = ImageFont.truetype(FONT, size=int(0.65 * size))
- letter = string[0].upper() if string else ''
- draw.text(
- (size / 2, size / 2), letter, fill=white, font=font, anchor='mm')
diff -r 0ff2fdd3eccf -r 92f15db517e6 app-office/trytond/trytond-6.0.6.ebuild
--- a/app-office/trytond/trytond-6.0.6.ebuild Thu Sep 02 21:12:55 2021 +0200
+++ b/app-office/trytond/trytond-6.0.6.ebuild Fri Sep 03 15:36:07 2021 +0200
@@ -43,10 +43,6 @@
dev-python/pillow[truetype,$PYTHON_USEDEP]
)"
-PATCHES=(
- "${FILESDIR}"/${P}-pillow-truetype.patch
-)
-
src_compile() {
distutils-r1_src_compile