As virt-viewer builds for Windows are using GTK3 nowdays, we can easily
drop support to GTK2 and avoid maintenance effort in something that is
not used/tested anymore.
---
data/Makefile.am | 1 -
data/virt-viewer.nsis.in | 99 ++++++++----------------------------------------
2 files changed, 16 insertions(+), 84 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 510169b..29c565e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -48,7 +48,6 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
makensis -NOCD \
-DDESTDIR=$$DESTDIR \
- -DGTK_VERSION=$(GTK_API_VERSION) \
-DHaveSpiceGtk=$(HaveSpiceGtk) \
-DHaveGtkVnc=$(HaveGtkVnc) \
-DHaveLibvirt=$(HaveLibvirt) \
diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index ca96fbf..0373219 100755
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -91,40 +91,26 @@ Section "VirtViewer"
File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
File "@prefix@/bin/libspice-controller-0.dll"
- !if ${GTK_VERSION} == 2.0
- File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
- !else
- File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
- !endif
+ File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
!endif
File "@prefix@/bin/libatk-1.0-0.dll"
File "@prefix@/bin/libcairo-2.dll"
- !if ${GTK_VERSION} == 3.0
- File "@prefix@/bin/libcairo-gobject-2.dll"
- File "@prefix@/bin/libepoxy-0.dll"
- !endif
+ File "@prefix@/bin/libcairo-gobject-2.dll"
+ File "@prefix@/bin/libepoxy-0.dll"
File "@prefix@/bin/libcrypto-10.dll"
File "@prefix@/bin/libexpat-1.dll"
File "@prefix@/bin/libffi-6.dll"
File "@prefix@/bin/libfontconfig-1.dll"
File "@prefix@/bin/libfreetype-6.dll"
- !if ${GTK_VERSION} == 2.0
- File "@prefix@/bin/libgdk-win32-2.0-0.dll"
- !else
- File "@prefix@/bin/libgdk-3-0.dll"
- !endif
+ File "@prefix@/bin/libgdk-3-0.dll"
File "@prefix@/bin/libgdk_pixbuf-2.0-0.dll"
File "@prefix@/bin/libgio-2.0-0.dll"
File "@prefix@/bin/libglib-2.0-0.dll"
File "@prefix@/bin/libgmodule-2.0-0.dll"
File "@prefix@/bin/libgobject-2.0-0.dll"
File "@prefix@/bin/libgthread-2.0-0.dll"
- !if ${GTK_VERSION} == 2.0
- File "@prefix@/bin/libgtk-win32-2.0-0.dll"
- !else
- File "@prefix@/bin/libgtk-3-0.dll"
- !endif
+ File "@prefix@/bin/libgtk-3-0.dll"
File "@prefix@/bin/iconv.dll"
File "@prefix@/bin/libintl-8.dll"
File "@prefix@/bin/libjpeg-62.dll"
@@ -158,11 +144,7 @@ Section "VirtViewer"
File "@prefix@/bin/libgpg-error-0.dll"
File "@prefix@/bin/libgcrypt-20.dll"
File "@prefix@/bin/libgvnc-1.0-0.dll"
- !if ${GTK_VERSION} == 2.0
- File "@prefix@/bin/libgtk-vnc-1.0-0.dll"
- !else
- File "@prefix@/bin/libgtk-vnc-2.0-0.dll"
- !endif
+ File "@prefix@/bin/libgtk-vnc-2.0-0.dll"
!endif
File "@prefix@/bin/libgnutls-28.dll"
@@ -193,27 +175,15 @@ Section "VirtViewer"
SetOutPath "$INSTDIR\etc"
File /r "@prefix@/etc/fonts"
- !if ${GTK_VERSION} == 2.0
- File /r "@prefix@/etc/gtk-2.0"
- !else
- File /r "@prefix@/etc/gtk-3.0"
- !endif
+ File /r "@prefix@/etc/gtk-3.0"
File /r "@prefix@/etc/libvirt"
CreateDirectory "$INSTDIR\etc\pango"
- !if ${GTK_VERSION} == 2.0
- CreateDirectory "$INSTDIR\etc\gtk-2.0"
- !else
- CreateDirectory "$INSTDIR\etc\gtk-3.0"
- !endif
+ CreateDirectory "$INSTDIR\etc\gtk-3.0"
SetOutPath "$INSTDIR\lib"
File /r "@prefix@/lib/gdk-pixbuf-2.0"
- !if ${GTK_VERSION} == 2.0
- File /r "@prefix@/lib/gtk-2.0"
- !else
- File /r "@prefix@/lib/gtk-3.0"
- !endif
+ File /r "@prefix@/lib/gtk-3.0"
File /r "@prefix@/lib/pango"
!if ${HaveSpiceGtk} == True
@@ -241,9 +211,7 @@ Section "VirtViewer"
!if ${HaveLibvirt} == True
File /r "@prefix@/share/libvirt"
!endif
- !if ${GTK_VERSION} == 3.0
- File /r "@prefix@/share/glib-2.0"
- !endif
+ File /r "@prefix@/share/glib-2.0"
# fixme for all languages
SetOutPath "$INSTDIR\share\locale\fr"
@@ -256,17 +224,6 @@ Section "VirtViewer"
SetOutPath "$INSTDIR\share\virt-viewer\ui"
File "${DESTDIR}@prefix@/share/virt-viewer/ui/*.xml"
- !if ${GTK_VERSION} == 2.0
- SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
- File "@prefix@/share/themes/MS-Windows/gtk-2.0/gtkrc"
-
- SetOutPath "$INSTDIR\etc\gtk-2.0"
- FileOpen $0 gtkrc w
- FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\n"
- FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\n"
- FileClose $0
- !endif
-
SetOutPath "$INSTDIR\share\icons\hicolor"
File "/usr/share/icons/hicolor/index.theme"
@@ -509,11 +466,7 @@ Section "Uninstall"
RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\lib\pango"
- !if ${GTK_VERSION} == 2.0
- RMDir /r "$INSTDIR\lib\gtk-2.0"
- !else
- RMDir /r "$INSTDIR\lib\gtk-3.0"
- !endif
+ RMDir /r "$INSTDIR\lib\gtk-3.0"
!if ${HaveSpiceGtk} == True
# gstreamer1
@@ -533,11 +486,7 @@ Section "Uninstall"
RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
RMDir /r "$INSTDIR\etc\pango"
- !if ${GTK_VERSION} == 2.0
- RMDir /r "$INSTDIR\etc\gtk-2.0"
- !else
- RMDir /r "$INSTDIR\etc\gtk-3.0"
- !endif
+ RMDir /r "$INSTDIR\etc\gtk-3.0"
RMDir /r "$INSTDIR\etc\fonts"
!if {HaveLibvirt} == True
RMDir /r "$INSTDIR\etc\libvirt"
@@ -548,11 +497,7 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
- !if ${GTK_VERSION} == 2.0
- Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
- !else
- Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
- !endif
+ Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
!if ${HaveSpiceGtk} == True
# gstreamer1
Delete /rebootok "$INSTDIR\bin\gst-inspect-1.0.exe"
@@ -579,11 +524,7 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
- !if ${GTK_VERSION} == 2.0
- Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
- !else
- Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
- !endif
+ Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
!endif
Delete /rebootok "$INSTDIR\bin\zlib1.dll"
Delete /rebootok "$INSTDIR\bin\libreadline6.dll"
@@ -622,19 +563,11 @@ Section "Uninstall"
Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll"
Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll"
Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll"
- !if ${GTK_VERSION} == 2.0
- Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll"
- !else
- Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll"
- !endif
+ Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll"
!endif
Delete /rebootok "$INSTDIR\bin\libssp-0.dll"
Delete /rebootok "$INSTDIR\bin\iconv.dll"
- !if ${GTK_VERSION} == 2.0
- Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
- !else
- Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
- !endif
+ Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
Delete /rebootok "$INSTDIR\bin\libgnutls-28.dll"
--
2.4.4
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
