CVS commit: pkgsrc/graphics/gdk-pixbuf2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jun 22 08:50:45 UTC 2022

Modified Files:
        pkgsrc/graphics/gdk-pixbuf2: Makefile distinfo
Added Files:
        pkgsrc/graphics/gdk-pixbuf2/patches: patch-docs_meson.build

Log Message:
gdk-pixbuf: Avoid referencing docbook files by network URL, which
is causing failures on my local setup.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/gdk-pixbuf2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gdk-pixbuf2/patches/patch-docs_meson.build

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

Modified files:

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.53 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.54
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.53   Sat Jun 11 12:46:06 2022
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile        Wed Jun 22 08:50:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2022/06/11 12:46:06 nia Exp $
+# $NetBSD: Makefile,v 1.54 2022/06/22 08:50:44 nia Exp $
 
 DISTNAME=      gdk-pixbuf-2.42.8
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -38,6 +38,11 @@ MESON_ARGS+=                 -D installed_tests=false
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE=            output/meson-private/gdk-pixbuf-2.0.pc
 
+SUBST_CLASSES+=                docbook
+SUBST_STAGE.docbook=   pre-configure
+SUBST_FILES.docbook+=  docs/meson.build
+SUBST_VARS.docbook+=   PREFIX
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_FOR_BUILD_ONLY=         tool
 

Index: pkgsrc/graphics/gdk-pixbuf2/distinfo
diff -u pkgsrc/graphics/gdk-pixbuf2/distinfo:1.51 pkgsrc/graphics/gdk-pixbuf2/distinfo:1.52
--- pkgsrc/graphics/gdk-pixbuf2/distinfo:1.51   Sat Jun 11 12:46:06 2022
+++ pkgsrc/graphics/gdk-pixbuf2/distinfo        Wed Jun 22 08:50:44 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.51 2022/06/11 12:46:06 nia Exp $
+$NetBSD: distinfo,v 1.52 2022/06/22 08:50:44 nia Exp $
 
 BLAKE2s (gdk-pixbuf-2.42.8.tar.xz) = eac540223073cbf38906052e2325483934cd1c39994cce6e761c3205b8e0324d
 SHA512 (gdk-pixbuf-2.42.8.tar.xz) = 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
 Size (gdk-pixbuf-2.42.8.tar.xz) = 8503020 bytes
+SHA1 (patch-docs_meson.build) = fcbb0ce0a0c2cd843b33876ab1dfc1c5dd0466ac
 SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = a9d2436711b1a1c3bb58beef0df5e485ad6cbe7d
 SHA1 (patch-gdk-pixbuf_meson.build) = d54c4f1c5c045c3988fc2bbac19d2aac3e32de89
 SHA1 (patch-tests_meson.build) = 6da53b4e168a20dcc546840e4fbd8fc7ac8f03aa

Added files:

Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-docs_meson.build
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/patches/patch-docs_meson.build:1.1
--- /dev/null   Wed Jun 22 08:50:45 2022
+++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-docs_meson.build  Wed Jun 22 08:50:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-docs_meson.build,v 1.1 2022/06/22 08:50:45 nia Exp $
+
+Avoid network requests, which may potentially fail.
+
+--- docs/meson.build.orig      2022-03-18 12:24:35.000000000 +0000
++++ docs/meson.build
+@@ -89,7 +89,7 @@ if get_option('man') and xsltproc.found(
+                     xsltproc,
+                     xlstproc_flags,
+                     '-o', '@OUTPUT@',
+-                    'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
++                    '@PREFIX@/share/xsl/docbook/manpages/docbook.xsl',
+                     '@INPUT@',
+                   ],
+                   install: true,