nsis: Switch installer to use GTK+3mingw

Until now we were packaging the GTK+2 version of virt-viewer.

1 files changed, 23 insertions, 27 deletions

diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index b977c7b..cec1943 100644
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -85,9 +85,7 @@ Section "VirtViewer"
   File "@prefix@/bin/libffi-6.dll"
   File "@prefix@/bin/libfontconfig-1.dll"
   File "@prefix@/bin/libfreetype-6.dll"
-  File "@prefix@/bin/libgdk-win32-2.0-0.dll"
-  File "@prefix@/bin/libgdk-win32-2.0-0.dll"
-  File "@prefix@/bin/libgdk_pixbuf-2.0-0.dll"
+  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"
@@ -103,7 +101,7 @@ Section "VirtViewer"
   File "@prefix@/bin/libgstreamer-0.10-0.dll"
   File "@prefix@/bin/libgstvideo-0.10-0.dll"
   File "@prefix@/bin/libgthread-2.0-0.dll"
-  File "@prefix@/bin/libgtk-win32-2.0-0.dll"
+  File "@prefix@/bin/libgtk-3-0.dll"
   File "@prefix@/bin/iconv.dll"
   File "@prefix@/bin/libintl-8.dll"
   File "@prefix@/bin/libjpeg-62.dll"
@@ -115,14 +113,14 @@ Section "VirtViewer"
   File "@prefix@/bin/libpangowin32-1.0-0.dll"
   File "@prefix@/bin/libpixman-1-0.dll"
   File "@prefix@/bin/libpng15-15.dll"
-  File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
-  File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
+  File "@prefix@/bin/libspice-client-glib-2.0-*.dll"
+  File "@prefix@/bin/libspice-client-gtk-3.0-*.dll"
   File "@prefix@/bin/libspice-controller-0.dll"
   File "@prefix@/bin/libssl-10.dll"
   File "@prefix@/bin/libtasn1-3.dll"
   File "@prefix@/bin/libusb-1.0.dll"
-  File "@prefix@/bin/libusbredirhost-1.dll"
-  File "@prefix@/bin/libusbredirparser-0.dll"
+  File "@prefix@/bin/libusbredirhost-*.dll"
+  File "@prefix@/bin/libusbredirparser-*.dll"
   File "@prefix@/bin/libxml2-2.dll"
   File "@prefix@/bin/libp11-kit-0.dll"
   File "@prefix@/bin/libssh2-1.dll"
@@ -141,26 +139,26 @@ Section "VirtViewer"
   File "@prefix@/bin/libgpg-error-0.dll"
   File "@prefix@/bin/libgcrypt-11.dll"
   File "@prefix@/bin/libgvnc-1.0-0.dll"
-  File "@prefix@/bin/libgtk-vnc-1.0-0.dll"
+  File "@prefix@/bin/libgtk-vnc-2.0-0.dll"
 
   File "@prefix@/bin/pango-querymodules.exe"
   File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe"
   File "${DESTDIR}@prefix@/bin/remote-viewer.exe"
   File "${DESTDIR}@prefix@/bin/virt-viewer.exe"
-  File "@prefix@/bin/readline.dll"
+  File "@prefix@/bin/libreadline6.dll"
   File "@prefix@/bin/zlib1.dll"
 
   SetOutPath "$INSTDIR\etc"
   File /r "@prefix@/etc/fonts"
-  File /r "@prefix@/etc/gtk-2.0"
+  File /r "@prefix@/etc/gtk-3.0"
   File /r "@prefix@/etc/libvirt"
   CreateDirectory "$INSTDIR\etc\pango"
 
-  CreateDirectory "$INSTDIR\etc\gtk-2.0"
+  CreateDirectory "$INSTDIR\etc\gtk-3.0"
 
   SetOutPath "$INSTDIR\lib"
   File /r "@prefix@/lib/gdk-pixbuf-2.0"
-  File /r "@prefix@/lib/gtk-2.0"
+  File /r "@prefix@/lib/gtk-3.0"
   File /r "@prefix@/lib/pango"
 
   SetOutPath "$INSTDIR\lib\gstreamer-0.10"
@@ -185,13 +183,13 @@ Section "VirtViewer"
   SetOutPath "$INSTDIR\share\virt-viewer\ui"
   File "${DESTDIR}@prefix@/share/virt-viewer/ui/*.xml"
 
-  SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-  File "@prefix@/share/themes/MS-Windows/gtk-2.0/gtkrc"
+  #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"
+  SetOutPath "$INSTDIR\etc\gtk-3.0"
   FileOpen $0 gtkrc w
-  FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\n"
-  FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\n"
+  #FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\n"
+  #FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\n"
   FileClose $0
 
   SetOutPath "$INSTDIR\share\icons\hicolor"
@@ -236,7 +234,7 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\share"
 
   RMDir /r "$INSTDIR\lib\pango"
-  RMDir /r "$INSTDIR\lib\gtk-2.0"
+  RMDir /r "$INSTDIR\lib\gtk-3.0"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
@@ -250,7 +248,7 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
 
   RMDir /r "$INSTDIR\etc\pango"
-  RMDir /r "$INSTDIR\etc\gtk-2.0"
+  RMDir /r "$INSTDIR\etc\gtk-3.0"
   RMDir /r "$INSTDIR\etc\fonts"
 
   Delete /rebootok "$INSTDIR\bin\remote-viewer.com"
@@ -262,7 +260,7 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\virt-xml-validate"
   Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\gst-xmllaunch.exe"
   Delete /rebootok "$INSTDIR\bin\gst-xmllaunch-0.10.exe"
   Delete /rebootok "$INSTDIR\bin\gst-xmlinspect.exe"
@@ -282,8 +280,8 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
   Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll"
   Delete /rebootok "$INSTDIR\bin\libssl-10.dll"
-  Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
-  Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
+  Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-1.dll"
+  Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-1.dll"
   Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpng15-15.dll"
   Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"
@@ -302,13 +300,13 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libidn-11.dll"
   Delete /rebootok "$INSTDIR\bin\libssh2-1.dll"
   Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll"
   Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll"
   Delete /rebootok "$INSTDIR\bin\libvirt-qemu-0.dll"
   Delete /rebootok "$INSTDIR\bin\libssp-0.dll"
   Delete /rebootok "$INSTDIR\bin\iconv.dll"
-  Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgstvideo-0.10-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgstreamer-0.10-0.dll"
@@ -325,8 +323,6 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll"
   Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
   Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"