From 03da0f1ed92cfe61bffbebda824c0900865e5eab Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Wed, 3 Apr 2013 13:49:32 +0200
Subject: glib2.wxi: add a GLIB_ARCH to workaround #697156

---
 data/wixl/glib2.wxi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/wixl/glib2.wxi b/data/wixl/glib2.wxi
index ead91b1..0d2058e 100644
--- a/data/wixl/glib2.wxi
+++ b/data/wixl/glib2.wxi
@@ -35,12 +35,17 @@
         <Component Id="cmp641F505793C8C044C76414CB6C791C85" Guid="*">
           <File Id="filA257891410A87696A3ADE5852462FBDE" KeyPath="yes" Source="$(var.SourceDir)/bin/gsettings.exe"/>
         </Component>
+
+        <!-- FIXME: perhaps not correct to share component id for two
+        versions here, but we lack condition expression evaluation.
+        Also, see GLib bug 697156 to remove that unnecessary kludge -->
         <Component Id="cmp6D51B76EDAC50E07576738CC967DF2B8" Guid="*">
-          <File Id="fil4EE00EB97025D93A2059F8C6CE6CE4DF" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-win32-helper-console.exe"/>
+          <File Id="fil4EE00EB97025D93A2059F8C6CE6CE4DF" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-$(env.GLIB_ARCH)-helper-console.exe"/>
         </Component>
         <Component Id="cmpD2B981C370CD6226A814AE8B4C124DDE" Guid="*">
-          <File Id="filEE7F8F0A2194C97E113C07E0A1CD6E6E" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-win32-helper.exe"/>
+          <File Id="filEE7F8F0A2194C97E113C07E0A1CD6E6E" KeyPath="yes" Source="$(var.SourceDir)/bin/gspawn-$(env.GLIB_ARCH)-helper.exe"/>
         </Component>
+
         <Component Id="cmp4A6A2B5ACA14940BF3D57B9FF19C9689" Guid="*">
           <File Id="filE25C44314299AD6EE8F900723C732123" KeyPath="yes" Source="$(var.SourceDir)/bin/libgio-2.0-0.dll"/>
         </Component>
-- 
cgit