pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/py-reportlab print/py-reportlab: Remediate incor...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7dad492267f3
branches:  trunk
changeset: 388296:7dad492267f3
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Nov 16 12:18:46 2022 +0000

description:
print/py-reportlab: Remediate incorrect searching for ft2build.h

setup.py grovels paths in the filesystem to find ft2build.h,
apparently not consulting the provided CPPFLAGS.  Add /usr/X11R7, just
before /usr/local, to fix building on NetBSD 9 with base X11.  Thanks
to wiz@ for the hint.

diffstat:

 print/py-reportlab/distinfo               |   3 ++-
 print/py-reportlab/patches/patch-setup.py |  21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r d7f20296ef33 -r 7dad492267f3 print/py-reportlab/distinfo
--- a/print/py-reportlab/distinfo       Wed Nov 16 12:12:46 2022 +0000
+++ b/print/py-reportlab/distinfo       Wed Nov 16 12:18:46 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.46 2022/11/14 19:35:16 wiz Exp $
+$NetBSD: distinfo,v 1.47 2022/11/16 12:18:46 gdt Exp $
 
 BLAKE2s (reportlab-3.6.12.tar.gz) = 5e1fa732615fa14c9639855beb54a679e2709a83aff1a60f2fd25e00f497d46a
 SHA512 (reportlab-3.6.12.tar.gz) = 99e6ab1cf27cc9e661b3bfd8c71290d94189db6de5e71b2429cccd48bfee5659d5fb46dfc5709e6616877b48bc17241c74282e0d2ecddda2ead16df4c1b6818f
 Size (reportlab-3.6.12.tar.gz) = 4519536 bytes
+SHA1 (patch-setup.py) = 9092bda2c09ed81a8c8d009291f8852d94a542bf
diff -r d7f20296ef33 -r 7dad492267f3 print/py-reportlab/patches/patch-setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/py-reportlab/patches/patch-setup.py Wed Nov 16 12:18:46 2022 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-setup.py,v 1.1 2022/11/16 12:18:46 gdt Exp $
+
+Add /usr/X11R7 to the set of places setup.py looks for.  The existing
+setup.py is problematic, because this behavior escapes from buildlink,
+and because it is not just trying a test compile with the provided
+CPPFLAGS.  Given that there is already a list of questionable places
+(/usr/local), it is not incrementally worse to add in X11R7.
+
+Not yet sent upstream.
+
+--- setup.py.orig      2022-10-17 12:06:28.000000000 +0000
++++ setup.py
+@@ -277,6 +277,8 @@ class inc_lib_dirs:
+             # darwin ports installation directories
+             aDir(L, "/opt/local/lib")
+             aDir(I, "/opt/local/include")
++        aDir(I, "/usr/X11R7/include")
++        aDir(L, "/usr/X11R7/lib")
+         aDir(I, "/usr/local/include")
+         aDir(L, "/usr/local/lib")
+         aDir(I, "/usr/include")



Home | Main Index | Thread Index | Old Index