gnucash-on-windows master: Work around MSYS2's switch from pkg-config to pkgconf.
John Ralls
jralls at code.gnucash.org
Thu Jan 28 20:01:14 EST 2021
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/2eff9d37 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/0231789c (commit)
commit 2eff9d37c0628cfe529c28426e2b550f331866ef
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jan 28 16:58:17 2021 -0800
Work around MSYS2's switch from pkg-config to pkgconf.
pkg-conf's list-all command leaves a leading '/' on package names
so that they can't be fed back into a pkg-config command. Strip them
off so that the result can be used.
diff --git a/patches/jhbuild.patch b/patches/jhbuild.patch
index 461c3ed..cdd9103 100644
--- a/patches/jhbuild.patch
+++ b/patches/jhbuild.patch
@@ -45,3 +45,16 @@ index 1bd44e32..4064faaa 100644
self.process_install(buildscript, self.get_revision())
do_install.depends = [PHASE_BUILD]
+diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py
+index 610be80d..50c56aab 100644
+--- a/jhbuild/utils/systeminstall.py
++++ b/jhbuild/utils/systeminstall.py
+@@ -45,7 +45,7 @@ def get_installed_pkgconfigs(config):
+ pkgs = []
+ for line in stdout.splitlines():
+ pkg, rest = line.split(None, 1)
+- pkgs.append(pkg)
++ pkgs.append(pkg.lstrip('/'))
+
+ # see if we can get the versions "the easy way"
+ try:
Summary of changes:
patches/jhbuild.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
More information about the gnucash-changes
mailing list