Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1668601126290750"
MIME-Version: 1.0
Date: Wed, 16 Nov 2022 12:18:46 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/print/py-reportlab
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20221116121846.CB4FFFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1668601126290750
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Wed Nov 16 12:18:46 UTC 2022

Modified Files:
	pkgsrc/print/py-reportlab: distinfo
Added Files:
	pkgsrc/print/py-reportlab/patches: patch-setup.py

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/print/py-reportlab/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/py-reportlab/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1668601126290750
Content-Disposition: inline
Content-Length: 1936
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/py-reportlab/distinfo
diff -u pkgsrc/print/py-reportlab/distinfo:1.46 pkgsrc/print/py-reportlab/distinfo:1.47
--- pkgsrc/print/py-reportlab/distinfo:1.46	Mon Nov 14 19:35:16 2022
+++ pkgsrc/print/py-reportlab/distinfo	Wed Nov 16 12:18:46 2022
@@ -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

Added files:

Index: pkgsrc/print/py-reportlab/patches/patch-setup.py
diff -u /dev/null pkgsrc/print/py-reportlab/patches/patch-setup.py:1.1
--- /dev/null	Wed Nov 16 12:18:46 2022
+++ pkgsrc/print/py-reportlab/patches/patch-setup.py	Wed Nov 16 12:18:46 2022
@@ -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")


--_----------=_1668601126290750--