[Top][All Lists]

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

Re: [PATCH] qga-win: replace libpcre with libpcre2 in MSI package

From: Denis V. Lunev
Subject: Re: [PATCH] qga-win: replace libpcre with libpcre2 in MSI package
Date: Mon, 28 Nov 2022 14:43:29 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2

On 11/28/22 14:02, Andrey Drobyshev wrote:
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" 
              <File Id="libwinpthread_1.dll" Name="libwinpthread-1.dll" 
Source="$(var.BIN_DIR)/libwinpthread-1.dll" KeyPath="yes" DiskId="1"/>
-          <Component Id="libpcre" 
-            <File Id="libpcre_1.dll" Name="libpcre-1.dll" Source="$(var.BIN_DIR)/libpcre-1.dll" 
KeyPath="yes" DiskId="1"/>
+          <Component Id="libpcre2" 
+            <File Id="libpcre2_8_0.dll" Name="libpcre2-8-0.dll" 
Source="$(var.BIN_DIR)/libpcre2-8-0.dll" KeyPath="yes" DiskId="1"/>
            <Component Id="registry_entries" 
              <RegistryKey Root="HKLM"
@@ -153,7 +153,7 @@
        <ComponentRef Id="libssp" />
        <ComponentRef Id="libwinpthread" />
        <ComponentRef Id="registry_entries" />
-      <ComponentRef Id="libpcre" />
+      <ComponentRef Id="libpcre2" />

reply via email to

[Prev in Thread] Current Thread [Next in Thread]