[geany/geany-plugins] 423754: Windows installer: add new dependencies and update cleanup information

[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, 25 Nov 2018 22:11:20 UTC
Commit:      4237549541dd238622fe264fd7f422a0014a45df
             https://github.com/geany/geany-plugins/commit/4237549541dd238622fe264fd7f422a0014a45df

Log Message:
-----------
Windows installer: add new dependencies and update cleanup information

Curl and libsoup depend on libpsl and brotli.


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

Modified: build/geany-plugins.nsi
28 lines changed, 19 insertions(+), 9 deletions(-)
===================================================================
@@ -208,7 +208,11 @@ Section Uninstall
 	Delete "$INSTDIR\bin\gpgme-tool.exe"
 	Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
 	Delete "$INSTDIR\bin\libassuan-0.dll"
+	Delete "$INSTDIR\bin\libbrotlicommon.dll"
+	Delete "$INSTDIR\bin\libbrotlidec.dll"
+	Delete "$INSTDIR\bin\libbrotlienc.dll"
 	Delete "$INSTDIR\bin\libctpl-2.dll"
+	Delete "$INSTDIR\bin\libcrypto-1_1.dll"
 	Delete "$INSTDIR\bin\libcurl-4.dll"
 	Delete "$INSTDIR\bin\libdbus-1-3.dll"
 	Delete "$INSTDIR\bin\libdbus-glib-1-2.dll"
@@ -249,15 +253,15 @@ Section Uninstall
 	Delete "$INSTDIR\bin\libhistory7.dll"
 	Delete "$INSTDIR\bin\libhogweed-4.dll"
 	Delete "$INSTDIR\bin\libhttp_parser-2.dll"
-	Delete "$INSTDIR\bin\libhunspell-1.6-0.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\libhunspell-1.7-0.dll"
+	Delete "$INSTDIR\bin\libicudt62.dll"
+	Delete "$INSTDIR\bin\libicuin62.dll"
+	Delete "$INSTDIR\bin\libicuio62.dll"
+	Delete "$INSTDIR\bin\libicule62.dll"
+	Delete "$INSTDIR\bin\libiculx62.dll"
+	Delete "$INSTDIR\bin\libicutest62.dll"
+	Delete "$INSTDIR\bin\libicutu62.dll"
+	Delete "$INSTDIR\bin\libicuuc62.dll"
 	Delete "$INSTDIR\bin\libidn2-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll"
 	Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll"
@@ -269,12 +273,14 @@ Section Uninstall
 	Delete "$INSTDIR\bin\liborc-0.4-0.dll"
 	Delete "$INSTDIR\bin\liborc-test-0.4-0.dll"
 	Delete "$INSTDIR\bin\libp11-kit-0.dll"
+	Delete "$INSTDIR\bin\libpsl-5.dll"
 	Delete "$INSTDIR\bin\libreadline7.dll"
 	Delete "$INSTDIR\bin\librtmp-1.dll"
 	Delete "$INSTDIR\bin\libsoup-2.4-1.dll"
 	Delete "$INSTDIR\bin\libsoup-gnome-2.4-1.dll"
 	Delete "$INSTDIR\bin\libsqlite3-0.dll"
 	Delete "$INSTDIR\bin\libssh2-1.dll"
+	Delete "$INSTDIR\bin\libssl-1_1.dll"
 	Delete "$INSTDIR\bin\libsystre-0.dll"
 	Delete "$INSTDIR\bin\libtasn1-6.dll"
 	Delete "$INSTDIR\bin\libtermcap-0.dll"
@@ -302,8 +308,10 @@ Section Uninstall
 	Delete "$INSTDIR\bin\lua51.dll"
 	Delete "$INSTDIR\bin\ssleay32.dll"
 
+	RMDir /r "$INSTDIR\etc\pki"
 	RMDir /r "$INSTDIR\lib\enchant-2"
 	RMDir /r "$INSTDIR\lib\engines"
+	RMDir /r "$INSTDIR\lib\engines-1_1"
 	RMDir /r "$INSTDIR\lib\gio"
 	RMDir /r "$INSTDIR\lib\gstreamer-1.0"
 	RMDir /r "$INSTDIR\lib\pkcs11"
@@ -314,6 +322,7 @@ Section Uninstall
 	RMDir /r "$INSTDIR\share\enchant"
 	RMDir /r "$INSTDIR\share\libgpg-error"
 	RMDir /r "$INSTDIR\share\p11-kit"
+	RMDir /r "$INSTDIR\share\pki"
 	RMDir /r "$INSTDIR\share\vala"
 	RMDir /r "$INSTDIR\share\webkitgtk-1.0"
 	RMDir /r "$INSTDIR\share\webkitgtk-3.0"
@@ -332,6 +341,7 @@ Section Uninstall
 
 	; only if empty
 	RMDir "$INSTDIR\bin"
+	RMDir "$INSTDIR\etc"
 	RMDir "$INSTDIR\lib\geany"
 	RMDir "$INSTDIR\lib"
 	RMDir "$INSTDIR\libexec"


Modified: build/gtk-bundle-from-msys2.sh
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -23,6 +23,7 @@ gtkv="3"
 # gtkspell - for GeanyVC plugin
 # the rest is dependency-dependency
 packages="
+brotli
 ctags
 ctpl-git
 curl
@@ -47,6 +48,7 @@ libgpg-error
 libgit2
 libidn2
 libjpeg-turbo
+libpsl
 libogg
 libsoup
 libssh2



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