From 940f573105fe73eb73160c5e0e589dd5b923d5c2 Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Fri, 12 Apr 2013 18:12:43 +0200
Subject: wxi: add gmp and nettle to satisfy gnutls in f19

---
 data/Makefile.am     |  2 ++
 data/wixl/gmp.wxi    | 24 ++++++++++++++++++++++++
 data/wixl/gnutls.wxi |  5 +++++
 data/wixl/nettle.wxi | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 data/wixl/gmp.wxi
 create mode 100644 data/wixl/nettle.wxi

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 8dd0323..b38a7e9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,6 +15,7 @@ dist_wxi_DATA =					\
 	wixl/gdk-pixbuf.wxi			\
 	wixl/gettext.wxi			\
 	wixl/glib2.wxi				\
+	wixl/gmp.wxi				\
 	wixl/gnutls.wxi				\
 	wixl/gstreamer-plugins-bad-free.wxi	\
 	wixl/gstreamer-plugins-base.wxi		\
@@ -41,6 +42,7 @@ dist_wxi_DATA =					\
 	wixl/libvirt.wxi			\
 	wixl/libvorbis.wxi			\
 	wixl/libxml2.wxi			\
+	wixl/nettle.wxi				\
 	wixl/nspr.wxi				\
 	wixl/nss.wxi				\
 	wixl/openssl.wxi			\
diff --git a/data/wixl/gmp.wxi b/data/wixl/gmp.wxi
new file mode 100644
index 0000000..bb25421
--- /dev/null
+++ b/data/wixl/gmp.wxi
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?require gcc.wxi?>
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="dirEC46AD626BCD898D01A0DEE1610DCD27" Name="bin">
+        <Component Win64="$(var.Win64)" Id="cmp0EE51670A82496B36B97670C3C0E50BA" Guid="*">
+          <File Id="filD5351501BA31874AFFFA329B749B82CB" KeyPath="yes" Source="$(var.SourceDir)/bin/libgmp-10.dll"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmpEBB0E822D6A0A44090A16AD807348C4D" Guid="*">
+          <File Id="filB894F508D3E14768CA6FD1CE5457E6CA" KeyPath="yes" Source="$(var.SourceDir)/bin/libmp-3.dll"/>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.gmp">
+      <ComponentGroupRef Id="CG.gcc"/>
+      <ComponentRef Id="cmp0EE51670A82496B36B97670C3C0E50BA"/>
+      <ComponentRef Id="cmpEBB0E822D6A0A44090A16AD807348C4D"/>
+    </ComponentGroup>
+  </Fragment>
+</Include>
diff --git a/data/wixl/gnutls.wxi b/data/wixl/gnutls.wxi
index 119cac4..05d099f 100644
--- a/data/wixl/gnutls.wxi
+++ b/data/wixl/gnutls.wxi
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?require gcc.wxi?>
+<?require gmp.wxi?>
 <?require libtasn1.wxi?>
+<?require nettle.wxi?>
 <?require readline.wxi?>
 <?require p11-kit.wxi?>
+
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
@@ -16,7 +19,9 @@
   <Fragment>
     <ComponentGroup Id="CG.gnutls">
       <ComponentGroupRef Id="CG.gcc"/>
+      <ComponentGroupRef Id="CG.gmp"/>
       <ComponentGroupRef Id="CG.libtasn1"/>
+      <ComponentGroupRef Id="CG.nettle"/>
       <ComponentGroupRef Id="CG.readline"/>
       <ComponentGroupRef Id="CG.p11-kit"/>
       <ComponentRef Id="cmp845933D5BF01B8450C766D545EF5F537"/>
diff --git a/data/wixl/nettle.wxi b/data/wixl/nettle.wxi
new file mode 100644
index 0000000..85ba73a
--- /dev/null
+++ b/data/wixl/nettle.wxi
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?require gmp.wxi?>
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="dir19005F9CD7DD75239BC27524467D3B5F" Name="bin">
+        <Component Win64="$(var.Win64)" Id="cmp7D1D6558DB49C65F87ABAA8ABC549490" Guid="*">
+          <File Id="fil7D9A5BA189964756C558D780557F3FE3" KeyPath="yes" Source="$(var.SourceDir)/bin/libhogweed-2-3.dll"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp26E1104F7A73A1758041DD848846050E" Guid="*">
+          <File Id="fil556F58E4223E3D0E4D47703DE0ADA463" KeyPath="yes" Source="$(var.SourceDir)/bin/libnettle-4-5.dll"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp9FC667D34859E0C1F4AAF3B30562A147" Guid="*">
+          <File Id="fil049533F7D47445344E752E04CDFF43EF" KeyPath="yes" Source="$(var.SourceDir)/bin/nettle-hash.exe"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmpA4DD6D111AE0612995C2CDB5F5B5D7D8" Guid="*">
+          <File Id="filBA1CCAD51240CA545C51C42F9C8F3705" KeyPath="yes" Source="$(var.SourceDir)/bin/nettle-lfib-stream.exe"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp0B468FEC1961B8353377BF2AC881CCB5" Guid="*">
+          <File Id="fil1C7E34D4442FCB2E286047F2D190EFB6" KeyPath="yes" Source="$(var.SourceDir)/bin/pkcs1-conv.exe"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp15113D7FD0A03234112DF7A60B8E9881" Guid="*">
+          <File Id="fil10A334FEA6E072613A846160386A55FA" KeyPath="yes" Source="$(var.SourceDir)/bin/sexp-conv.exe"/>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CG.nettle">
+      <ComponentGroupRef Id="CG.gmp"/>
+      <ComponentRef Id="cmp7D1D6558DB49C65F87ABAA8ABC549490"/>
+      <ComponentRef Id="cmp26E1104F7A73A1758041DD848846050E"/>
+      <ComponentRef Id="cmp9FC667D34859E0C1F4AAF3B30562A147"/>
+      <ComponentRef Id="cmpA4DD6D111AE0612995C2CDB5F5B5D7D8"/>
+      <ComponentRef Id="cmp0B468FEC1961B8353377BF2AC881CCB5"/>
+      <ComponentRef Id="cmp15113D7FD0A03234112DF7A60B8E9881"/>
+    </ComponentGroup>
+  </Fragment>
+</Include>
-- 
cgit