[gitg] Update windows installer

[Alberto Fanjul <albfan src gnome org>]

commit 7c6427395289f57c50cec595c0c12d9971a02ac4
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Wed Dec 29 21:38:14 2021 +0100

    Update windows installer

 gitg/resources/pixmaps/gitg.ico | Bin 293950 -> 4286 bytes
 win32/.gitignore                |   1 +
 win32/make-installer            |   9 +++------
 win32/make-installer-all        |   3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gitg/resources/pixmaps/gitg.ico b/gitg/resources/pixmaps/gitg.ico
index 9ef7d234..1e9d8a76 100644
Binary files a/gitg/resources/pixmaps/gitg.ico and b/gitg/resources/pixmaps/gitg.ico differ
diff --git a/win32/.gitignore b/win32/.gitignore
new file mode 100644
index 00000000..feb64edb
--- /dev/null
+++ b/win32/.gitignore
@@ -0,0 +1 @@
+installer/
diff --git a/win32/make-installer b/win32/make-installer
index 381a2e37..48f97715 100644
--- a/win32/make-installer
+++ b/win32/make-installer
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-_wixdir="/c/Program Files (x86)/WiX Toolset v3.8"
+_wixdir="/c/Program Files (x86)/WiX Toolset v3.11"
 _thisdir="$(dirname $0)"
 test "${_thisdir}" = "." && _thisdir=${PWD}
 _installer_root="${_thisdir}"/installer
@@ -95,7 +95,7 @@ remove_useless_stuff() {
   rm -rf installer/SourceDir/share/doc
   # remove on the lib folder
   rm -rf installer/SourceDir/lib/terminfo
-  rm -rf installer/SourceDir/lib/python2*
+  rm -rf installer/SourceDir/lib/python*
   rm -rf installer/SourceDir/lib/pkgconfig
   rm -rf installer/SourceDir/lib/peas-demo
 
@@ -109,6 +109,7 @@ remove_useless_stuff() {
 }
 
 setup_source_dir() {
+  [ -d "installer/SourceDir" ] && rm -rf "installer/SourceDir"
   cp -R "${_newgitg}/mingw${_bitness}" "installer/SourceDir"
   remove_useless_stuff
 }
@@ -155,10 +156,6 @@ install_gitg_packages() {
   if [ "$_result" -ne "0" ]; then
     exit_cleanly "1" "failed to create ${_newgitg} via command 'pacman -S gitg --noconfirm --root 
${_newgitg}'"
   fi
-
-  # some packages are pulled by the deps but we do not need them like python2
-  pacman -Rdd mingw-w64-${_arch}-python2 --noconfirm --root "${_newgitg}"
-  pacman -Rdd mingw-w64-${_arch}-gtk2 --noconfirm --root "${_newgitg}"
 }
 
 if [ "${_stage}" = "stage1" ]; then
diff --git a/win32/make-installer-all b/win32/make-installer-all
new file mode 100644
index 00000000..14257433
--- /dev/null
+++ b/win32/make-installer-all
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./make-installer stage1 && ./make-installer stage2