From 8d90bf949b713a33d76e2d7259d07d14e82d1a0e Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Wed, 22 Jun 2016 01:03:17 +0100
Subject: [PATCH] [WINDOWS] Extra files needed for theming to work

---
 win32/installer-mingw.sh             | 6 ++++++
 win32/installer/viking-installer.nsi | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/win32/installer-mingw.sh b/win32/installer-mingw.sh
index 8ed3e558..5931af45 100755
--- a/win32/installer-mingw.sh
+++ b/win32/installer-mingw.sh
@@ -127,6 +127,12 @@ cp $MINGW/share/misc/magic* $DESTINATION
 cp $MINGW_BIN/libsqlite3*.dll $DESTINATION
 cp $MINGW_BIN/libnettle*.dll $DESTINATION
 
+# Extra GTK stuff required for (default) theme to work in Windows
+mkdir -p $DESTINATION/lib
+cp -a $MINGW/lib/gtk-2.0 $DESTINATION/lib
+mkdir -p $DESTINATION/share/themes
+cp -a $MINGW/share/themes/MS-Windows $DESTINATION/share/themes
+
 echo Copying GPSBabel Installer
 mkdir $DESTINATION/Optional
 # ATM GPSBabel needs to be in 'cache' dir
diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 94d01eba..771b0d3a 100644
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -269,6 +269,8 @@ Section $(VIKING_SECTION_TITLE) SecViking
     File ${BINARIES}\magic.mgc
     File /r ${BINARIES}\data
     File /r ${BINARIES}\locale
+    File /r ${BINARIES}\share
+    File /r ${BINARIES}\lib
 
     ; Estimate install size based on files in $INSTDIR
     ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
@@ -377,6 +379,8 @@ Section Uninstall
     Delete "$INSTDIR\data\*xml"
     RMDir "$INSTDIR\data"
     RMDir /r "$INSTDIR\locale"
+    RMDir /r "$INSTDIR\lib"
+    RMDir /r "$INSTDIR\share"
     RMDir "$INSTDIR"
 
     ; Shortcuts..
-- 
2.39.5