- Add a glib.wxi workaround for win64

This commit is contained in:
Marc-André Lureau 2013-04-03 13:53:38 +02:00
parent 93a6f533f1
commit 15b6fd7bd2
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,36 @@
From 03da0f1ed92cfe61bffbebda824c0900865e5eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
Date: Wed, 3 Apr 2013 13:49:32 +0200
Subject: [PATCH] glib2.wxi: add a GLIB_ARCH to workaround #697156
---
data/wixl/glib2.wxi | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
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>
--
1.8.1.1.439.g50a6b54

View File

@ -1,6 +1,6 @@
Name: msitools
Version: 0.92
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Windows Installer tools
License: GPLv2+
@ -17,6 +17,8 @@ BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
BuildRequires: vala-tools
Patch1: 0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch
%description
msitools is a collection of utilities to inspect and create Windows
Installer files. It is useful in a cross-compilation environment such
@ -40,7 +42,7 @@ The libmsi1-devel package includes the header files for libmsi.
%prep
%setup -q
%patch1 -p1
%build
%configure --enable-fast-install
@ -84,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog
* Wed Apr 3 2013 Marc-André Lureau <marcandre.lureau@gmail.com> - 0.92-2
- Add a glib.wxi workaround for win64
* Thu Mar 7 2013 Marc-André Lureau <marcandre.lureau@gmail.com> - 0.92-1
- New upstream release.
- Add msidump & msidiff tools.