[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-36-g0063960

[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, kleo-kf5 has been updated
       via  0063960cc2d59044dcc79af4de94be596c0bfbc2 (commit)
      from  b5a06ae35e89f6acd42c0a004e1ae26f3721729a (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 0063960cc2d59044dcc79af4de94be596c0bfbc2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 8 13:05:23 2016 +0100

    Fix Qt5 installation
    
    * src/Makefile.am (EXTRA_DIST): Remove qt.conf
    * src/inst-pinentry.nsi: Fix check for qt section.
    * src/qt.conf: Removed. Not neccessary anmyore.
    * src/inst-qtbase.nsi: Install Qt5Widgets. Remove image plugins.
      Fix platform plugin path.
    * src/uninst-qtbase.nsi: Update accordingly.
    
    --
    Imageformat plugins should be readded if we are sure that
    we need them.

diff --git a/src/Makefile.am b/src/Makefile.am
index eb772eb..2d247c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
 	zlib.pc sha1sum.c mkportable.c     \
 	mkportable-vanilla.h mkportable-light.h mkportable-full.h \
-        qt.conf kleowrap.c potomo Memento.nsh \
+        kleowrap.c potomo Memento.nsh \
         inst-gpg4win.nsi	   uninst-gpg4win.nsi	      \
         inst-atk.nsi               uninst-atk.nsi	      \
         inst-expat.nsi		   uninst-expat.nsi	      \
diff --git a/src/inst-pinentry.nsi b/src/inst-pinentry.nsi
index 238cc56..b9aa508 100644
--- a/src/inst-pinentry.nsi
+++ b/src/inst-pinentry.nsi
@@ -42,13 +42,13 @@ Section "-Pinentry" SEC_pinentry
   File "${prefix}/bin/pinentry-gtk-2.exe"
 
 !ifndef GPG4WIN_LIGHT
-!ifdef HAVE_PKG_QT
+!ifdef HAVE_PKG_QTBASE
   File "${prefix}/bin/pinentry-qt.exe"
 
   # If Qt is installed (usually by selecting kleopatra), we want
   # the Qt pinentry as well.  Otherwise punt to gtk pinentry,
   # which is always available.
-  !insertmacro SectionFlagIsSet ${SEC_qt} \
+  !insertmacro SectionFlagIsSet ${SEC_qtbase} \
                 ${SF_SELECTED} inst_pinentry_have_qt inst_pinentry_skip_qt
   inst_pinentry_have_qt:
   File /oname=pinentry.exe "${prefix}/bin/pinentry-qt.exe"
diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index 9b2ed30..da4e99b 100644
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -33,16 +33,12 @@ Section "-qtbase" SEC_qt
 !ifdef SOURCES
   File "${gpg4win_pkg_qtbase}"
 !else
-  # Qt needs some help to find itself.
-  File ${SRCDIR}/qt.conf
-
   File ${prefix}/bin/Qt5Core.dll
   File ${prefix}/bin/Qt5Gui.dll
+  File ${prefix}/bin/Qt5Widgets.dll
 
-  SetOutPath "$INSTDIR\plugins\imageformats"
+  SetOutPath "$INSTDIR\platforms"
 
-  File ${prefix}/plugins/imageformats/qgif.dll
-  File ${prefix}/plugins/imageformats/qjpeg.dll
   File ${prefix}/plugins/platforms/qwindows.dll
 
 !endif
diff --git a/src/qt.conf b/src/qt.conf
deleted file mode 100644
index 33445f2..0000000
--- a/src/qt.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[Paths]
-Prefix=
-Documentation=doc
-Headers=include
-Libraries=lib
-Binaries=
-Plugins=plugins
-Data=
-Translations=translations
-Settings=etc
-Examples=examples
-Demos=demos
diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index 7f2c8df..3228e37 100644
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -31,19 +31,13 @@ Section "-un.qtbase"
   Push "${gpg4win_pkg_qtbase_src}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\qt.conf"
-
   Delete "$INSTDIR\Qt5Core.dll"
   Delete "$INSTDIR\Qt5Gui.dll"
+  Delete "$INSTDIR\Qt5Widgets.dll"
 
-  Delete "$INSTDIR\plugins\imageformats\qgif.dll"
-  Delete "$INSTDIR\plugins\imageformats\qjpeg.dll"
-  Delete "$INSTDIR\plugins\platforms\qwindows.dll"
-
-  RMDir "$INSTDIR\plugins\imageformats"
-  RMDir "$INSTDIR\plugins\platforms"
+  Delete "$INSTDIR\platforms\qwindows.dll"
 
-  RMDir  "$INSTDIR\plugins"
+  RMDir "$INSTDIR\platforms"
 
   RMDir "$INSTDIR"
 !endif

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

Summary of changes:
 src/Makefile.am       |  2 +-
 src/inst-pinentry.nsi |  4 ++--
 src/inst-qtbase.nsi   |  8 ++------
 src/qt.conf           | 12 ------------
 src/uninst-qtbase.nsi | 12 +++---------
 5 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 src/qt.conf


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