pkgsrc-WIP-changes archive

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

(sysutils/libvirt) rst2html5 issue still exists



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Thu Nov 27 20:15:28 2025 +0900
Changeset:	42b722465abe2cf699bb91e4986c76b48498418d

Modified Files:
	libvirt11/Makefile
	libvirt11/distinfo
	libvirt11/patches/patch-meson.build

Log Message:
(sysutils/libvirt) rst2html5 issue still exists

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42b722465abe2cf699bb91e4986c76b48498418d

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

diffstat:
 libvirt11/Makefile                  |  6 ++++++
 libvirt11/distinfo                  |  2 +-
 libvirt11/patches/patch-meson.build | 21 +++++++++++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)

diffs:
diff --git a/libvirt11/Makefile b/libvirt11/Makefile
index 25bcbf2119..b9f5110692 100644
--- a/libvirt11/Makefile
+++ b/libvirt11/Makefile
@@ -36,6 +36,12 @@ RCD_SCRIPTS=		libvirtd
 ## SUBST_SED.pyver+=	-e 's|python${PYVERSSUFFIX}_prog|python3|g'
 ## #SUBST_SED.pyver+=	-e 's|python3_prog|python${PYVERSSUFFIX}|g'
 
+SUBST_CLASSES=		prefix
+SUBST_FILES.prefix+=	meson.build
+SUBST_STAGE.prefix=	pre-configure
+#SUBST_VARS.prefix+=	PREFIX
+SUBST_SED.prefix+=	-e 's,@PREFIX@,${PREFIX},'
+
 
 PKGCONFIG_OVERRIDE+=	libvirt.pc.in
 PKGCONFIG_OVERRIDE+=	libvirt-admin.pc.in
diff --git a/libvirt11/distinfo b/libvirt11/distinfo
index a6ed595a93..0235d04fcf 100644
--- a/libvirt11/distinfo
+++ b/libvirt11/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.8 2015/11/04 01:32:20 agc Exp $
 BLAKE2s (libvirt-11.9.0.tar.xz) = 503652697946acb0924fbc8218aba047a16d8083e143b1f78bdc90798bdd43ff
 SHA512 (libvirt-11.9.0.tar.xz) = b1965bdcf9c0c9e7977787451b44e5ffb509ce19f79c3d7a0eca1929c3db1e0f3417abf8e67a121efee8bf2a18000c8b11812c7a8582989af51e03450f6ba5c8
 Size (libvirt-11.9.0.tar.xz) = 10145112 bytes
-SHA1 (patch-meson.build) = 5e0ca1e8421e478b8f78b93b747fbdf74f89ed4a
+SHA1 (patch-meson.build) = a78505271e5e0e0f6dd80ff07ff402508b38792e
 SHA1 (patch-src_meson.build) = 118584f643caccf804aa05eb61b87d39fa5a8823
 SHA1 (patch-src_rpc_virnetmessage.c) = 989ddb4a75544e5a4c241d75e6fa01eadb6367f8
 SHA1 (patch-src_util_virstring.c) = ab925631cf15c177f2818783299715b60c8c4b13
diff --git a/libvirt11/patches/patch-meson.build b/libvirt11/patches/patch-meson.build
index f38da8e6a8..80bd3f81c8 100644
--- a/libvirt11/patches/patch-meson.build
+++ b/libvirt11/patches/patch-meson.build
@@ -1,7 +1,11 @@
 $NetBSD$
 
-Let me check with work around only for NetBSD (to avoid following issue)
+2. 
+docs/meson.build:178:9: ERROR: Program 'rst2html5 rst2html5.py rst2html5-3' not found or not executable
+
 
+2.
+Let me check with work around only for NetBSD (to avoid following issue)
 ----------
 meson.build:964:16: ERROR: C shared or static library 'dl' not found
 
@@ -11,9 +15,18 @@ ld: cannot find -ldl: No such file or directory
 ----------
 
 
---- meson.build.orig	2025-10-01 19:46:01.000000000 +0900
-+++ meson.build	2025-11-03 17:56:10.514682278 +0900
-@@ -960,14 +960,14 @@ if devmapper_dep.found()
+ 
+--- meson.build.orig	2025-11-27 19:37:43.438650006 +0900
++++ meson.build	2025-11-27 19:33:52.275885864 +0900
+@@ -818,6 +818,7 @@ if host_machine.system() != 'windows'
+     '/sbin',
+     '/usr/sbin',
+     '/usr/local/sbin',
++    '@PREFIX@/bin',
+   ]
+ endif
+ 
+@@ -960,14 +961,14 @@ if devmapper_dep.found()
    conf.set('WITH_DEVMAPPER', 1)
  endif
  


Home | Main Index | Thread Index | Old Index