Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1582564111185870"
MIME-Version: 1.0
Date: Mon, 24 Feb 2020 17:08:31 +0000
From: "Brook Milligan" <brook@netbsd.org>
Subject: CVS commit: pkgsrc/devel/pango
To: pkgsrc-changes@NetBSD.org
Reply-To: brook@netbsd.org
Message-Id: <20200224170831.9C3BDFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	brook
Date:		Mon Feb 24 17:08:31 UTC 2020

Modified Files:
	pkgsrc/devel/pango: Makefile distinfo
Added Files:
	pkgsrc/devel/pango/files: pango-view.sh
	pkgsrc/devel/pango/patches: patch-utils_meson.build

Log Message:
Fix build on Darwin.

During the build, help2man runs pango-view but does not include
LD_LIBRARY_PATH in the environment.  That is needed on Darwin to run
uninstalled programs.  This adds a wrapper so that LD_LIBRARY_PATH
can be defined appropriately.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/pango/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/pango/files/pango-view.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/pango/patches/patch-utils_meson.build

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


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

Modified files:

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.230 pkgsrc/devel/pango/Makefile:1.231
--- pkgsrc/devel/pango/Makefile:1.230	Thu Jan  2 15:54:53 2020
+++ pkgsrc/devel/pango/Makefile	Mon Feb 24 17:08:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2020/01/02 15:54:53 gutteridge Exp $
+# $NetBSD: Makefile,v 1.231 2020/02/24 17:08:31 brook Exp $
 
 DISTNAME=	pango-1.44.7
 CATEGORIES=	devel fonts
@@ -16,6 +16,11 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
+SUBST_CLASSES+=		wrksrc
+SUBST_STAGE.wrksrc=	pre-configure
+SUBST_FILES.wrksrc=	output/utils/pango-view.sh
+SUBST_VARS.wrksrc=	WRKSRC
+
 PKGCONFIG_OVERRIDE+=		output/meson-private/pango.pc
 PKGCONFIG_OVERRIDE+=		output/meson-private/pangocairo.pc
 PKGCONFIG_OVERRIDE+=		output/meson-private/pangoft2.pc
@@ -28,6 +33,10 @@ CHECK_PORTABILITY_SKIP+=	docs/check.docs
 
 BUILDLINK_TRANSFORM+=	rm:-Werror=implicit-fallthrough # clang10svn
 
+post-extract:
+	${MKDIR} -p ${WRKSRC}/output/utils
+	${CP} ${FILESDIR}/pango-view.sh ${WRKSRC}/output/utils
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/pango-view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pango-view.1 || ${TRUE}
 

Index: pkgsrc/devel/pango/distinfo
diff -u pkgsrc/devel/pango/distinfo:1.123 pkgsrc/devel/pango/distinfo:1.124
--- pkgsrc/devel/pango/distinfo:1.123	Wed Nov  6 13:26:21 2019
+++ pkgsrc/devel/pango/distinfo	Mon Feb 24 17:08:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.123 2019/11/06 13:26:21 wiz Exp $
+$NetBSD: distinfo,v 1.124 2020/02/24 17:08:31 brook Exp $
 
 SHA1 (pango-1.44.7.tar.xz) = 2ca86089b657a2ccfede7d1b7598fdaa34c24859
 RMD160 (pango-1.44.7.tar.xz) = 8311253bf24ba3cb250938cd80f74b00d0ef8fdf
@@ -11,3 +11,4 @@ SHA1 (patch-pango_pangocoretext-private.
 SHA1 (patch-pango_pangocoretext.c) = 44b65b64da1d2ae819a5e984b5c672ad9d333622
 SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647
 SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
+SHA1 (patch-utils_meson.build) = 4c2564d54209b4bed286db3d85963c78897ceb49

Added files:

Index: pkgsrc/devel/pango/files/pango-view.sh
diff -u /dev/null pkgsrc/devel/pango/files/pango-view.sh:1.1
--- /dev/null	Mon Feb 24 17:08:31 2020
+++ pkgsrc/devel/pango/files/pango-view.sh	Mon Feb 24 17:08:31 2020
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $NetBSD: pango-view.sh,v 1.1 2020/02/24 17:08:31 brook Exp $
+#
+# Run pango-view with LD_LIBRARY_PATH
+#
+# During the build process, help2man is used to create a man page for
+# pango-view, which it does by running pango-view.  On some platforms
+# (notably Darwin) this fails because pango-view requires access to a
+# shared library just built and rpath is not set appropriately.
+# Therefore, LD_LIBRARY_PATH must be set, which cannot be done in
+# meson.build, because help2man does not propagate the environment to
+# programs it runs.  The solution is to wrap pango-view in this script
+# and provide LD_LIBRARY_PATH here.
+#
+
+env LD_LIBRARY_PATH=@WRKSRC@/output/pango @WRKSRC@/output/utils/pango-view ${*}

Index: pkgsrc/devel/pango/patches/patch-utils_meson.build
diff -u /dev/null pkgsrc/devel/pango/patches/patch-utils_meson.build:1.1
--- /dev/null	Mon Feb 24 17:08:31 2020
+++ pkgsrc/devel/pango/patches/patch-utils_meson.build	Mon Feb 24 17:08:31 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-utils_meson.build,v 1.1 2020/02/24 17:08:31 brook Exp $
+
+Make help2man execute a wrapper script so that LD_LIBRARY_PATH can be defined.
+
+--- utils/meson.build.orig	2019-10-25 03:45:11.000000000 +0000
++++ utils/meson.build
+@@ -52,8 +52,9 @@ if help2man.found() and not meson.is_cro
+ 
+   custom_target('pango-view.1',
+                 output: 'pango-view.1',
++		depends: pango_view,
+                 command: [
+-                  help2man, help2man_opts, '--output=@OUTPUT@', pango_view
++                  help2man, help2man_opts, '--output=@OUTPUT@', '--no-discard-stderr', meson.current_build_dir() + '/pango-view.sh'
+                 ],
+                 install: true,
+                 install_dir: join_paths(pango_datadir, 'man/man1'))


--_----------=_1582564111185870--