According to GLib changelog [1], since version 2.73.2 GLib is using
libpcre2 instead of libpcre. As a result, qemu-ga MSI installation
fails due to missing DLL.
This commit makes wixl to put libpcre2-8-0.dll into the MSI bundle.
[1] https://gitlab.gnome.org/GNOME/glib/-/releases#2.73.2
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
---
qga/installer/qemu-ga.wxs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 813d1c6ca6..73ce2c4965 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -101,8 +101,8 @@
<Component Id="libwinpthread"
Guid="{6C117C78-0F47-4B07-8F34-6BEE11643829}">
<File Id="libwinpthread_1.dll" Name="libwinpthread-1.dll"
Source="$(var.BIN_DIR)/libwinpthread-1.dll" KeyPath="yes" DiskId="1"/>
</Component>
- <Component Id="libpcre"
Guid="{7A86B45E-A009-489A-A849-CE3BACF03CD0}">
- <File Id="libpcre_1.dll" Name="libpcre-1.dll" Source="$(var.BIN_DIR)/libpcre-1.dll"
KeyPath="yes" DiskId="1"/>
+ <Component Id="libpcre2"
Guid="{F92A3804-B59C-419D-8F29-99A30352C156}">
+ <File Id="libpcre2_8_0.dll" Name="libpcre2-8-0.dll"
Source="$(var.BIN_DIR)/libpcre2-8-0.dll" KeyPath="yes" DiskId="1"/>
</Component>
<Component Id="registry_entries"
Guid="{D075D109-51CA-11E3-9F8B-000C29858960}">
<RegistryKey Root="HKLM"
@@ -153,7 +153,7 @@
<ComponentRef Id="libssp" />
<ComponentRef Id="libwinpthread" />
<ComponentRef Id="registry_entries" />
- <ComponentRef Id="libpcre" />
+ <ComponentRef Id="libpcre2" />
</Feature>
<InstallExecuteSequence>