[virt-tools-list] [virt-viewer] [PATCH 15/15 v2] msi: add gtk3 support
Marc-André Lureau
marcandre.lureau at gmail.com
Tue Dec 9 23:59:07 UTC 2014
It's not easy to build atm with f21, because all the dependency are
not available. Since current build is broken anyway on f21 and the
patch series looks good. ACK series
On Tue, Dec 9, 2014 at 11:46 PM, Fabiano Fidêncio <fidencio at redhat.com> wrote:
> Add support to build the virt-viewer's msi using GTK3.
> For the GTK3 build, in order to provide all used icons for Windows
> systems we have to include manually all the icons we want to or add
> adwaita-icon-theme as dependency. I've decided to go with the first
> approach, what can be improved when we have "foreach" support in
> msitools (https://bugzilla.gnome.org/show_bug.cgi?id=741296).
> ---
> configure.ac | 1 +
> data/Makefile.am | 4 +-
> data/adwaita-icons-needed.wxi.in | 807 +++++++++++++++++++++++++++++++++++++++
> data/virt-viewer.wxs.in | 20 +-
> 4 files changed, 827 insertions(+), 5 deletions(-)
> create mode 100644 data/adwaita-icons-needed.wxi.in
>
> diff --git a/configure.ac b/configure.ac
> index d0ae79e..ea49c3b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -243,6 +243,7 @@ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
> AC_CONFIG_FILES([
> Makefile
> data/Makefile
> + data/adwaita-icons-needed.wxi
> data/virt-viewer.wxs
> data/virt-viewer.nsis
> data/virt-viewer-debug.nsis
> diff --git a/data/Makefile.am b/data/Makefile.am
> index 599b683..c80b970 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -4,6 +4,7 @@ MANUFACTURER = Virt Manager Project
>
> EXTRA_DIST = \
> spice-xpi-client-remote-viewer \
> + adwaita-icons-needed.wxi.in \
> virt-viewer.wxs.in \
> virt-viewer.nsis.in \
> virt-viewer-debug.nsis.in \
> @@ -11,7 +12,7 @@ EXTRA_DIST = \
>
> # this make sure those files are regenerated when they change
> # (in maintainer-mode)
> -all-local: virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis
> +all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis
>
> if OS_WIN32
>
> @@ -38,6 +39,7 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
> --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \
> MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
> -D DESTDIR=$$DESTDIR$(prefix) \
> + -D GtkVersion=${GTK_API_VERSION} \
> --arch $(WIXL_ARCH) \
> -o $@ \
> $< virt-viewer-files.wxs && \
> diff --git a/data/adwaita-icons-needed.wxi.in b/data/adwaita-icons-needed.wxi.in
> new file mode 100644
> index 0000000..417a811
> --- /dev/null
> +++ b/data/adwaita-icons-needed.wxi.in
> @@ -0,0 +1,807 @@
> +<?xml version="1.0" encoding="utf-8"?>
> +<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
> + <Fragment>
> + <DirectoryRef Id="INSTALLDIR">
> + <Directory Id="DirShareDefault" Name="share">
> + <Directory Id="DirIconsDefault" Name="icons">
> + <Directory Id="DirIconsAdwaita" Name="Adwaita">
> + <Directory Id="DirIconsAdwaita16x16" Name="16x16">
> + <Directory Id="DirIconsAdwaita16x16Places" Name="places">
> + <Component Id="CIconsFolderDocuments16" Guid="*">
> + <File Id="FIconsFolderDocuments16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload16" Guid="*">
> + <File Id="FIconsFolderDownload16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic16" Guid="*">
> + <File Id="FIconsFolderMusic16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures16" Guid="*">
> + <File Id="FIconsFolderPictures16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare16" Guid="*">
> + <File Id="FIconsFolderPublicshare16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote16" Guid="*">
> + <File Id="FIconsFolderRemote16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch16" Guid="*">
> + <File Id="FIconsFolderSavedSearch16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder16" Guid="*">
> + <File Id="FIconsFolder16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates16" Guid="*">
> + <File Id="FIconsFolderTemplates16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos16" Guid="*">
> + <File Id="FIconsFolderVideos16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer16" Guid="*">
> + <File Id="FIconsNetworkServer16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup16" Guid="*">
> + <File Id="FIconsNetworkWorkgroup16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere16" Guid="*">
> + <File Id="FIconsStartHere16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks16" Guid="*">
> + <File Id="FIconsUserBookmarks16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop16" Guid="*">
> + <File Id="FIconsUserDesktop16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome16" Guid="*">
> + <File Id="FIconsUserHome16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash16" Guid="*">
> + <File Id="FIconsUserTrash16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita16x16Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk16" Guid="*">
> + <File Id="FIconsDriveHardddisk16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical16" Guid="*">
> + <File Id="FIconsDriveOptical16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia16" Guid="*">
> + <File Id="FIconsDriveRemovableMedia16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita16x16Status" Name="status">
> + <Component Id="CIconsCheckbox16" Guid="*">
> + <File Id="FIconsCheckbox16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked16" Guid="*">
> + <File Id="FIconsCheckBoxChecked16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita16x16Actions" Name="actions">
> + <Component Id="CIconsEditClear16" Guid="*">
> + <File Id="FIconsEditClear16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsViewRestore16" Guid="*">
> + <File Id="FIconsViewRestore16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/actions/view-restore.png"/>
> + </Component>
> + <Component Id="CIconsWindowClose16" Guid="*">
> + <File Id="FIconsWindowClose16" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/16x16/actions/window-close.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + <Directory Id="DirIconsAdwaita24x24" Name="24x24">
> + <Directory Id="DirIconsAdwaita24x24Places" Name="places">
> + <Component Id="CIconsFolderDocuments24" Guid="*">
> + <File Id="FIconsFolderDocuments24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload24" Guid="*">
> + <File Id="FIconsFolderDownload24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic24" Guid="*">
> + <File Id="FIconsFolderMusic24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures24" Guid="*">
> + <File Id="FIconsFolderPictures24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare24" Guid="*">
> + <File Id="FIconsFolderPublicshare24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote24" Guid="*">
> + <File Id="FIconsFolderRemote24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch24" Guid="*">
> + <File Id="FIconsFolderSavedSearch24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder24" Guid="*">
> + <File Id="FIconsFolder24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates24" Guid="*">
> + <File Id="FIconsFolderTemplates24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos24" Guid="*">
> + <File Id="FIconsFolderVideos24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer24" Guid="*">
> + <File Id="FIconsNetworkServer24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup24" Guid="*">
> + <File Id="FIconsNetworkWorkgroup24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere24" Guid="*">
> + <File Id="FIconsStartHere24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks24" Guid="*">
> + <File Id="FIconsUserBookmarks24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop24" Guid="*">
> + <File Id="FIconsUserDesktop24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome24" Guid="*">
> + <File Id="FIconsUserHome24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash24" Guid="*">
> + <File Id="FIconsUserTrash24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita24x24Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk24" Guid="*">
> + <File Id="FIconsDriveHardddisk24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical24" Guid="*">
> + <File Id="FIconsDriveOptical24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia24" Guid="*">
> + <File Id="FIconsDriveRemovableMedia24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita24x24Status" Name="status">
> + <Component Id="CIconsCheckbox24" Guid="*">
> + <File Id="FIconsCheckbox24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked24" Guid="*">
> + <File Id="FIconsCheckBoxChecked24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita24x24Actions" Name="actions">
> + <Component Id="CIconsEditClear24" Guid="*">
> + <File Id="FIconsEditClear24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsViewRestore24" Guid="*">
> + <File Id="FIconsViewRestore24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/actions/view-restore.png"/>
> + </Component>
> + <Component Id="CIconsWindowClose24" Guid="*">
> + <File Id="FIconsWindowClose24" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/24x24/actions/window-close.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + <Directory Id="DirIconsAdwaita32x32" Name="32x32">
> + <Directory Id="DirIconsAdwaita32x32Places" Name="places">
> + <Component Id="CIconsFolderDocuments32" Guid="*">
> + <File Id="FIconsFolderDocuments32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload32" Guid="*">
> + <File Id="FIconsFolderDownload32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic32" Guid="*">
> + <File Id="FIconsFolderMusic32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures32" Guid="*">
> + <File Id="FIconsFolderPictures32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare32" Guid="*">
> + <File Id="FIconsFolderPublicshare32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote32" Guid="*">
> + <File Id="FIconsFolderRemote32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch32" Guid="*">
> + <File Id="FIconsFolderSavedSearch32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder32" Guid="*">
> + <File Id="FIconsFolder32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates32" Guid="*">
> + <File Id="FIconsFolderTemplates32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos32" Guid="*">
> + <File Id="FIconsFolderVideos32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer32" Guid="*">
> + <File Id="FIconsNetworkServer32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup32" Guid="*">
> + <File Id="FIconsNetworkWorkgroup32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere32" Guid="*">
> + <File Id="FIconsStartHere32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks32" Guid="*">
> + <File Id="FIconsUserBookmarks32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop32" Guid="*">
> + <File Id="FIconsUserDesktop32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome32" Guid="*">
> + <File Id="FIconsUserHome32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash32" Guid="*">
> + <File Id="FIconsUserTrash32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita32x32Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk32" Guid="*">
> + <File Id="FIconsDriveHardddisk32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical32" Guid="*">
> + <File Id="FIconsDriveOptical32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia32" Guid="*">
> + <File Id="FIconsDriveRemovableMedia32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita32x32Status" Name="status">
> + <Component Id="CIconsCheckbox32" Guid="*">
> + <File Id="FIconsCheckbox32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked32" Guid="*">
> + <File Id="FIconsCheckBoxChecked32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita32x32Actions" Name="actions">
> + <Component Id="CIconsEditClear32" Guid="*">
> + <File Id="FIconsEditClear32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsViewRestore32" Guid="*">
> + <File Id="FIconsViewRestore32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/actions/view-restore.png"/>
> + </Component>
> + <Component Id="CIconsWindowClose32" Guid="*">
> + <File Id="FIconsWindowClose32" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/32x32/actions/window-close.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + <Directory Id="DirIconsAdwaita48x48" Name="48x48">
> + <Directory Id="DirIconsAdwaita48x48Places" Name="places">
> + <Component Id="CIconsFolderDocuments48" Guid="*">
> + <File Id="FIconsFolderDocuments48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload48" Guid="*">
> + <File Id="FIconsFolderDownload48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic48" Guid="*">
> + <File Id="FIconsFolderMusic48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures48" Guid="*">
> + <File Id="FIconsFolderPictures48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare48" Guid="*">
> + <File Id="FIconsFolderPublicshare48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote48" Guid="*">
> + <File Id="FIconsFolderRemote48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch48" Guid="*">
> + <File Id="FIconsFolderSavedSearch48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder48" Guid="*">
> + <File Id="FIconsFolder48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates48" Guid="*">
> + <File Id="FIconsFolderTemplates48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos48" Guid="*">
> + <File Id="FIconsFolderVideos48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer48" Guid="*">
> + <File Id="FIconsNetworkServer48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup48" Guid="*">
> + <File Id="FIconsNetworkWorkgroup48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere48" Guid="*">
> + <File Id="FIconsStartHere48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks48" Guid="*">
> + <File Id="FIconsUserBookmarks48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop48" Guid="*">
> + <File Id="FIconsUserDesktop48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome48" Guid="*">
> + <File Id="FIconsUserHome48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash48" Guid="*">
> + <File Id="FIconsUserTrash48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita48x48Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk48" Guid="*">
> + <File Id="FIconsDriveHardddisk48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical48" Guid="*">
> + <File Id="FIconsDriveOptical48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia48" Guid="*">
> + <File Id="FIconsDriveRemovableMedia48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita48x48Status" Name="status">
> + <Component Id="CIconsCheckbox48" Guid="*">
> + <File Id="FIconsCheckbox48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked48" Guid="*">
> + <File Id="FIconsCheckBoxChecked48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita48x48Actions" Name="actions">
> + <Component Id="CIconsEditClear48" Guid="*">
> + <File Id="FIconsEditClear48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsViewRestore48" Guid="*">
> + <File Id="FIconsViewRestore48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/actions/view-restore.png"/>
> + </Component>
> + <Component Id="CIconsWindowClose48" Guid="*">
> + <File Id="FIconsWindowClose48" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/48x48/actions/window-close.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + <Directory Id="DirIconsAdwaita64x64" Name="64x64">
> + <Directory Id="DirIconsAdwaita64x64Places" Name="places">
> + <Component Id="CIconsFolderDocuments64" Guid="*">
> + <File Id="FIconsFolderDocuments64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload64" Guid="*">
> + <File Id="FIconsFolderDownload64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic64" Guid="*">
> + <File Id="FIconsFolderMusic64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures64" Guid="*">
> + <File Id="FIconsFolderPictures64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare64" Guid="*">
> + <File Id="FIconsFolderPublicshare64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote64" Guid="*">
> + <File Id="FIconsFolderRemote64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch64" Guid="*">
> + <File Id="FIconsFolderSavedSearch64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder64" Guid="*">
> + <File Id="FIconsFolder64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates64" Guid="*">
> + <File Id="FIconsFolderTemplates64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos64" Guid="*">
> + <File Id="FIconsFolderVideos64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer64" Guid="*">
> + <File Id="FIconsNetworkServer64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup64" Guid="*">
> + <File Id="FIconsNetworkWorkgroup64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere64" Guid="*">
> + <File Id="FIconsStartHere64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks64" Guid="*">
> + <File Id="FIconsUserBookmarks64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop64" Guid="*">
> + <File Id="FIconsUserDesktop64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome64" Guid="*">
> + <File Id="FIconsUserHome64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash64" Guid="*">
> + <File Id="FIconsUserTrash64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita64x64Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk64" Guid="*">
> + <File Id="FIconsDriveHardddisk64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical64" Guid="*">
> + <File Id="FIconsDriveOptical64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia64" Guid="*">
> + <File Id="FIconsDriveRemovableMedia64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita64x64Status" Name="status">
> + <Component Id="CIconsCheckbox64" Guid="*">
> + <File Id="FIconsCheckbox64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked64" Guid="*">
> + <File Id="FIconsCheckBoxChecked64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita64x64Actions" Name="actions">
> + <Component Id="CIconsEditClear64" Guid="*">
> + <File Id="FIconsEditClear64" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/64x64/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + <Directory Id="DirIconsAdwaita96x96" Name="96x96">
> + <Directory Id="DirIconsAdwaita96x96Places" Name="places">
> + <Component Id="CIconsFolderDocuments96" Guid="*">
> + <File Id="FIconsFolderDocuments96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-documents-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderDownload96" Guid="*">
> + <File Id="FIconsFolderDownload96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-download-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderMusic96" Guid="*">
> + <File Id="FIconsFolderMusic96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-music-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPictures96" Guid="*">
> + <File Id="FIconsFolderPictures96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-pictures-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderPublicshare96" Guid="*">
> + <File Id="FIconsFolderPublicshare96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-publicshare-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderRemote96" Guid="*">
> + <File Id="FIconsFolderRemote96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-remote-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderSavedSearch96" Guid="*">
> + <File Id="FIconsFolderSavedSearch96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-saved-search-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolder96" Guid="*">
> + <File Id="FIconsFolder96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderTemplates96" Guid="*">
> + <File Id="FIconsFolderTemplates96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-templates-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsFolderVideos96" Guid="*">
> + <File Id="FIconsFolderVideos96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/folder-videos-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkServer96" Guid="*">
> + <File Id="FIconsNetworkServer96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/network-server-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsNetworkWorkgroup96" Guid="*">
> + <File Id="FIconsNetworkWorkgroup96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/network-workgroup-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsStartHere96" Guid="*">
> + <File Id="FIconsStartHere96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/start-here-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserBookmarks96" Guid="*">
> + <File Id="FIconsUserBookmarks96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/user-bookmarks-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserDesktop96" Guid="*">
> + <File Id="FIconsUserDesktop96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/user-desktop-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserHome96" Guid="*">
> + <File Id="FIconsUserHome96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/user-home-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsUserTrash96" Guid="*">
> + <File Id="FIconsUserTrash96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/places/user-trash-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita96x96Devices" Name="devices">
> + <Component Id="CIconsDriveHarddisk96" Guid="*">
> + <File Id="FIconsDriveHardddisk96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/devices/drive-harddisk-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveOptical96" Guid="*">
> + <File Id="FIconsDriveOptical96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/devices/drive-optical-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsDriveRemovableMedia96" Guid="*">
> + <File Id="FIconsDriveRemovableMedia96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/devices/drive-removable-media-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita96x96Status" Name="status">
> + <Component Id="CIconsCheckbox96" Guid="*">
> + <File Id="FIconsCheckbox96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/status/checkbox-symbolic.symbolic.png"/>
> + </Component>
> + <Component Id="CIconsCheckboxChecked96" Guid="*">
> + <File Id="FIconsCheckBoxChecked96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/status/checkbox-checked-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + <Directory Id="DirIconsAdwaita96x96Actions" Name="actions">
> + <Component Id="CIconsEditClear96" Guid="*">
> + <File Id="FIconsEditClear96" KeyPath="yes"
> + Source="/usr/share/icons/Adwaita/96x96/actions/edit-clear-symbolic.symbolic.png"/>
> + </Component>
> + </Directory>
> + </Directory>
> + </Directory>
> + </Directory>
> + </Directory>
> + </DirectoryRef>
> + </Fragment>
> + <Fragment>
> + <ComponentGroup Id="CG.adwaita-icons-needed">
> + <ComponentRef Id="CIconsFolderDocuments16"/>
> + <ComponentRef Id="CIconsFolderDownload16"/>
> + <ComponentRef Id="CIconsFolderMusic16"/>
> + <ComponentRef Id="CIconsFolderPictures16"/>
> + <ComponentRef Id="CIconsFolderPublicshare16"/>
> + <ComponentRef Id="CIconsFolderRemote16"/>
> + <ComponentRef Id="CIconsFolderSavedSearch16"/>
> + <ComponentRef Id="CIconsFolder16"/>
> + <ComponentRef Id="CIconsFolderTemplates16"/>
> + <ComponentRef Id="CIconsFolderVideos16"/>
> + <ComponentRef Id="CIconsNetworkServer16"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup16"/>
> + <ComponentRef Id="CIconsStartHere16"/>
> + <ComponentRef Id="CIconsUserBookmarks16"/>
> + <ComponentRef Id="CIconsUserDesktop16"/>
> + <ComponentRef Id="CIconsUserHome16"/>
> + <ComponentRef Id="CIconsUserTrash16"/>
> + <ComponentRef Id="CIconsDriveHarddisk16"/>
> + <ComponentRef Id="CIconsDriveOptical16"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia16"/>
> + <ComponentRef Id="CIconsCheckbox16"/>
> + <ComponentRef Id="CIconsCheckboxChecked16"/>
> + <ComponentRef Id="CIconsEditClear16"/>
> + <ComponentRef Id="CIconsViewRestore16"/>
> + <ComponentRef Id="CIconsWindowClose16"/>
> + <ComponentRef Id="CIconsFolderDocuments24"/>
> + <ComponentRef Id="CIconsFolderDownload24"/>
> + <ComponentRef Id="CIconsFolderMusic24"/>
> + <ComponentRef Id="CIconsFolderPictures24"/>
> + <ComponentRef Id="CIconsFolderPublicshare24"/>
> + <ComponentRef Id="CIconsFolderRemote24"/>
> + <ComponentRef Id="CIconsFolderSavedSearch24"/>
> + <ComponentRef Id="CIconsFolder24"/>
> + <ComponentRef Id="CIconsFolderTemplates24"/>
> + <ComponentRef Id="CIconsFolderVideos24"/>
> + <ComponentRef Id="CIconsNetworkServer24"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup24"/>
> + <ComponentRef Id="CIconsStartHere24"/>
> + <ComponentRef Id="CIconsUserBookmarks24"/>
> + <ComponentRef Id="CIconsUserDesktop24"/>
> + <ComponentRef Id="CIconsUserHome24"/>
> + <ComponentRef Id="CIconsUserTrash24"/>
> + <ComponentRef Id="CIconsDriveHarddisk24"/>
> + <ComponentRef Id="CIconsDriveOptical24"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia24"/>
> + <ComponentRef Id="CIconsCheckbox24"/>
> + <ComponentRef Id="CIconsCheckboxChecked24"/>
> + <ComponentRef Id="CIconsEditClear24"/>
> + <ComponentRef Id="CIconsViewRestore24"/>
> + <ComponentRef Id="CIconsWindowClose24"/>
> + <ComponentRef Id="CIconsFolderDocuments32"/>
> + <ComponentRef Id="CIconsFolderDownload32"/>
> + <ComponentRef Id="CIconsFolderMusic32"/>
> + <ComponentRef Id="CIconsFolderPictures32"/>
> + <ComponentRef Id="CIconsFolderPublicshare32"/>
> + <ComponentRef Id="CIconsFolderRemote32"/>
> + <ComponentRef Id="CIconsFolderSavedSearch32"/>
> + <ComponentRef Id="CIconsFolder32"/>
> + <ComponentRef Id="CIconsFolderTemplates32"/>
> + <ComponentRef Id="CIconsFolderVideos32"/>
> + <ComponentRef Id="CIconsNetworkServer32"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup32"/>
> + <ComponentRef Id="CIconsStartHere32"/>
> + <ComponentRef Id="CIconsUserBookmarks32"/>
> + <ComponentRef Id="CIconsUserDesktop32"/>
> + <ComponentRef Id="CIconsUserHome32"/>
> + <ComponentRef Id="CIconsUserTrash32"/>
> + <ComponentRef Id="CIconsDriveHarddisk32"/>
> + <ComponentRef Id="CIconsDriveOptical32"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia32"/>
> + <ComponentRef Id="CIconsCheckbox32"/>
> + <ComponentRef Id="CIconsCheckboxChecked32"/>
> + <ComponentRef Id="CIconsEditClear32"/>
> + <ComponentRef Id="CIconsViewRestore32"/>
> + <ComponentRef Id="CIconsWindowClose32"/>
> + <ComponentRef Id="CIconsFolderDocuments48"/>
> + <ComponentRef Id="CIconsFolderDownload48"/>
> + <ComponentRef Id="CIconsFolderMusic48"/>
> + <ComponentRef Id="CIconsFolderPictures48"/>
> + <ComponentRef Id="CIconsFolderPublicshare48"/>
> + <ComponentRef Id="CIconsFolderRemote48"/>
> + <ComponentRef Id="CIconsFolderSavedSearch48"/>
> + <ComponentRef Id="CIconsFolder48"/>
> + <ComponentRef Id="CIconsFolderTemplates48"/>
> + <ComponentRef Id="CIconsFolderVideos48"/>
> + <ComponentRef Id="CIconsNetworkServer48"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup48"/>
> + <ComponentRef Id="CIconsStartHere48"/>
> + <ComponentRef Id="CIconsUserBookmarks48"/>
> + <ComponentRef Id="CIconsUserDesktop48"/>
> + <ComponentRef Id="CIconsUserHome48"/>
> + <ComponentRef Id="CIconsUserTrash48"/>
> + <ComponentRef Id="CIconsDriveHarddisk48"/>
> + <ComponentRef Id="CIconsDriveOptical48"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia48"/>
> + <ComponentRef Id="CIconsCheckbox48"/>
> + <ComponentRef Id="CIconsCheckboxChecked48"/>
> + <ComponentRef Id="CIconsEditClear48"/>
> + <ComponentRef Id="CIconsViewRestore48"/>
> + <ComponentRef Id="CIconsWindowClose48"/>
> + <ComponentRef Id="CIconsFolderDocuments64"/>
> + <ComponentRef Id="CIconsFolderDownload64"/>
> + <ComponentRef Id="CIconsFolderMusic64"/>
> + <ComponentRef Id="CIconsFolderPictures64"/>
> + <ComponentRef Id="CIconsFolderPublicshare64"/>
> + <ComponentRef Id="CIconsFolderRemote64"/>
> + <ComponentRef Id="CIconsFolderSavedSearch64"/>
> + <ComponentRef Id="CIconsFolder64"/>
> + <ComponentRef Id="CIconsFolderTemplates64"/>
> + <ComponentRef Id="CIconsFolderVideos64"/>
> + <ComponentRef Id="CIconsNetworkServer64"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup64"/>
> + <ComponentRef Id="CIconsStartHere64"/>
> + <ComponentRef Id="CIconsUserBookmarks64"/>
> + <ComponentRef Id="CIconsUserDesktop64"/>
> + <ComponentRef Id="CIconsUserHome64"/>
> + <ComponentRef Id="CIconsUserTrash64"/>
> + <ComponentRef Id="CIconsDriveHarddisk64"/>
> + <ComponentRef Id="CIconsDriveOptical64"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia64"/>
> + <ComponentRef Id="CIconsCheckbox64"/>
> + <ComponentRef Id="CIconsCheckboxChecked64"/>
> + <ComponentRef Id="CIconsEditClear64"/>
> + <ComponentRef Id="CIconsFolderDocuments96"/>
> + <ComponentRef Id="CIconsFolderDownload96"/>
> + <ComponentRef Id="CIconsFolderMusic96"/>
> + <ComponentRef Id="CIconsFolderPictures96"/>
> + <ComponentRef Id="CIconsFolderPublicshare96"/>
> + <ComponentRef Id="CIconsFolderRemote96"/>
> + <ComponentRef Id="CIconsFolderSavedSearch96"/>
> + <ComponentRef Id="CIconsFolder96"/>
> + <ComponentRef Id="CIconsFolderTemplates96"/>
> + <ComponentRef Id="CIconsFolderVideos96"/>
> + <ComponentRef Id="CIconsNetworkServer96"/>
> + <ComponentRef Id="CIconsNetworkWorkgroup96"/>
> + <ComponentRef Id="CIconsStartHere96"/>
> + <ComponentRef Id="CIconsUserBookmarks96"/>
> + <ComponentRef Id="CIconsUserDesktop96"/>
> + <ComponentRef Id="CIconsUserHome96"/>
> + <ComponentRef Id="CIconsUserTrash96"/>
> + <ComponentRef Id="CIconsDriveHarddisk96"/>
> + <ComponentRef Id="CIconsDriveOptical96"/>
> + <ComponentRef Id="CIconsDriveRemovableMedia96"/>
> + <ComponentRef Id="CIconsCheckbox96"/>
> + <ComponentRef Id="CIconsCheckboxChecked96"/>
> + <ComponentRef Id="CIconsEditClear96"/>
> + </ComponentGroup>
> + </Fragment>
> +</Include>
> diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
> index 06fcd5b..6d9761d 100644
> --- a/data/virt-viewer.wxs.in
> +++ b/data/virt-viewer.wxs.in
> @@ -16,8 +16,14 @@
> <?define Win64 = "no"?>
> <?endif?>
>
> - <?require spice-gtk.wxi?>
> - <?require gtk-vnc.wxi?>
> + <?if $(var.GtkVersion) = "2.0"?>
> + <?require spice-gtk.wxi?>
> + <?require gtk-vnc.wxi?>
> + <?else?>
> + <?require spice-gtk3.wxi?>
> + <?require gtk-vnc2.wxi?>
> + <?require adwaita-icons-needed.wxi?>
> + <?endif?>
> <?require libvirt.wxi?>
> <?require libgovirt.wxi?>
>
> @@ -113,10 +119,16 @@
> </DirectoryRef>
>
> <Feature Id="Complete" Level="1">
> - <ComponentGroupRef Id="CG.spice-gtk"/>
> + <?if $(var.GtkVersion) = "2.0"?>
> + <ComponentGroupRef Id="CG.spice-gtk"/>
> + <ComponentGroupRef Id="CG.gtk-vnc"/>
> + <?else?>
> + <ComponentGroupRef Id="CG.spice-gtk3"/>
> + <ComponentGroupRef Id="CG.gtk-vnc2"/>
> + <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
> + <?endif?>
> <ComponentGroupRef Id="CG.libvirt"/>
> <ComponentGroupRef Id="CG.libgovirt"/>
> - <ComponentGroupRef Id="CG.gtk-vnc"/>
> <ComponentGroupRef Id="CG.virt-viewer"/>
> <ComponentRef Id="CDepsFile"/>
> <ComponentRef Id="CShortcut"/>
> --
> 2.1.0
>
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
--
Marc-André Lureau
More information about the virt-tools-list
mailing list