shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-08-30 13:49:22 +03:00
Code Issues Projects Releases Wiki Activity

msi: drop gtk2 support

Browse Source 
As virt-viewer builds for Windows are using GTK3 nowadays, we can easily
drop GTK2 support and avoid maintenance effort in something that is not
used/tested anymore.
This commit is contained in:
Fabiano Fidêncio
2015-06-23 13:24:55 +02:00
parent 0a7fa73f6c
commit 03c014cb38
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/Makefile.am
View File

@ -69,7 +69,6 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
--directory-ref=INSTALLDIR > virt-viewer-files.wxs && \ --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \
MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \ MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix) \
-D DESTDIR=$$DESTDIR$(prefix) \ -D DESTDIR=$$DESTDIR$(prefix) \
-D GtkVersion=$(GTK_API_VERSION) \
-D HaveSpiceGtk=$(HaveSpiceGtk) \ -D HaveSpiceGtk=$(HaveSpiceGtk) \
-D HaveGtkVnc=$(HaveGtkVnc) \ -D HaveGtkVnc=$(HaveGtkVnc) \
-D HaveLibvirt=$(HaveLibvirt) \ -D HaveLibvirt=$(HaveLibvirt) \

18
data/virt-viewer.wxs.in
View File

@ -16,14 +16,6 @@
<?define Win64 = "no"?> <?define Win64 = "no"?>
<?endif?> <?endif?>
<?if $(var.GtkVersion) = "2.0"?>
<?if $(var.HaveSpiceGtk) = "True"?>
<?require spice-gtk.wxi?>
<?endif?>
<?if $(var.HaveGtkVnc) = "True"?>
<?require gtk-vnc.wxi?>
<?endif?>
<?else?>
<?if $(var.HaveSpiceGtk) = "True"?> <?if $(var.HaveSpiceGtk) = "True"?>
<?require spice-gtk3.wxi?> <?require spice-gtk3.wxi?>
<?endif?> <?endif?>
@ -31,7 +23,6 @@
<?require gtk-vnc2.wxi?> <?require gtk-vnc2.wxi?>
<?endif?> <?endif?>
<?require adwaita-icons-needed.wxi?> <?require adwaita-icons-needed.wxi?>
<?endif?>
<?if $(var.HaveLibvirt) = "True"?> <?if $(var.HaveLibvirt) = "True"?>
<?require libvirt.wxi?> <?require libvirt.wxi?>
<?endif?> <?endif?>
@ -131,14 +122,6 @@
</DirectoryRef> </DirectoryRef>
<Feature Id="Complete" Level="1"> <Feature Id="Complete" Level="1">
<?if $(var.GtkVersion) = "2.0"?>
<?if $(var.HaveSpiceGtk) = "True"?>
<ComponentGroupRef Id="CG.spice-gtk"/>
<?endif?>
<?if $(var.HaveGtkVnc) = "True"?>
<ComponentGroupRef Id="CG.gtk-vnc"/>
<?endif?>
<?else?>
<?if $(var.HaveSpiceGtk) = "True"?> <?if $(var.HaveSpiceGtk) = "True"?>
<ComponentGroupRef Id="CG.spice-gtk3"/> <ComponentGroupRef Id="CG.spice-gtk3"/>
<?endif?> <?endif?>
@ -146,7 +129,6 @@
<ComponentGroupRef Id="CG.gtk-vnc2"/> <ComponentGroupRef Id="CG.gtk-vnc2"/>
<?endif?> <?endif?>
<ComponentGroupRef Id="CG.adwaita-icons-needed"/> <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
<?endif?>
<?if $(var.HaveLibvirt) = "True"?> <?if $(var.HaveLibvirt) = "True"?>
<ComponentGroupRef Id="CG.libvirt"/> <ComponentGroupRef Id="CG.libvirt"/>
<?endif?> <?endif?>