3ee2f82512
Pull in many wxi fixes from upstream post v0.100. Switch to autosetup macro for easier patching. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 69a3fa9de1e6ceb7538b20538c8293cf07d706e2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Wed, 15 Jan 2020 19:47:34 +0400
|
|
Subject: [PATCH 5/9] libvirt.wxi: depends on glib2 these days
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
---
|
|
data/wixl/libvirt.wxi | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/data/wixl/libvirt.wxi b/data/wixl/libvirt.wxi
|
|
index abb3586..a81104d 100644
|
|
--- a/data/wixl/libvirt.wxi
|
|
+++ b/data/wixl/libvirt.wxi
|
|
@@ -8,6 +8,7 @@
|
|
<?require readline.wxi?>
|
|
<?require libxml2.wxi?>
|
|
<?require winpthreads.wxi?>
|
|
+<?require glib2.wxi?>
|
|
|
|
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
|
<Fragment>
|
|
@@ -567,6 +568,7 @@
|
|
<ComponentGroupRef Id="CG.readline"/>
|
|
<ComponentGroupRef Id="CG.libxml2"/>
|
|
<ComponentGroupRef Id="CG.winpthreads"/>
|
|
+ <ComponentGroupRef Id="CG.glib2"/>
|
|
<ComponentRef Id="cmpB962DB3CF88FF4B22CD95DDD142C563A"/>
|
|
<ComponentRef Id="cmpB6F6993161E17654F77AA88C3F185130"/>
|
|
<ComponentRef Id="cmpE285D1D7089CBDBA1061BBD4A7AF1000"/>
|
|
--
|
|
2.25.3
|
|
|