[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.3-9-g6d6b9bb

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  6d6b9bb9a88877cdf534fb0a555dd90703fbf0f6 (commit)
      from  415184071dec425e7cd07b4580bd2434a5f48ade (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6d6b9bb9a88877cdf534fb0a555dd90703fbf0f6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 28 12:01:58 2018 +0100

    Fix install problems after update
    
    * src/inst-qtbase.nsi, src/uninst-qtbase.nsi: Vista style is
    now a plugin.
    * src/makeportable-full.h: Update.

diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index c6e2268..17484d1 100644
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -55,5 +55,8 @@ Section "-qtbase" SEC_qtbase
   SetOutPath "$INSTDIR\bin\printsupport"
   File ${prefix}/plugins/printsupport/windowsprintersupport.dll
 
+  SetOutPath "$INSTDIR\bin\styles"
+  File ${prefix}/plugins/styles/qwindowsvistastyle.dll
+
 !endif
 SectionEnd
diff --git a/src/mkportable-full.h b/src/mkportable-full.h
index 347c95a..4484cff 100644
--- a/src/mkportable-full.h
+++ b/src/mkportable-full.h
@@ -134,6 +134,7 @@ const char * const full_files[] =
   "bin/libwinpthread-1.dll",
   "bin/libKF5Mime.dll",
   "bin/platforms/qwindows.dll",
+  "bin/styles/qwindowsvistastyle.dll",
   "bin/gspawn-win32-helper-console.exe",
   "bin/sha1sum.exe",
   "bin/libassuan-0.dll",
@@ -344,8 +345,8 @@ const char * const full_files[] =
   "share/icons/breeze/status/64/dialog-warning.svg",
   "share/icons/breeze/status/64/security-low.svg",
   "share/icons/breeze/categories/32/applications-graphics.svg",
-  "share/icons/breeze/apps/32/preferences-desktop-locale.svg",
-  "share/icons/breeze/apps/32/preferences-system-network.svg",
+  "share/icons/breeze/preferences/32/preferences-desktop-locale.svg",
+  "share/icons/breeze/preferences/32/preferences-system-network.svg",
   "share/icons/breeze/apps/22/kde.svg",
   "share/icons/breeze/apps/48/internet-mail.svg",
   "share/icons/breeze/apps/48/telepathy-kde.svg",
diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index 7d82f3b..a1fcbba 100644
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -41,9 +41,11 @@ Section "-un.qtbase"
 
   Delete "$INSTDIR\bin\platforms\qwindows.dll"
   Delete "$INSTDIR\bin\printsupport\windowsprintersupport.dll"
+  Delete "$INSTDIR\bin\styles\qwindowsvistastyle.dll"
 
   RMDir "$INSTDIR\bin\printsupport"
   RMDir "$INSTDIR\bin\platforms"
+  RMDir "$INSTDIR\bin\styles"
   RMDir "$INSTDIR\bin"
 
   RMDir "$INSTDIR"

-----------------------------------------------------------------------

Summary of changes:
 src/inst-qtbase.nsi   | 3 +++
 src/mkportable-full.h | 5 +++--
 src/uninst-qtbase.nsi | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org