[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.0-17-g52f06a6

[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  52f06a63f6c6ee3b443aa9b4896fb21f99e0bbe4 (commit)
       via  e8f5e65ce729b50f3cb9ee847d0d7ee252bddc8c (commit)
      from  bfd05ea824c07027ca7c84527dbe8a5c74b21592 (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 52f06a63f6c6ee3b443aa9b4896fb21f99e0bbe4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Nov 13 15:19:23 2017 +0100

    Fix source installer
    
    --
    WinVer is not included for the source installer and we want
    to have the right sections there.

diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index d057f3b..c865045 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -738,12 +738,14 @@ Function CalcDepends
   # This drags in all the other KDE and Qt stuff.
   !insertmacro SelectSection ${SEC_kleopatra}
   skip_kleopatra:
+!ifndef SOURCES
   ${IfNot} ${AtLeastWin7}
     # Disable Kleo for Windows below 7
     SectionSetFlags ${SEC_kleopatra} 16
     !insertmacro SelectSection ${SEC_gpa}
   ${Endif}
 !endif
+!endif
 
 !ifdef HAVE_PKG_GNUPG_W32
   !insertmacro SectionFlagIsSet ${SEC_gnupg_w32} ${SF_SELECTED} have_gnupg_w32 skip_gnupg_w32
@@ -828,10 +830,12 @@ Function CalcDepends
 !endif
 
 !ifdef HAVE_PKG_QTBASE
+  !ifndef SOURCES
   ${IfNot} ${AtLeastWin7}
     # Disable qt for Windows below 7
     !insertmacro UnSelectSection ${SEC_qtbase}
   ${Endif}
+  !endif
   !insertmacro SectionFlagIsSet ${SEC_qtbase} \
 		${SF_SELECTED} have_qt skip_qt
   have_qt:

commit e8f5e65ce729b50f3cb9ee847d0d7ee252bddc8c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Nov 13 15:19:07 2017 +0100

    Fix mkportable depenendcy
    
    --
    Light was removed

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e6fbbd..76fcb07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -664,7 +664,7 @@ sha256sum.exe: sha1sum.c
 	$(STRIP) $@
 
 mkportable.exe: mkportable.c \
-                mkportable-vanilla.h mkportable-light.h mkportable-full.h
+                mkportable-vanilla.h mkportable-full.h
 	$(CC) -O2 -o $@ $(srcdir)/mkportable.c
 	$(STRIP) $@
 

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

Summary of changes:
 src/Makefile.am       | 2 +-
 src/inst-sections.nsi | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)


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