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>
68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
From 9dba05055ac5fa8512b0338d988ad5913d8bbb34 Mon Sep 17 00:00:00 2001
|
|
From: rpm-build <rpm-build>
|
|
Date: Thu, 23 Apr 2020 18:56:24 +0100
|
|
Subject: [PATCH] Add brotli files missing in upstream release tarball
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
data/Makefile.am | 1 +
|
|
data/wixl/brotli.wxi | 31 +++++++++++++++++++++++++++++++
|
|
2 files changed, 32 insertions(+)
|
|
create mode 100644 data/wixl/brotli.wxi
|
|
|
|
diff --git a/data/Makefile.am b/data/Makefile.am
|
|
index e409c64..6db1e91 100644
|
|
--- a/data/Makefile.am
|
|
+++ b/data/Makefile.am
|
|
@@ -9,6 +9,7 @@ dist_wxi_DATA = \
|
|
wixl/OpenEXR.wxi \
|
|
wixl/adwaita-icon-theme.wxi \
|
|
wixl/atk.wxi \
|
|
+ wixl/brotli.wxi \
|
|
wixl/bzip2.wxi \
|
|
wixl/cairo.wxi \
|
|
wixl/celt051.wxi \
|
|
diff --git a/data/wixl/brotli.wxi b/data/wixl/brotli.wxi
|
|
new file mode 100644
|
|
index 0000000..ac73167
|
|
--- /dev/null
|
|
+++ b/data/wixl/brotli.wxi
|
|
@@ -0,0 +1,31 @@
|
|
+<?xml version="1.0" encoding="utf-8"?>
|
|
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
|
+ <Fragment>
|
|
+ <DirectoryRef Id="INSTALLDIR">
|
|
+ <Directory Id="dirD6DE5EE53EAC69C85D4723E67D18D7AD" Name="bin">
|
|
+ <Component Win64="$(var.Win64)" Id="cmpB336AC899DE387A813412D5D2C2C6CB8" Guid="*">
|
|
+ <File Id="fil0B31B0E7F00432B0ECED888858212B7E" KeyPath="yes" Source="$(var.SourceDir)/bin/brotli.exe"/>
|
|
+ </Component>
|
|
+ <Component Win64="$(var.Win64)" Id="cmpE91C930EC548A1F8EFBA853B5875B9DD" Guid="*">
|
|
+ <File Id="filD8C79A6706B907C99E9FFC29FF047AF0" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlicommon.dll"/>
|
|
+ </Component>
|
|
+ <Component Win64="$(var.Win64)" Id="cmp283C38D965F9EF7F304458A8495E3B4E" Guid="*">
|
|
+ <File Id="filAA1A09F2669638ABB4B2AACBB3870989" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlidec.dll"/>
|
|
+ </Component>
|
|
+ <Component Win64="$(var.Win64)" Id="cmp91DE05133FEDDE9752F704AB6E5805AD" Guid="*">
|
|
+ <File Id="filC470C4E5C88EDB60935E1B455E71B834" KeyPath="yes" Source="$(var.SourceDir)/bin/libbrotlienc.dll"/>
|
|
+ </Component>
|
|
+ </Directory>
|
|
+ </DirectoryRef>
|
|
+ </Fragment>
|
|
+ <Fragment>
|
|
+ <ComponentGroup Id="CG.brotli">
|
|
+ <ComponentRef Id="cmpB336AC899DE387A813412D5D2C2C6CB8"/>
|
|
+ <ComponentRef Id="cmpE91C930EC548A1F8EFBA853B5875B9DD"/>
|
|
+ <ComponentRef Id="cmp283C38D965F9EF7F304458A8495E3B4E"/>
|
|
+ <ComponentRef Id="cmp91DE05133FEDDE9752F704AB6E5805AD"/>
|
|
+ </ComponentGroup>
|
|
+ </Fragment>
|
|
+</Include>
|
|
+<!-- generated with msitools 0.99 -->
|
|
+<!-- wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.brotli -directory-ref INSTALLDIR -win64 -->
|
|
--
|
|
2.25.3
|
|
|