[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-74-g27178b9

[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  27178b9698801a0a5e878b57f660265f76b5cedf (commit)
       via  d1638348f73b21ecf64d20e0303c04c18a99f392 (commit)
       via  18e21c3000d101e3d60d9795d0ca5b4f2c29ef68 (commit)
      from  b8240f57878c9c4eb4966ab980482d19458e67e6 (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 27178b9698801a0a5e878b57f660265f76b5cedf
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 17 11:30:04 2016 +0100

    Explicitly configure gpgex-ex to use -ex libs
    
    * src/Makefile.am (gpg4win_pkg_gpgex_configure): New. Use -ex libs.
    
    --
    Without this the x86 variant of the libaries were picked up on another
    build system.

diff --git a/src/Makefile.am b/src/Makefile.am
index 6772a59..d1ae621 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -260,6 +260,10 @@ gpg4win_pkg_gpgex_configure = --silent \
   --with-gpg-error-prefix=$(idir) \
   --with-libassuan-prefix=$(idir)
 
+gpg4win_pkg_gpgex_ex_configure = --silent \
+  --with-gpg-error-prefix=$(ex_idir) \
+  --with-libassuan-prefix=$(ex_idir)
+
 gpg4win_pkg_paperkey_configure = --silent
 
 gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QTSCRIPT=OFF

commit d1638348f73b21ecf64d20e0303c04c18a99f392
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 17 11:23:22 2016 +0100

    Remove kleopatra dirs in share on uninstall
    
    * src/uninst-kleopatra: Remove additional dirs.

diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 8e2767d..d52824f 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -165,7 +165,7 @@ Section "-un.kleopatra"
 #  Delete "$INSTDIR\share\doc\HTML\common\lgpl-translated.html"
 #  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css"
 
-  Delete "$INSTDIR\share\config\kdeglobals"
+  Delete "$INSTDIR\share\kdeglobals"
 #  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
 #  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
 #  Delete "$INSTDIR\share\apps\kwatchgnupg\kwatchgnupgui.rc"
@@ -187,6 +187,9 @@ Section "-un.kleopatra"
 #  RMDir "$INSTDIR\share\doc\HTML\de"
 #  RMDir "$INSTDIR\share\doc\HTML"
 #  RMDir "$INSTDIR\share\doc"
+  RMDir "$INSTDIR\share\kleopatra\pics"
+  RMDir "$INSTDIR\share\kleopatra"
+  RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"
 
 !endif

commit 18e21c3000d101e3d60d9795d0ca5b4f2c29ef68
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 17 11:20:43 2016 +0100

    Include glib dir when building gpgme
    
    * src/Makefile.am (gpg4win_pkg_gpgme_configure): Include glib dir.
    
    --
    Don't  really understand why this was not necessary before.

diff --git a/src/Makefile.am b/src/Makefile.am
index 62fdcf1..6772a59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -233,7 +233,8 @@ gpg4win_pkg_pinentry_configure = \
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
   `test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
-  --disable-w32-qt LDFLAGS=-L$(idir)/lib
+  --disable-w32-qt CFLAGS=-I$(idir)/include/glib-2.0/ \
+  LDFLAGS=-L$(idir)/lib
 
 gpg4win_pkg_gpgme_ex_configure = --silent \
   --with-gpg-error-prefix=$(ex_idir) --enable-static \

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

Summary of changes:
 src/Makefile.am          | 7 ++++++-
 src/uninst-kleopatra.nsi | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


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