| 1 |
commit: 73d7896e2f6ce064b2d20f603484d2b06eab51a1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 28 08:53:58 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 08:54:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d7896e |
| 7 |
|
| 8 |
dev-python/reportlab: Disable broken freetype2 finding logic |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836301 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
.../reportlab/files/reportlab-3.6.9-paths.patch | 21 +++++++++++++++++++++ |
| 14 |
dev-python/reportlab/reportlab-3.6.9.ebuild | 4 ++++ |
| 15 |
profiles/package.mask | 7 ------- |
| 16 |
3 files changed, 25 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..e5ed7c43478d |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch |
| 23 |
@@ -0,0 +1,21 @@ |
| 24 |
+Disable broken logic for finding freetype2 that hits symlink loops. |
| 25 |
+ |
| 26 |
+diff -dupr reportlab-3.6.9.orig/setup.py reportlab-3.6.9/setup.py |
| 27 |
+--- reportlab-3.6.9.orig/setup.py 2022-03-28 10:13:33.892516135 +0200 |
| 28 |
++++ reportlab-3.6.9/setup.py 2022-03-28 10:49:11.048573739 +0200 |
| 29 |
+@@ -737,13 +737,10 @@ def main(): |
| 30 |
+ else: |
| 31 |
+ FT_LIB=FT_LIB_DIR=FT_INC_DIR=FT_MACROS=[] |
| 32 |
+ else: |
| 33 |
+- ftv, I, L = inc_lib_dirs('freetype') |
| 34 |
+ FT_LIB=['freetype'] |
| 35 |
+- FT_LIB_DIR=L |
| 36 |
+- FT_INC_DIR=I |
| 37 |
++ FT_LIB_DIR=[] |
| 38 |
++ FT_INC_DIR=['/usr/include/freetype2'] |
| 39 |
+ FT_MACROS = [('RENDERPM_FT',None)] |
| 40 |
+- infoline('installing with freetype version %s' % ftv) |
| 41 |
+- infoline('FT_LIB_DIR=%r FT_INC_DIR=%r' % (FT_LIB_DIR,FT_INC_DIR)) |
| 42 |
+ if not FT_LIB: |
| 43 |
+ infoline('# installing without freetype no ttf, sorry!') |
| 44 |
+ infoline('# You need to install a static library version of the freetype2 software') |
| 45 |
|
| 46 |
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild |
| 47 |
index 8381872bec16..a78215c6e3bf 100644 |
| 48 |
--- a/dev-python/reportlab/reportlab-3.6.9.ebuild |
| 49 |
+++ b/dev-python/reportlab/reportlab-3.6.9.ebuild |
| 50 |
@@ -33,6 +33,10 @@ BDEPEND=" |
| 51 |
app-arch/unzip |
| 52 |
" |
| 53 |
|
| 54 |
+PATCHES=( |
| 55 |
+ "${FILESDIR}"/reportlab-3.6.9-paths.patch |
| 56 |
+) |
| 57 |
+ |
| 58 |
distutils_enable_sphinx docs/source |
| 59 |
|
| 60 |
src_unpack() { |
| 61 |
|
| 62 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 63 |
index c8c8023fb8e8..ca933b566b3f 100644 |
| 64 |
--- a/profiles/package.mask |
| 65 |
+++ b/profiles/package.mask |
| 66 |
@@ -33,13 +33,6 @@ |
| 67 |
|
| 68 |
#--- END OF EXAMPLES --- |
| 69 |
|
| 70 |
-# Sam James <sam@g.o> (2022-03-28) |
| 71 |
-# Hangs in src_compile when net-libs/nodejs is installed |
| 72 |
-# Masked pending either a workaround in reportlab or |
| 73 |
-# adaptations to nodejs. |
| 74 |
-# bug #836301 |
| 75 |
-=dev-python/reportlab-3.6.9 |
| 76 |
- |
| 77 |
# Matt Turner <mattst88@g.o> (2022-03-27) |
| 78 |
# Dead package. No reverse dependencies. |
| 79 |
# Removal on 2022-04-27 |
Archives