[geany/geany-plugins] e17b6e: Windows Installer: Update removal list of unnecessary/uninstall files

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 19 Aug 2018 21:45:17 UTC
Commit:      e17b6ef25197983fef6ddde3e4df7deac9efb81a
             https://github.com/geany/geany-plugins/commit/e17b6ef25197983fef6ddde3e4df7deac9efb81a

Log Message:
-----------
Windows Installer: Update removal list of unnecessary/uninstall files


Modified Paths:
--------------
    build/geany-plugins.nsi
    build/gtk-bundle-from-msys2.sh

Modified: build/geany-plugins.nsi
27 lines changed, 15 insertions(+), 12 deletions(-)
===================================================================
@@ -38,7 +38,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins"
 !define GEANY_DIR_REGKEY "Software\Geany"
-!define REQUIRED_GEANY_VERSION "1.33.0"
+!define REQUIRED_GEANY_VERSION "1.34.0"
 !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}"
 
 ;;;;;;;;;;;;;;;;;;;;;
@@ -213,7 +213,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libdbus-1-3.dll"
 	Delete "$INSTDIR\bin\libdbus-glib-1-2.dll"
 	Delete "$INSTDIR\bin\libeay32.dll"
-	Delete "$INSTDIR\bin\libenchant.dll"
+	Delete "$INSTDIR\bin\libenchant-2.dll"
 	Delete "$INSTDIR\bin\libexslt-0.dll"
 	Delete "$INSTDIR\bin\libgcrypt-20.dll"
 	Delete "$INSTDIR\bin\libgeoclue-0.dll"
@@ -234,6 +234,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libgstcheck-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgstcontroller-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgstfft-1.0-0.dll"
+	Delete "$INSTDIR\bin\libgstgl-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgstnet-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgstpbutils-1.0-0.dll"
 	Delete "$INSTDIR\bin\libgstreamer-1.0-0.dll"
@@ -249,14 +250,14 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libhogweed-4.dll"
 	Delete "$INSTDIR\bin\libhttp_parser-2.dll"
 	Delete "$INSTDIR\bin\libhunspell-1.6-0.dll"
-	Delete "$INSTDIR\bin\libicudt58.dll"
-	Delete "$INSTDIR\bin\libicuin58.dll"
-	Delete "$INSTDIR\bin\libicuio58.dll"
-	Delete "$INSTDIR\bin\libicule58.dll"
-	Delete "$INSTDIR\bin\libiculx58.dll"
-	Delete "$INSTDIR\bin\libicutest58.dll"
-	Delete "$INSTDIR\bin\libicutu58.dll"
-	Delete "$INSTDIR\bin\libicuuc58.dll"
+	Delete "$INSTDIR\bin\libicudt61.dll"
+	Delete "$INSTDIR\bin\libicuin61.dll"
+	Delete "$INSTDIR\bin\libicuio61.dll"
+	Delete "$INSTDIR\bin\libicule61.dll"
+	Delete "$INSTDIR\bin\libiculx61.dll"
+	Delete "$INSTDIR\bin\libicutest61.dll"
+	Delete "$INSTDIR\bin\libicutu61.dll"
+	Delete "$INSTDIR\bin\libicuuc61.dll"
 	Delete "$INSTDIR\bin\libidn2-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll"
@@ -283,7 +284,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libtiff-5.dll"
 	Delete "$INSTDIR\bin\libtiffxx-5.dll"
 	Delete "$INSTDIR\bin\libtre-5.dll"
-	Delete "$INSTDIR\bin\libturbojpeg-0.dll"
+	Delete "$INSTDIR\bin\libturbojpeg.dll"
 	Delete "$INSTDIR\bin\libunistring-2.dll"
 	Delete "$INSTDIR\bin\libvorbis-0.dll"
 	Delete "$INSTDIR\bin\libvorbisenc-2.dll"
@@ -301,7 +302,7 @@ Section Uninstall
 	Delete "$INSTDIR\bin\lua51.dll"
 	Delete "$INSTDIR\bin\ssleay32.dll"
 
-	RMDir /r "$INSTDIR\lib\enchant"
+	RMDir /r "$INSTDIR\lib\enchant-2"
 	RMDir /r "$INSTDIR\lib\engines"
 	RMDir /r "$INSTDIR\lib\gio"
 	RMDir /r "$INSTDIR\lib\gstreamer-1.0"
@@ -316,6 +317,7 @@ Section Uninstall
 	RMDir /r "$INSTDIR\share\vala"
 	RMDir /r "$INSTDIR\share\webkitgtk-1.0"
 	RMDir /r "$INSTDIR\share\webkitgtk-3.0"
+	RMDir /r "$INSTDIR\share\xml\dbus-1"
 
 	FindFirst $0 $1 "$INSTDIR\share\locale\*"
 	loop:
@@ -347,6 +349,7 @@ Section Uninstall
 	RMDir "$INSTDIR\share\icons\hicolor"
 	RMDir "$INSTDIR\share\icons"
 	RMDir "$INSTDIR\share\locale"
+	RMDir "$INSTDIR\share\xml"
 	RMDir "$INSTDIR\share"
 	RMDir "$INSTDIR"
 


Modified: build/gtk-bundle-from-msys2.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -217,7 +217,7 @@ cleanup_unnecessary_files() {
 	rm -rf lib/lua
 	rm -rf lib/p11-kit
 	rm -rf lib/python2.7
-	rm -rf lib/python3.6
+	rm -rf lib/python3.7
 	find lib -name '*.h' -delete
 	find lib -name '*.a' -delete
 	find lib -name '*.typelib' -delete



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).